aboutsummaryrefslogtreecommitdiff
path: root/js/stage
Commit message (Collapse)AuthorAge
* Merge branch 'text-tool' of https://github.com/dhg637/ninja-internal into ↵Valerio Virgillito2012-02-14
|\ | | | | | | integration
| * appended function : toViewportCoordinates in stageArmen Kesablyan2012-02-13
| | | | | | | | Signed-off-by: Armen Kesablyan <armen@motorola.com>
| * Merge branch 'master' of github.com:Motorola-Mobility/ninja-internalArmen Kesablyan2012-02-13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: css/ninja.css js/stage/stage.reel/stage.html js/tools/TextTool.js node_modules/labs/rich-text-editor.reel/rich-text-editor.css node_modules/labs/rich-text-editor.reel/rich-text-editor.html node_modules/labs/rich-text-editor.reel/rich-text-editor.js node_modules/labs/rich-text-editor.reel/rich-text-resizer.js node_modules/labs/rich-text-editor.reel/rich-text-sanitizer.js Signed-off-by: Armen Kesablyan <armen@motorola.com>
* | | Cleaning up requiresJose Antonio Marquez2012-02-14
| | |
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-10
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: js/ninja.reel/ninja.html js/stage/stage.reel/stage.html
| * | Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into ↵Armen Kesablyan2012-02-07
| |\| | | | | | | | | | | | | | | | | | | | | | text-tool Conflicts: _scss/compass_app_log.txt css/ninja.css
| * | Refactored rich text editor locationArmen Kesablyan2012-02-07
| | |
| * | Initial Text Tool ImplementationArmen Kesablyan2012-02-02
| | | | | | | | | | | | Has rich-text-editor in place need to place with finalized version when complete
* | | hide iframeContainer if we want to open code view as the first document ↵Ananya Sen2012-02-10
| | | | | | | | | | | | | | | | | | after ninja launches Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIOAnanya Sen2012-02-08
|\ \ \
| * \ \ Merge branch 'refs/heads/AnanyaFileIO' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \
| * \ \ \ Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-06
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Handle delete of multiple objects. Also, have deletion go through the ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediator so elementDeleted event is fired for SnapManager, DrawUtils, etc. to clean up after deleted element(s). Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| | * | | Update grid and planes when elementChange event signifies the "matrix", ↵Nivesh Rajbhandari2012-02-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "left", "top", "width" or "height" properties have changed. Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | | | | fixed undo/redo for each code view document, changed new file integration ↵Ananya Sen2012-02-08
| |_|/ / |/| | | | | | | | | | | | | | | | | | | with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | | integrated save for the document tabs, detect codemirror history to show ↵Ananya Sen2012-02-06
|/ / / | | | | | | | | | | | | | | | document dirty indicator. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | changes to show document dirty indicator on editing code view, and to remove ↵Ananya Sen2012-02-05
| | | | | | | | | | | | | | | | | | dirty indicator on save. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | allow to open html file in design view,Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | integrated file open with io mediator Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | added editor tab save while switching code view tabs,Ananya Sen2012-02-03
| | | | | | | | | | | | | | | | | | integrated new file dialog with io mediator to open the new file in a new tab Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | | Merge branch 'refs/heads/NinjaInternal' into FileIOJose Antonio Marquez2012-02-02
|\| | | | | | | | | | | | | | | | | Conflicts: .gitignore js/ninja.reel/ninja.js
| * | Merge branch 'issue-codeattribution' of github.com:mencio/ninja-internal ↵Valerio Virgillito2012-02-02
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into staging Conflicts: _scss/compass_app_log.txt _scss/imports/scss/_Base.scss css/ninja.css Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| | * | Switching to alternate dashed line function. Adding code attributions.Valerio Virgillito2012-02-02
| | |/ | | | | | | | | | Signed-off-by: Valerio Virgillito <valerio@motorola.com>
| * | Integrating Pan and Zoom tool and snap manager fixes.Nivesh Rajbhandari2012-02-02
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Fixed grid not drawing bug when switching from front to top and side.Nivesh Rajbhandari2012-01-30
| | | | | | | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
| * | Syncing stage view when rotating stage.Nivesh Rajbhandari2012-01-30
| |/ | | | | | | Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
* | refactoring some file names and locations,Ananya Sen2012-02-02
| | | | | | | | | | | | change made to maintain only one codemirror div. Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixed code view container, and switching code viewAnanya Sen2012-02-02
| | | | | | | | Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | changes to open multiple code view tabs and switch between the code views, ↵Ananya Sen2012-02-02
| | | | | | | | | | | | added nj-skinned css class for the buttons in file picker, new file dialog and save as dialog Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | fixed reference to coreioapiAnanya Sen2012-02-01
| | | | | | | | | | | | cleaning up opening code view tabs Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
* | Merged old FileIOJose Antonio Marquez2012-01-27
|/
* First commit of Ninja to ninja-internalPierre Frisch2012-01-27
Signed-off-by: Valerio Virgillito <rmwh84@motorola.com>