diff options
author | Jon Reid | 2012-03-01 09:23:46 -0800 |
---|---|---|
committer | Jon Reid | 2012-03-01 09:23:46 -0800 |
commit | e67000c704e284f4ab9b50c845853988272ce800 (patch) | |
tree | fad04a6a5ef5bfc8fa4efe88dac3eb7329bc3596 /js/panels/Timeline/TimelinePanel.reel | |
parent | 939cb7eccb8a5ec655fbde8b470894d293832307 (diff) | |
parent | 82ed48cc48ae1f8163021a0998e00d87da396d65 (diff) | |
download | ninja-e67000c704e284f4ab9b50c845853988272ce800.tar.gz |
Merge branch 'Timeline-main' into Timeline-newdoc
Diffstat (limited to 'js/panels/Timeline/TimelinePanel.reel')
-rw-r--r-- | js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 6d23453d..ec9555fe 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | |||
@@ -795,7 +795,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
795 | if(this.currentLayerSelected.elementsList[0]!==undefined){ | 795 | if(this.currentLayerSelected.elementsList[0]!==undefined){ |
796 | if(this.currentTrackSelected.isTrackAnimated){ | 796 | if(this.currentTrackSelected.isTrackAnimated){ |
797 | this.application.ninja.stage.clearDrawingCanvas(); | 797 | this.application.ninja.stage.clearDrawingCanvas(); |
798 | alert("cannot add elements to a layer with animated element");/* check how to clear the canvas*/ | 798 | console.log("cannot add elements to a layer with animated element"); |
799 | return; | 799 | return; |
800 | }else{ | 800 | }else{ |
801 | this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected); | 801 | this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected); |
@@ -805,12 +805,12 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { | |||
805 | this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected); | 805 | this.hashElementMapToLayer.setItem(event.detail.uuid, event.detail,this.currentLayerSelected); |
806 | this.currentLayerSelected.elementsList.push(event.detail); | 806 | this.currentLayerSelected.elementsList.push(event.detail); |
807 | } | 807 | } |
808 | |||
809 | } | 808 | } |
810 | }, | 809 | }, |
811 | 810 | ||
812 | handleElementDeleted:{ | 811 | handleElementDeleted:{ |
813 | value:function (event) { | 812 | value:function (event) { |
813 | |||
814 | var length; | 814 | var length; |
815 | this.deleteElement = event.detail; | 815 | this.deleteElement = event.detail; |
816 | length = this.currentLayerSelected.elementsList.length - 1; | 816 | length = this.currentLayerSelected.elementsList.length - 1; |