aboutsummaryrefslogtreecommitdiff
path: root/js/components
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/Ninja-Internal' into ColorJose Antonio Marquez2012-06-13
|\
| * Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/panels/properties.reel/sections/position-size.reel/position-size.html Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * Merge branch 'refs/heads/master' into montage-v10-integrationValerio Virgillito2012-06-13
| | |\
| | * | fixed document switching issuesValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing properties to the serializationValerio Virgillito2012-06-12
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | adding more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | removing serializable to the tree and adding a few more missing propertiesValerio Virgillito2012-06-11
| | | | | | | | | | | | | | | | 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>
| | * \ \ 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>
| * | | | | Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixesNivesh Rajbhandari2012-06-13
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Fixing properties panel to support px and % for body and other elements.Nivesh Rajbhandari2012-06-12
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | Cleaning up color wheel componentJose Antonio Marquez2012-06-13
| |/ / / |/| | | | | | | | | | | Minor code clean up and refactoring.
* | | | Merge branch 'refs/heads/Ninja-Internal' into TempPromptUIJose Antonio Marquez2012-06-12
|\| | |
| * | | 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>
* | | | 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.
* | | 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>
| * \ \ Merge pull request #272 from pushkarjoshi/pentoolValerio Virgillito2012-06-06
| |\ \ \ | | |_|/ | |/| | Pentool
| | * | Merge branch 'master' into pentoolPushkar Joshi2012-06-04
| | |\| | | | | | | | | | | | | | | | | Conflicts: js/tools/PenTool.js
| | * | Merge branch 'master' into pentoolPushkar Joshi2012-05-31
| | |\ \
| | * | | More consistent local and global mouse coords which solves a bug with the ↵Pushkar Joshi2012-05-29
| | | | | | | | | | | | | | | | | | | | Pen minus subtool not removing 1 anchor paths
| | * | | allow changes in the pen subtool in options to be seen by the pen tool code ↵Pushkar Joshi2012-05-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (can now select the pen plus, pen minus subtools) AND add keyboard shortcut for brush tool
* | | | | Merge branch 'refs/heads/master' into element-model-fixesValerio Virgillito2012-06-05
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/mediators/element-mediator.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | |_|/ | |/| | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@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>
* | | making the document bar handle the current document to hide/show itselfValerio Virgillito2012-06-01
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Valerio Virgillito2012-05-31
|\ \ \ | | |/ | |/| | | | document-bindings-fix
| * | CSS Panel Toolbar - Prevent warning regarding undefined sourceObjectEric Guzman2012-05-30
| | |
* | | fixing the close and saveValerio Virgillito2012-05-31
| | | | | | | | | | | | 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>
* | Merge branch 'refs/heads/Ninja-DOM-Architecture' into DocumentJose Antonio Marquez2012-05-24
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: js/document/document-html.js js/helper-classes/3D/view-utils.js js/stage/stage.reel/stage.js
| * | adding document views checks for the timeline and breadcrumbValerio Virgillito2012-05-23
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | 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.
* | CSS Panel - Update components to use new serialization formatEric Guzman2012-05-22
| |
* | CSS Style Component - Moved unit identification to local change handler ↵Eric Guzman2012-05-21
| | | | | | | | instead of delegate
* | CSS Panel - Allow ":" to be used in selector fieldEric Guzman2012-05-21
| |
* | Style sheets view - Fixed drawing of toolbar and "no sheets" messageEric Guzman2012-05-21
| |
* | Merge branch 'dom-architecture' of ↵Eric Guzman2012-05-18
|\ \ | | | | | | | | | github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
| * \ Merge branch 'refs/heads/dom-architecture-master' into Dom-ArchitectureNivesh Rajbhandari2012-05-18
| |\ \
| | * | fixing the color chip for the document rootValerio Virgillito2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | Fixing radio control in the PI.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Fixed Materials Popup to work with new changes to repetition bindings.Nivesh Rajbhandari2012-05-18
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | File Input control in materials panel was not working because of the change ↵Nivesh Rajbhandari2012-05-18
| |/ / | | | | | | | | | | | | | | | from id to data-montage-id. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | fixed the shape subtool not refreshing the iconValerio 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 02:46:08 +0000