| Commit message (Collapse) | Author | Age |
|
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
|
|
| |
always correct because we don't get a scroll end event. Updating Pan Tool to update scroll bars.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/components/tools-properties/tag-properties.reel/tag-properties.html
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
creation
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/ |
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| | |
https://github.com/mencio/ninja-internal into serialization
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| |
| |
| | |
the new template
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/
|
|
| |
preparation for montage converting to the new "prototype" format fully
|
|
|
|
|
|
| |
Initial container get setup in ninja now.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
js/document/templates/montage-html/default_html.css
js/mediators/element-mediator.js
js/panels/properties.reel/properties.js
js/tools/BrushTool.js
js/tools/LineTool.js
js/tools/PenTool.js
js/tools/SelectionTool.js
js/tools/ShapeTool.js
js/tools/TranslateObject3DTool.js
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reworked the add and remove elements into 1 function which can take 1 or more elements.
Removed the _element from the selection array
Many other changes related to those 2 changes
Undo/Redo shortcuts are now using montage undo/redo manager.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|/
|
|
| |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|
|
|
| |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
|
|
| |
opened.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|
|
|
|
|
| |
called when clicking on the canvas.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
|\
| |
| |
| | |
https://github.com/joseeight/ninja-internal into integration-candidate
|
| |
| |
| |
| | |
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/document/html-document.js
js/helper-classes/3D/snap-manager.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
a document and while switching documents
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |/
|/|
| |
| |
| |
| | |
snapping routine when selecting only if the active tool allows snapping.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\| |
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | |
| | | |
integration
|
| | |
| | |
| | |
| | | |
Signed-off-by: Armen Kesablyan <armen@motorola.com>
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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>
|
| | | | |
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Conflicts:
js/ninja.reel/ninja.html
js/stage/stage.reel/stage.html
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
with io mediator
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
document dirty indicator.
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
|
| |\ \ \
| | | |/
| | |/|
| | | |
| | | |
| | | | |
Conflicts:
.gitignore
js/ninja.reel/ninja.js
|
| | | | |
|
| |_|/
|/| |
| | |
| | |
| | |
| | | |
Fall back to use SnapManager code if elementFromPoint returns the viewport.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
text-tool
Conflicts:
_scss/compass_app_log.txt
css/ninja.css
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |/
| |
| |
| | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| | |
|
|/
|
|
| |
Has rich-text-editor in place need to place with finalized version when complete
|