5 files changed, 141 insertions, 402 deletions

diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f62d43a4..3bc87f68 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -542,9 +542,6 @@ var Layer = exports.Layer = Montage.create(Component, {
                         this.element.addEventListener("dragleave", this.handleDragleave.bind(this), false);
                         this.element.addEventListener("dragstart", this.handleDragstart.bind(this), false);
                         this.element.addEventListener("drop", this.handleDrop.bind(this), false);
-                        
-                        // Bind this.layerTag to the tag 
-
         }
     },
     draw: {
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
index 09c1f98c..5234b43d 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.html
@@ -35,7 +35,8 @@
                         "timeline_disabler" : {"#" : "timeline-disabler"},
                         "checkable_relative" : {"#" : "checkable_relative"},
                         "checkable_absolute" : {"#" : "checkable_absolute"},
-                        "checkable_animated" : {"#" : "checkable_animated"}
+                        "checkable_animated" : {"#" : "checkable_animated"},
+                        "tl_configbutton" : {"#" : "tl-configbutton"}
                     }
                 },
 
@@ -181,15 +182,18 @@
                         
                         <div id="user_layers" class="userlayers">
                             <div id="master_layer" class="masterlayer">
-                                <div>Master Layer</div>
-                                <div class="tl-configbutton">
-                                        <div class="tl-dropdown">
-                                                                                <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
-                                                                                <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
-                                                                                <div class="nj-divider divider-horizontal"></div>
-                                                <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
-                                        </div>
+                                <div class="layer-master">Master Layer
+                                        <div class="tl-configbutton" data-montage-id="tl-configbutton">
+                                                <div class="tl-dropdown">
+                                                                                        <div class="checkable checked" data-montage-id="checkable_relative">Use relative positioning</div>
+                                                                                        <div class="checkable" data-montage-id="checkable_absolute">Use absolute positioning</div>
+                                                                                        <div class="nj-divider divider-horizontal"></div>
+                                                        <div class="checkable" data-montage-id="checkable_animated">Show only animated layers</div>
+                                                </div>
+                                        </div>
+                                
                                 </div>
+
                             </div>
                             <div id="container-layers" style="position: relative;" class="container-layers">
                                 <div id="container-layer"></div>
diff --git a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
index eabe1a7a..191b87d5 100644
--- a/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
+++ b/js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
@@ -342,6 +342,8 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             this.checkable_animated.addEventListener("click", this.handleAnimatedClick.bind(this), false);
             this.checkable_relative.addEventListener("click", this.handleRelativeClick.bind(this), false);
             this.checkable_absolute.addEventListener("click", this.handleAbsoluteClick.bind(this), false);
+            this.tl_configbutton.addEventListener("click", this.handleConfigButtonClick.bind(this), false);
+            document.addEventListener("click", this.handleDocumentClick.bind(this), false);
         }
     },
 
@@ -781,6 +783,10 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             thingToPush.layerData.isSelected = true;
             thingToPush.layerData._isFirstDraw = true;
             thingToPush.layerData.created = true;
+            
+            if (this.checkable_animated.classList.contains("checked")) {
+                thingToPush.layerData.isVisible = false;
+            }
 
             for (i = 0; i < this.arrLayersLength; i++) {
                 this.arrLayers[i].layerData.isSelected = false;
@@ -808,35 +814,37 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     restoreLayer:{
         value:function (ele) {
 
-                var newLayerName, thingToPush = this.createLayerTemplate();
+            var newLayerName, thingToPush = this.createLayerTemplate();
 
-                this.currentLayerNumber = this.currentLayerNumber + 1;
-                newLayerName = "Layer " + this.currentLayerNumber;
+            this.currentLayerNumber = this.currentLayerNumber + 1;
+            newLayerName = "Layer " + this.currentLayerNumber;
 
-                if(ele.dataset.storedLayerName){
-                    newLayerName = ele.dataset.storedLayerName;
-                }
-                thingToPush.layerData.layerName = newLayerName;
-                thingToPush.layerData.layerID = this.currentLayerNumber;
-                thingToPush.layerData.layerTag = "<" + ele.nodeName.toLowerCase() + ">";
-                thingToPush.parentElementUUID = this.hashKey;
-                thingToPush.parentElement = this.application.ninja.currentSelectedContainer;
-                
-                // Are there styles to add?
-                thingToPush.layerData.arrLayerStyles = this.createLayerStyles();
-                thingToPush.layerData.arrStyleTracks = this.createStyleTracks();
+            if(ele.dataset.storedLayerName){
+                newLayerName = ele.dataset.storedLayerName;
+            }
+            thingToPush.layerData.layerName = newLayerName;
+            thingToPush.layerData.layerID = this.currentLayerNumber;
+            thingToPush.layerData.layerTag = "<" + ele.nodeName.toLowerCase() + ">";
+            thingToPush.parentElementUUID = this.hashKey;
+            thingToPush.parentElement = this.application.ninja.currentSelectedContainer;
+            if (this.checkable_animated.classList.contains("checked")) {
+                thingToPush.layerData.isVisible = false;
+            }
+            // Are there styles to add?
+            thingToPush.layerData.arrLayerStyles = this.createLayerStyles();
+            thingToPush.layerData.arrStyleTracks = this.createStyleTracks();
 
-                if (this._openDoc) {
-                    thingToPush.layerData.elementsList.push(ele);
-                }
+            if (this._openDoc) {
+                thingToPush.layerData.elementsList.push(ele);
+            }
+
+            this.temparrLayers.splice(0, 0, thingToPush);
+            thingToPush.layerData.trackPosition = this.temparrLayers.length - 1;
+            thingToPush.layerData.layerPosition = this.temparrLayers.length - 1;
 
-                this.temparrLayers.splice(0, 0, thingToPush);
-                thingToPush.layerData.trackPosition = this.temparrLayers.length - 1;
-                thingToPush.layerData.layerPosition = this.temparrLayers.length - 1;
+            this._openDoc = false;
 
-                this._openDoc = false;
 
-//            }
         }
     },
 
@@ -1100,8 +1108,29 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
             }
         }
     },
+    handleConfigButtonClick: {
+        value: function(event) {
+                event.stopPropagation();
+                this.handleCheckableClick(event);
+                
+        }
+    },
+    handleDocumentClick: {
+        value: function(event) {
+                if (this.tl_configbutton.classList.contains("checked")) {
+                        this.tl_configbutton.classList.remove("checked");
+                }
+        }
+    },
+    
     handleAnimatedClick: {
         value: function(event) {
+                if (typeof(this.application.ninja.currentDocument) === "undefined") {
+                        return;
+                }
+                if (this.application.ninja.currentDocument == null) {
+                        return;
+                }
                 this.handleCheckableClick(event);
                 this.application.ninja.currentDocument.boolShowOnlyAnimated = event.currentTarget.classList.contains("checked");
                 var boolHide = false,
@@ -1129,14 +1158,18 @@ var TimelinePanel = exports.TimelinePanel = Montage.create(Component, {
     },
     handleRelativeClick: {
         value: function(event) {
-                this.handleCheckableClick(event);
+                if (!event.currentTarget.classList.contains("checked")) {
+                        this.handleCheckableClick(event);
+                }
                 this.checkable_absolute.classList.remove("checked");
                 // TODO: Use relative positioning
         }
     },
     handleAbsoluteClick: {
         value: function(event) {
-                this.handleCheckableClick(event);
+                if (!event.currentTarget.classList.contains("checked")) {
+                        this.handleCheckableClick(event);