From a822b95a035715e21d994f6a4c96c3e784107bea Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 19 Jun 2012 15:34:35 -0700 Subject: LockedElements - Layers Signed-off-by: Kruti Shah --- js/panels/Timeline/Layer.reel/Layer.js | 71 +++++++++++++++++----------------- 1 file changed, 36 insertions(+), 35 deletions(-) (limited to 'js/panels/Timeline/Layer.reel/Layer.js') diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js index 970f2b65..776d5ec8 100644 --- a/js/panels/Timeline/Layer.reel/Layer.js +++ b/js/panels/Timeline/Layer.reel/Layer.js @@ -1263,39 +1263,40 @@ var Layer = exports.Layer = Montage.create(Component, { }, handleLayerLock: { - value: function() { - var i = 0; - var arrlength = this.application.ninja.timeline.arrLayers.length; - var lockElementArrLength = this.application.ninja.currentDocument.lockedElements.length; - if(!this.layerData.isLock){ - for(i = 0; i < arrlength; i++){ - if(this.application.ninja.timeline.arrLayers[i].layerData.isLock){ - this.application.ninja.timeline.arrLayers[i].layerData.isLock = false; - this.application.ninja.timeline.arrLayers[i].layerData.isSelected = false; - for(var k = 0; k < lockElementArrLength; k++){ - if(this.application.ninja.currentDocument.lockedElements[k] === this.application.ninja.timeline.arrLayers[i].layerData.elementsList[0]){ - this.application.ninja.currentDocument.lockedElements.splice(k,1); - break; - } + value: function() { + var i = 0; + var arrlength = this.application.ninja.timeline.arrLayers.length; + var lockElementArrLength = this.application.ninja.currentDocument.lockedElements.length; + if(!this.layerData.isLock){ + for(i = 0; i < arrlength; i++){ + if(this.application.ninja.timeline.arrLayers[i].layerData.isLock){ + this.application.ninja.timeline.arrLayers[i].layerData.isLock = false; + this.application.ninja.timeline.arrLayers[i].layerData.isSelected = false; + for(var k = 0; k < lockElementArrLength; k++){ + if(this.application.ninja.currentDocument.lockedElements[k] === this.application.ninja.timeline.arrLayers[i].layerData.stageElement){ + this.application.ninja.currentDocument.lockedElements.splice(k,1); + break; } } - } - this.layerData.isSelected = false; - this.application.ninja.timeline.selectLayers([]); - this.application.ninja.currentDocument.lockedElements.push(this.layerData.elementsList[0]); - } else { - this.layerData.isSelected = true; - for(k = 0; k