aboutsummaryrefslogtreecommitdiff
path: root/js/ninja.reel/ninja.html
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>
| * fixed document switching issuesValerio 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>
| * | 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>
* | 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>
| * fixing some selection container changes and the breadcrumb not drawing initiallyValerio 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 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
| |
* | 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>
| * 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
* Removing unused components referencesValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removing more id and changing the appropriate CSS for themValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Code reformattingValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* using prototype in the serializationAnanya Sen2012-05-03
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
|\
| * Removing all "module" declarations and replaced with "prototype" in ↵John Mayhew2012-04-26
| | | | | | | | preparation for montage converting to the new "prototype" format fully
* | - collapse panels for code view, restore for design viewAnanya Sen2012-04-18
| | | | | | | | | | | | - apply theme selection to all code view documents Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - code editor view options barAnanya Sen2012-04-13
| | | | | | | | | | | | | | - Checkbox for user to toggle between manually triggered autocomplete and automatic autocomplete - font zoom hottext Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | - Decouple code editor from stage document switching logicAnanya Sen2012-04-09
|/ | | | | | - cleaning up Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* Merge pull request #145 from ericguzman/PresetsPIValerio Virgillito2012-03-28
|\ | | | | Presets - Adding presets controller
| * Presets Panel - Adding presets controller to serializationEric Guzman2012-03-22
| |
* | Resizers updatedArmen Kesablyan2012-03-23
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | Updated Resizers for Panels and timelineArmen Kesablyan2012-03-22
|/ | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* adding a focus manager to handle panel bugs where blur was not getting ↵Valerio Virgillito2012-03-14
| | | | | | called when clicking on the canvas. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Removing the obsolete modalContainer div.Valerio Virgillito2012-03-14
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge dhg637 DisabledState into master.Valerio Virgillito2012-03-12
| | | | | | Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumb Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Committing Disabled states for tool-bar, tool-options, viewbar, breadcrumbArmen Kesablyan2012-03-12
| | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
* Merge branch 'refs/heads/master' into panelsValerio Virgillito2012-03-06
|\
| * Squashed commit of preload-fix into MasterValerio Virgillito2012-03-06
| | | | | | | | | | | | | | - Requiring all the previously pre-loaded files - RDGE, Codemirror and gl-matrix are not included via a script tag. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing repetition from the panel container and using a static list of panels.Valerio Virgillito2012-03-05
|/ | | | | | - Fixing the bugs associated with the repetition of component and PI problems. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Squashed commit of the workspace-bugsValerio Virgillito2012-03-01
| | | | | | - Panels fixes. Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'nested-selection' of https://github.com/mencio/ninja-internal ↵Valerio Virgillito2012-02-28
|\ | | | | | | | | | | | | | | | | into integration-candidate Conflicts: js/ninja.reel/ninja.html Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * breadcrumb cleanup and moving the resized on top of the timeline panelValerio Virgillito2012-02-27
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | removing the old settings class and disabling panel settings until the new ↵Valerio Virgillito2012-02-24
| | | | | | | | | | | | panels are in Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | clearing the old local setting and using the new version/prefix local settings.Valerio Virgillito2012-02-24
| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Merge branch 'refs/heads/master' into local-storage-versionValerio Virgillito2012-02-23
|\|
| * Merge branch 'refs/heads/master' into new-tool-iconsArmen Kesablyan2012-02-22
| |\