aboutsummaryrefslogtreecommitdiff
path: root/js/controllers
Commit message (Collapse)AuthorAge
* removed unnecessary functionAnanya Sen2012-05-08
| | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* copy/paste POCAnanya Sen2012-05-07
| | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com> Conflicts: js/ninja.reel/ninja.html Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* fixing the currentContainerValerio Virgillito2012-05-03
| | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* Merge branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
|\
| * Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-03
| |\
| * \ Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-05-01
| |\ \
| * | | added shortkeys for commenting and uncommentAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | IKNINJA-1537 - don't show code hinting for ctrl+SAnanya Sen2012-04-30
| | | | | | | | | | | | | | | | | | | | | | | | IKNINJA-1568 - code hinting not supported for son files Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | added key shortcuts' list dropdown in view option barAnanya Sen2012-04-27
| | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-26
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | removing debuggerAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | IKNINJA-1551 - added editor support for other file typesAnanya Sen2012-04-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | - use on ctrl+space for code hintingAnanya Sen2012-04-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - use prototype in serialization for montage 0.8 Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | IKNINJA-1529 : zooming such that cursor position can be calculated accuratelyAnanya Sen2012-04-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | IKNINJA-1530 : turned off autocompletion and just kept the code hintingAnanya Sen2012-04-24
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | IKNINJA-1529 : zooming to fix font overlap issueAnanya Sen2012-04-23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | set editor background color as per the selected themeAnanya Sen2012-04-20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | - disable autocompletion option for unsupported file typeAnanya Sen2012-04-19
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | - fixed the text cursorAnanya Sen2012-04-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - code cleanup Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | - 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>
| * | | | Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvementsAnanya Sen2012-04-17
| |\ \ \ \
| * | | | | added theme choices for editorAnanya Sen2012-04-17
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
| * | | | | Added comment and uncomment control in the editor view optionsAnanya Sen2012-04-16
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | | - added configurability of code completion with the file typeAnanya Sen2012-04-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added logic to toggle between automatic code completion and manually triggered code completion [ UI pending ] 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 branch 'refs/heads/master' into tag-2.0Valerio Virgillito2012-05-03
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | minor formattingValerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | | | Dom ManipulationKruti Shah2012-05-03
| | |_|_|/ | |/| | | | | | | | | | | | | Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
* | | | | Refactor creating elements. Removed makeNJElement and separated the model ↵Valerio Virgillito2012-05-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creation Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | | Nesting absolute element in the Tag tool. Refactoring element creation and ↵Valerio Virgillito2012-05-02
|/ / / / | | | | | | | | | | | | | | | | | | | | element models Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Get working plane grid to draw for new stage web template workflow.Nivesh Rajbhandari2012-05-01
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Squashed commit of stage architectureValerio Virgillito2012-04-30
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | | Merge branch 'refs/heads/master' into stage-document-architectureValerio Virgillito2012-04-26
|\ \ \ \ | | |_|/ | |/| |
| * | | Fixed issue with setting stroke when using the PI.Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | Merge branch 'refs/heads/ninja-internal' into AllFixesNivesh Rajbhandari2012-04-24
| |\ \ \
| * | | | Allow users to toggle application of stroke and border settings when using ↵Nivesh Rajbhandari2012-04-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the ink bottle tool. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | | | Fixing translate handles to draw without zoom value. Also fixed some typos ↵Nivesh Rajbhandari2012-04-20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | in zoom code. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | Added a body controllerValerio Virgillito2012-04-24
| |/ / |/| | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | Temporary fix for the PI and Stage when opening the new template.Valerio Virgillito2012-04-23
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | reverting old template to current working status. New template work.Valerio Virgillito2012-04-20
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | typo fixValerio Virgillito2012-04-19
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | | initial stage web templateValerio Virgillito2012-04-18
|/ / | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
* | Adding back setProperties for canvas because width and height values need to ↵Nivesh Rajbhandari2012-04-17
| | | | | | | | | | | | be set as attributes instead of styles. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | Merge branch 'refs/heads/ninja-internal' into WebGLFixesNivesh Rajbhandari2012-04-17
|\ \
| * | Fixing the shape borderValerio Virgillito2012-04-13
| | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | removing _undo array and _targets array and use object instead of matching ↵Valerio Virgillito2012-04-13
| | | | | | | | | | | | | | | | | | arrays to set properties Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Merge branch 'refs/heads/master' into undo-managerValerio Virgillito2012-04-12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: js/controllers/elements/element-controller.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | some code cleanupValerio Virgillito2012-04-10
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | | setProperties to the montage undo/redoValerio Virgillito2012-04-09
| | | | | | | | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>