From 4046fca0daee6e064ee5c67bd0826ac42af7718d Mon Sep 17 00:00:00 2001 From: Kruti Shah Date: Tue, 19 Jun 2012 10:12:49 -0700 Subject: Locked Elements. Layer Controls Signed-off-by: Kruti Shah --- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 339ca5a4..1ef57b13 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -580,6 +580,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { // Bind the handlers for the config menu this.checkable_animated.addEventListener("click", this.handleAnimatedClick.bind(this), false); this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false); + this.checkable_lock.addEventListener("click",this.handleLockLayerClick.bind(this),false); + this.checkable_visible.addEventListener("click",this.handleLayerVisibleClick.bind(this),false); document.addEventListener("click", this.handleDocumentClick.bind(this), false); this.addPropertyChangeListener("currentDocument.model.domContainer", this); @@ -1395,6 +1397,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { thingToPush.layerData._isFirstDraw = true; thingToPush.layerData.created = true; thingToPush.layerData.stageElement = object; + thingToPush.layerData.isLock = false; + thingToPush.layerData.isHidden = false; + if (this.checkable_animated.classList.contains("checked")) { thingToPush.layerData.isVisible = false; @@ -1712,6 +1717,77 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { } }, + handleLockLayerClick:{ + value:function(event){ + + var arrLayersLength = this.arrLayers.length; + console.log(this.application.ninja.currentDocument) + debugger; + var lockElementArrLength = this.application.ninja.currentDocument.lockedElements.length; + var i = 0; + + if(event.currentTarget.classList.contains("checked")){ + event.currentTarget.classList.remove("checked"); + for(i=0;i --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 1ef57b13..87e7bd2e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1119,6 +1119,17 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { // Deselect selected layers if they're not in arrSelectedIndexes. for (i = 0; i < arrLayersLength; i++) { + + debugger; + if([i]===arrSelectedIndexes){ + if(this.arrLayers[i].layerData.isLock){ + this.arrLayers[i].layerData.isSelected = false; + }else{ + this.arrLayers[i].layerData.isSelected = true; + } + }else{ + this.arrLayers[i].layerData.isSelected = false; + } if (this.arrLayers[i].layerData.isSelected === true) { if (arrSelectedIndexes.indexOf(i) < 0) { -- cgit v1.2.3 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 --- .../Timeline/TimelinePanel.reel/TimelinePanel.js | 35 ++++++++-------------- 1 file changed, 13 insertions(+), 22 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 87e7bd2e..3b6db82e 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -732,6 +732,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { this.application.ninja.currentDocument.tlCurrentLayerSelected = false; this.application.ninja.currentDocument.tlCurrentLayersSelected = false; this.application.ninja.currentDocument.tlCurrentElementsSelected = []; + this.application.ninja.currentDocument.lockedElements = []; } }, @@ -1119,20 +1120,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { // Deselect selected layers if they're not in arrSelectedIndexes. for (i = 0; i < arrLayersLength; i++) { - - debugger; - if([i]===arrSelectedIndexes){ - if(this.arrLayers[i].layerData.isLock){ - this.arrLayers[i].layerData.isSelected = false; - }else{ - this.arrLayers[i].layerData.isSelected = true; - } - }else{ - this.arrLayers[i].layerData.isSelected = false; - } if (this.arrLayers[i].layerData.isSelected === true) { if (arrSelectedIndexes.indexOf(i) < 0) { - this.arrLayers[i].layerData.isSelected = false; this.triggerLayerBinding(i); } @@ -1150,11 +1139,16 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { // Loop through arrLayers and do the selection. for (i = 0; i < arrLayersLength; i++) { if (arrSelectedIndexes.indexOf(i) > -1) { - this.arrLayers[i].layerData.isSelected = true; - this.arrLayers[i].isSelected = true; - this.triggerLayerBinding(i); - arrSelectedLayers.push(i); - arrCurrentElementsSelected.push(this.arrLayers[i].layerData.stageElement); + if(!this.arrLayers[i].layerData.isLock){ + this.arrLayers[i].layerData.isSelected = true; + this.arrLayers[i].isSelected = true; + this.triggerLayerBinding(i); + arrSelectedLayers.push(i); + arrCurrentElementsSelected.push(this.arrLayers[i].layerData.stageElement); + }else{ + this.arrLayers[i].layerData.isSelected = false; + this.triggerLayerBinding(i); + } } } @@ -1732,8 +1726,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { value:function(event){ var arrLayersLength = this.arrLayers.length; - console.log(this.application.ninja.currentDocument) - debugger; var lockElementArrLength = this.application.ninja.currentDocument.lockedElements.length; var i = 0; @@ -1767,7 +1759,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { handleLayerVisibleClick:{ value:function(event){ - var arrLayersLength = this.arrLayers.length; var lockElementArrLength = this.application.ninja.currentDocument.lockedElements.length; var i = 0; @@ -1776,7 +1767,7 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { event.currentTarget.classList.remove("checked"); for(i = 0; i < arrLayersLength; i++){ this.arrLayers[i].layerData.isHidden = false; - this.arrLayers[i].layerData.elementsList[0].style.visibility = "visible"; + this.arrLayers[i].layerData.stageElement.style.visibility = "visible"; for(var k=0;k --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 2cbd9e2b..1c023fdb 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -1034,17 +1034,15 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { }, handleKeyframeShortcut:{ - value:function(){ - //console.log(this.currentLayersSelected); - //console.log(this.trackRepetition); + value:function(action){ var tempEv = {}; tempEv.offsetX = this.playheadmarker.offsetLeft; + tempEv.actionType = action; if (typeof(this.trackRepetition.childComponents[this.currentLayersSelected[0]]) !== "undefined") { this.trackRepetition.childComponents[this.currentLayersSelected[0]].handleKeyboardShortcut(tempEv); } else { // oops, we do not have a layer selected. We should growl at the user. For now, this will fail silently. } - } }, -- cgit v1.2.3 From 7563c059270d08395f52d9349bbe4d9aa9d9b99f Mon Sep 17 00:00:00 2001 From: Jonathan Duran Date: Fri, 22 Jun 2012 11:22:47 -0700 Subject: Timeline fix - remove unneeded binding Signed-off-by: Jonathan Duran --- js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js | 6 ------ 1 file changed, 6 deletions(-) (limited to 'js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js') diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js index 1c023fdb..53a3b299 100644 --- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js +++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js @@ -869,12 +869,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, { this.checkable_lock.addEventListener("click",this.handleLockLayerClick.bind(this),false); this.checkable_visible.addEventListener("click",this.handleLayerVisibleClick.bind(this),false); - // Bind some bindings - Object.defineBinding(this, "currentSelectedContainer", { - boundObject:this.application.ninja, - boundObjectPropertyPath:"currentSelectedContainer", - oneway:true - }); this.addPropertyChangeListener("currentDocument.model.domContainer", this); // Start the panel out in disabled mode by default -- cgit v1.2.3