Merge branch 'master' into pentool

Conflicts:
	manifest.json

1 files changed, 53 insertions, 30 deletions

diff --git a/js/panels/Resizer.js b/js/panels/Resizer.js
index 3afe5d5b..ca6ed062 100755
--- a/js/panels/Resizer.js
+++ b/js/panels/Resizer.js
@@ -8,11 +8,42 @@ var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
 exports.Resizer = Montage.create(Component, {
- 
+
+    version: {
+        value: "1.0"
+    },
+
     hasTemplate: {
         value: false
     },
- 
+
+    // This property might not be needed anymore.
+    // TODO - Review this once we the the new panels in place
+    ownerId: {
+        value: ""
+    },
+
+    willSave: {
+        value: true
+    },
+
+    _value: {
+        value: null
+    },
+
+    value: {
+        get: function() {
+            return this._value;
+        },
+        set: function(val) {
+            this._value = val;
+        }
+    },
+
+    redrawStage: {
+        value:false
+    },
+
     _isInversed: {
         value: false
     },
@@ -74,7 +105,6 @@ exports.Resizer = Montage.create(Component, {
             e.preventDefault();
             this.panel.addEventListener("webkitTransitionEnd", this, true);
             if (this.isVertical) {
-                //console.log("y: " + e.y + "    startPosition: " + this._startPosition + "  initDimension: " + this._initDimension);
                 this._startPosition = e.y;
                 this._initDimension = this.panel.offsetHeight;
             }
@@ -98,21 +128,34 @@ exports.Resizer = Montage.create(Component, {
             } else {
                 this.panel.style.width = "";
             }
-            this.application.ninja.settings.setSetting(this.element.id,"value", "");
+
+            this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": ""});
         }
     },
 
     handleWebkitTransitionEnd: {
         value: function() {
+
             if(this.redrawStage) {
                 this.application.ninja.stage.resizeCanvases = true;
             }
-            this.panel.removeEventListener("webkitTransitionEnd");
+
+            this.panel.removeEventListener("webkitTransitionEnd", this, false);
+
         }
     },
  
     prepareForDraw: {
         value: function() {
+            if(this.willSave) {
+                var storedData = this.application.localStorage.getItem(this.element.getAttribute("data-montage-id"));
+
+                if(storedData && storedData.value) {
+                    this.value = storedData.value;
+                }
+
+            }
+
             if(this.value != null) {
                 if (this.isVertical) {
                     this.panel.style.height = this.value + "px";
@@ -137,15 +180,19 @@ exports.Resizer = Montage.create(Component, {
             window.removeEventListener("mousemove", this);
             window.removeEventListener("mouseup", this);
             this.panel.classList.remove("disableTransition");
+
             if (this.isVertical) {
                 this.panel.style.height = this.panel.offsetHeight;
             } else {
                 this.panel.style.width = this.panel.offsetWidth;
             }
-            this.application.ninja.settings.setSetting(this.element.id,"value", this.value);
+
+            this.application.localStorage.setItem(this.element.getAttribute("data-montage-id"), {"version": this.version, "value": this.value});
+
             if(this.redrawStage) {
                 this.application.ninja.stage.resizeCanvases = true;
             }
+
             NJevent("panelResizedEnd", this)
         }
     },
@@ -154,7 +201,6 @@ exports.Resizer = Montage.create(Component, {
         value: function(e) {
             if(this.isVertical) {
                 this.value = this._isInversed ? this._initDimension + (this._startPosition - e.y) : this._initDimension + (e.y - this._startPosition);
-                //console.log("y: " + e.y + "    startPosition: " + this._startPosition + "  initDimension: " + this._initDimension + "    finalPosition: " + pos);
                 this.panel.style.height = this.value + "px";
             }
             else {
@@ -172,28 +218,5 @@ exports.Resizer = Montage.create(Component, {
  
             NJevent("panelResizing", this);
         }
-    },
- 
-    _value: {
-        value: null
-    },
- 
-    redrawStage: {
-        value:false
-    },
- 
-    value: {
-        get: function() {
-            if(this.application.ninja.settings) {
-                var gottenValue = this.application.ninja.settings.getSetting(this.id, "value");
-                if (this._value == null && gottenValue !=null) {
-                    this.value = gottenValue;
-                }
-            }
-            return this._value;
-        },
-        set: function(val) {
-            this._value = val;
-        }
     }
 });
\ No newline at end of file