diff options
author | Eric Guzman | 2012-05-17 17:43:05 -0700 |
---|---|---|
committer | Eric Guzman | 2012-05-17 17:43:05 -0700 |
commit | 458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7 (patch) | |
tree | ee329e409fe28ae54c894b9e27e82e1f85aefc85 /js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | |
parent | 82954f400f7f8609aef0d2bc1f44c9d960907be6 (diff) | |
parent | 52394cdd71bd62c8c109fd135fa146b7183fbd1f (diff) | |
download | ninja-458a4598ed64e3d8c6010a216fb7fb4b3c3c87e7.tar.gz |
Merge branch 'dom-architecture' of github.com:Motorola-Mobility/ninja-internal into CSSPanelUpdates
Conflicts:
js/document/templates/montage-html/default_html.css
js/lib/NJUtils.js
Diffstat (limited to 'js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js')
-rw-r--r-- | js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js | 4 |
1 files changed, 2 insertions, 2 deletions
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 | ||