aboutsummaryrefslogtreecommitdiff
path: root/js/document
Commit message (Collapse)AuthorAge
* Removed some codeKruti Shah2012-06-20
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Locked Elements. Layer ControlsKruti Shah2012-06-19
| | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-19
|\
| * Merge pull request #309 from mqg734/IKNinja_1746Valerio Virgillito2012-06-18
| |\ | | | | | | IKNINJA-1746 - Can't select items behind the banner templates' viewport.
| | * IKNINJA-1746 - Can't select items behind the banner templates' viewport.Nivesh Rajbhandari2012-06-15
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-18
|\| |
| * | Remove ninja's author-time styles for banner and animation templates on ↵Nivesh Rajbhandari2012-06-14
| | | | | | | | | | | | | | | | | | | | | | | | publish/save. Missed the banner and animation case in the previous checkin. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Moving location to copy body style attributeJose Antonio Marquez2012-06-14
| | | | | | | | | | | | Fixes issue with removing styles from other elements. This now only applies to HTML and Body tags
| * | Adding clean up for ninja style attributes.Jose Antonio Marquez2012-06-14
| | | | | | | | | | | | I/O step in template.
| * | Save user's html and body styles and inline body styles for 3d so they don't ↵Nivesh Rajbhandari2012-06-14
| |/ | | | | | | | | | | | | | | get saved out with the document. This still requires some changes by Jose. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge remote-tracking branch 'ninja-internal/master' into test-mergeJon Reid2012-06-15
|\| | | | | | | | | | | | | Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
| * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| |\
| | * Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
| | |\
| | * | Adding temp prompt UI componentJose Antonio Marquez2012-06-11
| | | | | | | | | | | | | | | | Added a temp prompt component and added on before close logic to ensure user does not lose data if the file needs saving when they close.
| * | | fix for the the components not rendering and not selectingValerio Virgillito2012-06-12
| | |/ | |/| | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/master' into dom-containerValerio Virgillito2012-06-11
| |\|
| | * Merge pull request #286 from mqg734/ScrollBarFixValerio Virgillito2012-06-11
| | |\ | | | | | | | | Overriding scrollbar styles on the template so the scroll track is not white.
| | | * Merge branch 'refs/heads/ninja-internal' into ScrollBarFixNivesh Rajbhandari2012-06-08
| | | |\
| | | * | Overriding scrollbar styles on the template so the scroll track is not ↵Nivesh Rajbhandari2012-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | white. This has the side benefit of fixing some of the zoom issues with the scrollbar too. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Re-adding temp doc typeJose Antonio Marquez2012-06-09
| | | |/ | | |/| | | | | | | | | Adding a demo fix to include the document type, it is removed because comments are not supported currently, so we must added in manually. The YouTube component breaks, it does not support any doctype, hence, the component must have a bug filed against it, we MUST include doc types with our files.
| * | | rewrite: currentSelectedContainer -> domContainerValerio Virgillito2012-06-08
| | |/ | |/| | | | | | | | | | | | | | | | Fixed the currentSelectedContainer by removing bindings and using property change on the current document added the red outline back. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'refs/heads/TimelineUberjd' into TimelineUberKruti Shah2012-06-12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
| * | Remove doc type from files and adding tag check for htmlJose Antonio Marquez2012-06-08
| |/ | | | | | | Removed the HTML5 doctype from files since it was break the YouTube component, also made a fix to check for the HTML tag to be present when copying attributes.
| * Fixing empty property bug with montage class on HTML tagJose Antonio Marquez2012-06-07
| |
| * Minor fixesJose Antonio Marquez2012-06-07
| | | | | | | | Ensuring montage style is removed and doctype is included.
| * Adding support for html and head tags attributesJose Antonio Marquez2012-06-07
| | | | | | | | Both on open and close, Chrome randomly changes order of attributes, so this is browser induced bug.
| * Fixing unique ID storeJose Antonio Marquez2012-06-07
| |
| * Merge branch 'refs/heads/Ninja-Internal' into FileIOJose Antonio Marquez2012-06-07
| |\
| | * Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-06
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | removing all model creators.Valerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | The elementModel is now a getter that will create a new model when needed. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | cleanup and making the webgl-helper only loop canvas on file saveValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Adding unique ID to canvas data foldersJose Antonio Marquez2012-06-07
| | |/ | |/| | | | | | | Also set up for tracking ID created, will be adding support for parsing files without saving later, but flag is now present.
| * | Cleaning more.Jose Antonio Marquez2012-06-06
| | |
| * | Cleaning upJose Antonio Marquez2012-06-06
| |/ | | | | | | Removed reference of model in design view, clean up slightly, need to implement binding later.
| * fixing a small typoValerio Virgillito2012-06-05
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Merge pull request #263 from joseeight/ComponentsValerio Virgillito2012-06-05
| |\ | | | | | | Saving Google Components (reel components)
| | * Fixing CSS bugJose Antonio Marquez2012-06-04
| | | | | | | | | | | | This is for files using 'save' and not 'save all' in which the styles would be thrown off and mixed improperly.
| | * Canvas lib fixJose Antonio Marquez2012-06-04
| | | | | | | | | | | | Fixed a bug where an extra tag would be added to the file and break I/O.
| | * Adding saving blocking screenJose Antonio Marquez2012-06-04
| | | | | | | | | | | | This is for chrome preview, also fixed other preview bug with plain files not opening in preview.
| | * Adding lib copy blocking to previewJose Antonio Marquez2012-06-04
| | | | | | | | | | | | This fixes an issue with launching preview before libraries were copied, hence, first time run would fail. Need to add a feedback screen for this process.
| | * Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-04
| | |\
| | * | Adding blocking logic to copy libsJose Antonio Marquez2012-06-03
| | | | | | | | | | | | | | | | Need to implement logic in parsing method, might require a minor restructuring.
| | * | Adding open draw to reel componentsJose Antonio Marquez2012-06-01
| | | |
| | * | Merge branch 'refs/heads/Ninja-Internal' into ComponentsJose Antonio Marquez2012-06-01
| | |\ \
| | * | | Add logic to allow dynamic placement of canvas json fileJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | Save to and read from any path on disk (webGL/Canvas data only)
| | * | | Creating template mediator classJose Antonio Marquez2012-06-01
| | | | | | | | | | | | | | | | | | | | This is to simplify code, more to be changed and added.
| * | | | components fix: adding a first draw event to componentsValerio Virgillito2012-06-04
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Adding a first draw allows the component to have the right element so that ninja can use it's controller to get the component instance Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing some selection container changes and the breadcrumb not drawing initiallyValerio Virgillito2012-06-01
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into document-bindings-fixValerio Virgillito2012-06-01
| |\ \ \ | | | |/ | | |/|
| | * | Fixing webGL helperJose Antonio Marquez2012-06-01
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 00:39:36 +0000