Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local

Conflicts:
	js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
	Resolution: Use both.

2 files changed, 91 insertions, 17 deletions

diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 9e2bacd5..eac361a8 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -35,7 +35,9 @@
                         "container_tracks" : {"#" : "container-tracks"},
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_animated" : {"#" : "checkable_animated"},
-                        "tl_configbutton" : {"#" : "tl-configbutton"}
+                        "tl_configbutton" : {"#" : "tl-configbutton"},
+                        "checkable_lock" : {"#" : "checkable_lock"},
+                        "checkable_visible":{"#" : "checkable_visible"}
                     }
                 },
 
@@ -178,6 +180,8 @@
                                         <div class="tl-configbutton" data-montage-id="tl-configbutton">
                                                 <div class="tl-dropdown">
                                                         <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
+                                            <div class="checkable" data-montage-id="checkable_lock">Lock Layers</div>
+                                            <div class="checkable" data-montage-id="checkable_visible">Visibility of Layers</div>
                                                 </div>
                                         </div>
                                 
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index 29d19c4f..e613d4d7 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -776,6 +776,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 = [];
                 this.application.ninja.currentDocument.tlBreadcrumbHash = [];
         }
     },
@@ -895,13 +896,9 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             document.addEventListener("keydown", this.timelineLeftPaneKeydown.bind(this), false);
             document.addEventListener("keyup", this.timelineLeftPaneKeyup.bind(this), false);
             this.eventManager.addEventListener("updatedID", this.handleLayerIdUpdate.bind(this), false);
+                        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
@@ -1077,17 +1074,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.
             }
-            
         }
     },
 
@@ -1185,7 +1180,6 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             for (i = 0; i < arrLayersLength; i++) {
                 if (this.arrLayers[i].layerData.isSelected === true) {
                         if (arrSelectedIndexes.indexOf(i) < 0) {
-
                                                 this.arrLayers[i].layerData.isSelected = false;
                                 this.triggerLayerBinding(i);
                         }
@@ -1203,11 +1197,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);
+                    }
                 }
             }
 
@@ -1461,6 +1460,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;
@@ -1778,6 +1780,74 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
         }
     },
 
+    handleLockLayerClick:{
+        value:function(event){
+
+           var arrLayersLength = this.arrLayers.length;
+           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<arrLayersLength;i++){
+                   this.arrLayers[i].layerData.isLock = false;
+                   this.arrLayers[i].layerData.isSelected = true;
+                   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;
+                     }
+                   }
+
+               }
+           } else {
+               for(i = 0;i < arrLayersLength;i++){
+                   if(!this.arrLayers[i].layerData.isLock){
+                       this.arrLayers[i].layerData.isLock = true;
+                       this.arrLayers[i].layerData.isSelected = false;
+                       this.application.ninja.currentDocument.lockedElements.push(this.arrLayers[i].layerData.stageElement);
+                   }
+                   this.selectLayers([]);
+
+               }
+               event.currentTarget.classList.add("checked");
+           }
+        }
+    },
+
+    handleLayerVisibleClick:{
+        value:function(event){
+           var arrLayersLength = this.arrLayers.length;
+           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 < arrLayersLength; i++){
+                   this.arrLayers[i].layerData.isHidden = false;
+                   this.arrLayers[i].layerData.stageElement.style.visibility = "visible";
+                   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;
+                       }
+                   }
+
+               }
+           } else {