diff options
author | Armen Kesablyan | 2012-05-15 16:34:46 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-05-15 16:34:46 -0700 |
commit | c8d61c8e72e0eba266575f9df54325fa77fde73d (patch) | |
tree | 556cafd76ab9b2cf4cc2b4cc3ea17b12ce690b69 /js/panels/Timeline | |
parent | 15a3aaebb56cb2c9409bfe55c862868726c7fd44 (diff) | |
parent | 46bd3712329cd3c9311e50ed9ee4c2245bd1be5a (diff) | |
download | ninja-c8d61c8e72e0eba266575f9df54325fa77fde73d.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into binding
Diffstat (limited to 'js/panels/Timeline')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 4 | ||||
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 2 | ||||
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index b23da749..6358a0e0 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -721,7 +721,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
721 | this.dynamicLayerName.value = this._layerEditable.value; | 721 | this.dynamicLayerName.value = this._layerEditable.value; |
722 | this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.dynamicLayerName.value; | 722 | this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = this.dynamicLayerName.value; |
723 | this.needsDraw = true; | 723 | this.needsDraw = true; |
724 | this.application.ninja.documentController.activeDocument.needsSave = true; | 724 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
725 | } | 725 | } |
726 | }, | 726 | }, |
727 | handleAddStyleClick: { | 727 | handleAddStyleClick: { |
@@ -749,7 +749,7 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
749 | this.dynamicLayerName.value = newVal; | 749 | this.dynamicLayerName.value = newVal; |
750 | this.layerName = newVal; | 750 | this.layerName = newVal; |
751 | this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal; | 751 | this.application.ninja.timeline.currentLayerSelected.layerData.elementsList[0].dataset.storedLayerName = newVal; |
752 | this.application.ninja.documentController.activeDocument.needsSave = true; | 752 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
753 | this.needsDraw = true; | 753 | this.needsDraw = true; |
754 | } | 754 | } |
755 | }, | 755 | }, |
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index d1cab096..94ca9b57 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -994,7 +994,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
994 | this.arrLayers.splice(myIndex, 0, thingToPush); | 994 | this.arrLayers.splice(myIndex, 0, thingToPush); |
995 | 995 | ||
996 | } | 996 | } |
997 | this.selectLayer(myIndex); | 997 | this.selectLayer(myIndex, false); |
998 | } | 998 | } |
999 | }, | 999 | }, |
1000 | 1000 | ||
diff --git a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js index efeeba00..2c15a99c 100644 --- a/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js +++ b/js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |||
@@ -568,7 +568,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
568 | this.nextKeyframe += 1; | 568 | this.nextKeyframe += 1; |
569 | } | 569 | } |
570 | 570 | ||
571 | this.application.ninja.documentController.activeDocument.needsSave = true; | 571 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
572 | } | 572 | } |
573 | }, | 573 | }, |
574 | 574 | ||
@@ -687,7 +687,7 @@ var TimelineTrack = exports.TimelineTrack = Montage.create(Component, { | |||
687 | keyframeString += " }"; | 687 | keyframeString += " }"; |
688 | // set the keyframe string as the new rule | 688 | // set the keyframe string as the new rule |
689 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); | 689 | this.currentKeyframeRule = this.ninjaStylesContoller.addRule(keyframeString); |
690 | this.application.ninja.documentController.activeDocument.needsSave = true; | 690 | this.application.ninja.documentController.activeDocument.model.needsSave = true; |
691 | } | 691 | } |
692 | }, | 692 | }, |
693 | 693 | ||