| Commit message (Collapse) | Author | Age |
|
|
|
| |
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
|
|
|
|
| |
Bug fix: Error on console if you press F6 with no layer selected.
|
|
|
|
| |
added.
|
|
|
|
| |
subproperties across document switching.
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
| |
| |
| |
| |
| |
| | |
currentDocument binding
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/io/system/ninjalibrary.json
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|
| |\|
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/components/tools-properties/fill-properties.reel/fill-properties.js
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | |
| | |
| | | |
the latest montage
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| | |/
| |/|
| | |
| | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
|
| | | |
|
| |/
| |
| |
| | |
interactions under new DOM Architecture.
|
|\ \ |
|
| | |
| | |
| | |
| | | |
previously selected style when parent layer is reselected.
|
| | |
| | |
| | |
| | | |
correctly.
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| | |
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>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
- 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>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
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>
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/document/document-html.js
js/helper-classes/3D/view-utils.js
js/stage/stage.reel/stage.js
|
| | |
| | |
| | |
| | | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
| | |
| | |
| | | |
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
|
| |/
| |
| |
| | |
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.
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| |
| |
| |
| | |
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| |
| | |
multiselect. Fix Property Panel so changing an ID there will actually change
an ID on the element (broken by switch from id to data-montage-id change).
|
| | |
|
| | |
|
| |
| |
| |
| | |
drag and drop.
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
commit b23502b8ed6856981d09577d4cf24283e5db8afa
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Mon May 14 10:48:16 2012 -0700
Removed Debugger
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
commit c0b531a074e9cf9a964da0cda496bba8d7453ec1
Author: Kruti Shah <kruti.shah@motorola.com>
Date: Fri May 11 13:55:18 2012 -0700
Changing Doc Layer Name
Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Signed-off-by: Jonathan Duran <jduran@motorola.com>
|
| |\ \ |
|
| | | | |
|