aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-11
|\
| * Merge branch 'refs/heads/ninja-internal' into BodyPINivesh Rajbhandari2012-06-07
| |\ | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/body-controller.js Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * fixing the body color chip for non banners templatesValerio Virgillito2012-06-07
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Body PI fixes.Nivesh Rajbhandari2012-06-07
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * 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>
| * | 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>
* | | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-06
|\ \ \ | | |/ | |/|
| * | Merge pull request #267 from mqg734/ToolOptionsValerio Virgillito2012-06-05
| |\ \ | | |/ | |/| Updated ink bottle and fill tools to support tool options checkboxes and materials.
| | * Merge branch 'refs/heads/ninja-internal' into ToolOptionsNivesh Rajbhandari2012-06-05
| | |\
| | * | Updated ink bottle tool to support color-chip's checkbox and undo/redo for ↵Nivesh Rajbhandari2012-06-05
| | | | | | | | | | | | | | | | | | | | | | | | strokes/borders. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | Fill and Ink-Bottle fixes.Nivesh Rajbhandari2012-06-04
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | fixing the save asValerio Virgillito2012-06-05
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing the save asValerio 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 saveAll from menuJose Antonio Marquez2012-06-04
| | |/ | | | | | | | | | This was broken, not sure when it broke, but working again.
| * / 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>
* | Merge branch 'refs/heads/NINJAmaster' into TimelineUberJonathan Duran2012-06-05
|\| | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Signed-off-by: Jonathan Duran <jduran@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
| |\
| | * Attempting to track clean nodesJose Antonio Marquez2012-05-30
| | | | | | | | | | | | Need to figure out CSS overwrite issue <style>
| * | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| |\ \ | | | | | | | | | | | | document-bindings-fix
| | * \ Merge branch 'document-bindings-fix' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-06-01
| | |\ \ | | | | | | | | | | | | | | | into 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>
| * | | Merge branch 'refs/heads/valerio-document-bindings-fix' into ↵Nivesh Rajbhandari2012-06-01
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage.reel/stage.js 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>
| * | | SnapManager.setupDragPlaneFromPlane must happen after StylesController has ↵Nivesh Rajbhandari2012-06-01
| |/ / | | | | | | | | | | | | | | | finished initializeRootStyles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | fixing the switching between various types of documentsValerio Virgillito2012-05-31
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | removing the last closeDocument handlerValerio Virgillito2012-05-31
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge pull request #4 from mqg734/dom-architecture-pentoolValerio Virgillito2012-05-31
| |\ \ | | | | | | | | Adding back the stage references in the 3d classes and fixing styles lookup for the stage.
| | * | Removed temporary hack to support stage styles.Nivesh Rajbhandari2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | fixing the close and saveValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing selection when switching documentsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | cleanup itemsValerio Virgillito2012-05-31
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | fixing the closing of documentsValerio Virgillito2012-05-30
| |/ / | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | opening code view documentsValerio Virgillito2012-05-30
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'Dom-Architecture' of github.com:mqg734/ninja-internal into ↵Valerio Virgillito2012-05-30
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | document-bindings-fix Conflicts: js/stage/stage-deps.js js/stage/stage.reel/stage.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Cache perspective distance lookup to speed up user interaction.Nivesh Rajbhandari2012-05-29
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | IKNinja-1491 - Adding slice value to border gradients.Nivesh Rajbhandari2012-05-25
| | |/ | | | | | | | | | | | | | | | Note that using "circle cover" comes close to matching our canvas 2d/WebGL shape's stroke gradients, but still a little off. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixing the close document.Valerio Virgillito2012-05-30
| | | | | | | | | | | | 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/NINJAmaster' into TimelineUberJonathan Duran2012-05-31
|\| | | | | | | | | | | | | | | | | Conflicts: js/panels/Timeline/Layer.reel/Layer.js js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/properties.reel/properties.js Signed-off-by: Jonathan Duran <jduran@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
| | * Fixed selection bug when switching/opening documents. Also, use saved scroll ↵Nivesh Rajbhandari2012-05-24
| | | | | | | | | | | | | | | | | | values when switching between documents. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * fixing the styles manager to open code view files and closing the last document.Valerio Virgillito2012-05-23
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * Merge pull request #252 from ananyasen/dom-architectureValerio Virgillito2012-05-23
| | |\ | | | | | | | | bug fixes
| | | * Merge branch 'refs/heads/master-dom-architecture' into dom-architectureAnanya Sen2012-05-22
| | | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 08:35:19 +0000