15 files changed, 99 insertions, 147 deletions
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js
index 98ebb36a..0640abb2 100755
--- a/js/panels/Splitter.js
+++ b/js/panels/Splitter.js
@@ -55,7 +55,6 @@ exports.Splitter = Montage.create(Component, {
        },
        set: function(value) {
            this._collapsed = value;
            this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": value});
        }
    },
@@ -139,5 +138,39 @@ exports.Splitter = Montage.create(Component, {
        value: function() {
            this.handleClick();
        }
+    },
+    collapse:{
+        value: function() {
+            if (this.collapsed === false) {
+                if(this.panel.element) {
+                    this.panel.element.addEventListener("webkitTransitionEnd", this, false);
+                } else {
+                    this.panel.addEventListener("webkitTransitionEnd", this, false);
+                }
+                this._collapsed = true;
+                this.needsDraw = true;
+            }
+        }
+    },
+    restore:{
+        value: function() {
+            //Get splitter initial value from SettingManager
+            var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id")), temp = this.collapsed;
+            if(storedData && this.element.getAttribute("data-montage-id") !== null) {
+                this._collapsed = storedData.value;
+            } else {
+                this._collapsed = false;
+            }
+            if(temp != this._collapsed){
+                if(this.panel.element) {
+                    this.panel.element.addEventListener("webkitTransitionEnd", this, false);
+                } else {
+                    this.panel.addEventListener("webkitTransitionEnd", this, false);
+                }
+                this.needsDraw = true;
+            }
+        }
    }
 });
diff --git a/js/panels/Timeline/Keyframe.reel/Keyframe.html b/js/panels/Timeline/Keyframe.reel/Keyframe.html
index 6f9a6d05..4b029874 100644
--- a/js/panels/Timeline/Keyframe.reel/Keyframe.html
+++ b/js/panels/Timeline/Keyframe.reel/Keyframe.html
@@ -22,7 +22,7 @@
        </head>
        <body>
-        <div id="keyframespace" class="tween_keyframe">
+        <div data-montage-id="keyframespace" class="tween_keyframe">
        </div>
    </body>
diff --git a/js/panels/Timeline/Layer.reel/Layer.js b/js/panels/Timeline/Layer.reel/Layer.js
index f2e20d41..b23da749 100644
--- a/js/panels/Timeline/Layer.reel/Layer.js
+++ b/js/panels/Timeline/Layer.reel/Layer.js
@@ -36,13 +36,10 @@ var Layer = exports.Layer = Montage.create(Component, {
    
    /* Style models: the array of styles, and the repetition that uses them */
    _arrLayerStyles : {
-        serializable: true,
-                enumerable: true,
            value: []
    },
    arrLayerStyles : {
        serializable: true,
-        enumerable: true,
        get: function() {
                return this._arrLayerStyles;
        },
@@ -142,8 +139,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    
    /* Position and Transform hottext values */
    _dtextPositionX : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextPositionX:{
@@ -161,8 +157,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _dtextPositionY : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextPositionY:{
@@ -180,8 +175,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _dtextScaleX : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextScaleX:{
@@ -199,8 +193,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _dtextScaleY : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextScaleY:{
@@ -218,8 +211,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _dtextSkewX : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextSkewX:{
@@ -237,8 +229,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _dtextSkewY : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextSkewY:{
@@ -256,8 +247,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _dtextRotate : {
-        value:null,
+        value:null
-        serializable: true
    },
    dtextRotate:{
@@ -276,10 +266,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    
    /* isSelected: whether or not the layer is currently selected. */
    _isSelected:{
-        value: false,
+        value: false
-        writable: true,
-        serializable: true,
-        enumerable: false
    },
    isSelected:{
@@ -319,9 +306,7 @@ var Layer = exports.Layer = Montage.create(Component, {
    
    
    _isAnimated:{
-        value: false,
+        value: false
-        writable: true,
-        enumerable: false
    },
    isAnimated:{
@@ -363,7 +348,6 @@ var Layer = exports.Layer = Montage.create(Component, {
    
    // Are the various collapsers collapsed or not
    _isMainCollapsed : {
-        serializable: true,
        value: true
    },
    isMainCollapsed : {
@@ -379,7 +363,6 @@ var Layer = exports.Layer = Montage.create(Component, {
    },
    
    _isTransformCollapsed : {
-        serializable: true,
        value: true
    },
    isTransformCollapsed : {
@@ -394,7 +377,6 @@ var Layer = exports.Layer = Montage.create(Component, {
    },