aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-19
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/document/document-html.js js/document/templates/app/main.js js/panels/Panel.reel/Panel.js node_modules/montage/ui/native-control.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * 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 close Ninja promptJose Antonio Marquez2012-06-11
| | | | | | | | | | | | | | | | Adding a prompt to the user to ensure all data is saved prior to closing the application. This will not let me check for documents to need saving, so it must be general and will appear at all times.
| * | | fixed document switching issuesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | remove serializable from custom sectionValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-11
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: js/io/system/ninjalibrary.json js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | 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/master' into montage-v10-integrationValerio Virgillito2012-06-06
| |\| | | | | | | | | | | | | | | | | | | Conflicts: js/components/tools-properties/fill-properties.reel/fill-properties.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | first iteration of adding serializable to ninja plus other changes to run ↵Valerio Virgillito2012-06-06
| | | | | | | | | | | | | | | | | | the latest montage Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Objects Tray - Add hiding based on workspace mode.Eric Guzman2012-06-15
| | |
* | | Changes Made to Object Listing of iFrameArmen Kesablyan2012-06-11
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Merge branch 'refs/heads/master' into bindingArmen Kesablyan2012-06-11
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: js/document/models/html.js js/document/views/design.js js/ninja.reel/ninja.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * | 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.
| * 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/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| |\ | | | | | | | | | document-bindings-fix
| | * fixing the document closing when the first document is closed.Valerio Virgillito2012-06-01
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Moving styles controller higher in ninja's serialization so its bindings ↵Nivesh Rajbhandari2012-06-01
| |/ | | | | | | | | | | will get triggered before stage's bindings. This should fix the stage's styles not getting initialized correctly. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * fixed the 3d grid when switching documents and some cleanupValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the code editor, closing documents and cleanup of the stageValerio Virgillito2012-06-01
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing selection when switching documentsValerio Virgillito2012-05-31
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * opening code view documentsValerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the timeline current document bindingsValerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * Fixing the close document.Valerio Virgillito2012-05-30
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the menu bindings and some cleanup of the stageValerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * cleanup and handling the document views in the document controller for now.Valerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fix for the document tab close button and rulers on initial documentValerio Virgillito2012-05-29
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * document bindings phase 1Valerio Virgillito2012-05-29
| | | | | | | | | | | | | | | | - using array controller to bind the current document to all ninja components - removed open document event - removed references to the document controller Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Objects Controller - Add bindable controller properties, and bindings getterEric Guzman2012-05-30
| |
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-25
|\|
| * Cleaning up referencing to 'documentRoot' and '_document'Jose Antonio Marquez2012-05-24
| | | | | | | | Moved to reference new model in DOM architecture rework. This should not affect anything, just moving the references, and also the setting to the render methods in the design view.
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-23
|\| | | | | | | | | | | | | Conflicts: js/data/panels-data.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * fixing the selection in multiple documents and some code cleanupValerio Virgillito2012-05-22
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixed a switch documents bug where the layout was getting called before ↵Valerio Virgillito2012-05-18
| | | | | | | | | | | | setting the container. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * fixing some snapping bugsValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * enabling basic document switchingValerio Virgillito2012-05-18
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Changes to binding viewArmen Kesablyan2012-05-19
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Merge branch 'refs/heads/dom-architecture' into bindingArmen Kesablyan2012-05-17
|\| | | | | | | | | | | | | | | Conflicts: css/ninja.css scss/imports/scss/_toolbar.scss Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'refs/heads/master' into dom-architectureValerio Virgillito2012-05-16
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/document/templates/montage-html/package.json js/io/system/ninjalibrary.json node_modules/descriptor.json Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Removed unused SubSelect ToolJohn Mayhew2012-05-08
| | |
| * | changing @change to propertyChangeListenerValerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | fixing some of the document bindings.Valerio Virgillito2012-05-16
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Objects Panel - Add Objects controller and montage/application hack to ↵Eric Guzman2012-05-16
| | | | | | | | | | | | expose template
* | | Merge branch 'dom-architecture' of ↵Armen Kesablyan2012-05-15
|\| | | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into binding
| * | Fixing the dirty document flag. Disabling the stylesheets dirty flag because ↵Valerio Virgillito2012-05-10
| | | | | | | | | | | | | | | | | | === true on document open. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Fixing the live preview for the new document.Valerio Virgillito2012-05-10
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Adding Chrome PreviewJose Antonio Marquez2012-05-08
| | |
* | | Finished skeleton structure for binding.Armen Kesablyan2012-05-15
| | | | | | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | created the initial environment requirements for workspace to be manipulated.Armen Kesablyan2012-05-11
|/ / | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 17:48:01 +0000