diff options
author | Jon Reid | 2012-05-18 15:05:50 -0700 |
---|---|---|
committer | Jon Reid | 2012-05-18 15:05:50 -0700 |
commit | 6c4f58ab9dd2f60d509d3e1c1ba0c94a6995691d (patch) | |
tree | b555c40a0276052e6109d98a5ec23358759985f2 /js/panels/Timeline/Layer.reel | |
parent | ef499e92341c9bd6edbee70f86dc5a6fe8b461eb (diff) | |
download | ninja-6c4f58ab9dd2f60d509d3e1c1ba0c94a6995691d.tar.gz |
Timeline: Fix element insertion to use new TimelinePanel properties and
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).
Diffstat (limited to 'js/panels/Timeline/Layer.reel')
-rw-r--r-- | js/panels/Timeline/Layer.reel/Layer.js | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 48b2dfdf..4fb3e43c 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js | |||
@@ -500,11 +500,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
500 | this.element.addEventListener("dragleave", this.handleDragleave.bind(this), false); | 500 | this.element.addEventListener("dragleave", this.handleDragleave.bind(this), false); |
501 | this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false); | 501 | this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false); |
502 | this.element.addEventListener("drop", this.handleDrop.bind(this), false); | 502 | this.element.addEventListener("drop", this.handleDrop.bind(this), false); |
503 | |||
504 | this.eventManager.addEventListener("updatedID", this, false); | ||
505 | |||
506 | |||
507 | |||
508 | } | 503 | } |
509 | }, | 504 | }, |
510 | draw: { | 505 | draw: { |
@@ -854,23 +849,6 @@ var Layer = exports.Layer = Montage.create(Component, { | |||
854 | } | 849 | } |
855 | } | 850 | } |
856 | }, | 851 | }, |
857 | |||
858 | handleUpdatedID:{ | ||
859 | value:function(event){ | ||
860 | var i= this.application.ninja.timeline.arrLayers.length; | ||
861 | if(event.detail.id){ | ||
862 | for(var k=0;k<i;k++){ | ||
863 | if(this.application.ninja.timeline.arrLayers[k].layerData.layerID=== this.application.ninja.timeline.currentLayerSelected.layerData.layerID){ | ||
864 | this.application.ninja.timeline.currentLayerSelected.layerData.layerName = event.detail.id; | ||
865 | this.application.ninja.timeline.triggerLayerBinding(k); | ||
866 | this.needsDraw=true; | ||
867 | } | ||
868 | } | ||
869 | |||
870 | } | ||
871 | } | ||
872 | } | ||
873 | |||
874 | /* End: Logging routines */ | 852 | /* End: Logging routines */ |
875 | 853 | ||
876 | }); | 854 | }); |