removing the old settings class and disabling panel settings until the new panels are in

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

6 files changed, 70 insertions, 116 deletions

diff --git a/js/data/settings.js b/js/data/settings.js
deleted file mode 100755
index 6b1af3fc..00000000
--- a/js/data/settings.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-
-var Montage = require("montage/core/core").Montage,
-    Component       = require("montage/ui/component").Component,
-    LocalStorage    = require("js/controllers/local-storage-controller").LocalStorage;
-
-exports.Settings = Montage.create( Component, {
-
-    _settings: {
-        value: null
-    },
-
-    settings: {
-        get: function() { return this._settings; },
-        set: function(value) { this._settings = value; }
-    },
-
-    getSetting: {
-        value: function(objName, fieldName, namespace) {
-            try {
-                objName = objName.replace(/-/gi, "_").replace(/\//gi, "zzSlash");
-                return this.settings[objName][fieldName];
-            } catch(e) {
-                return null;
-            }
-        }
-    },
-
-    setSetting: {
-        value: function(objName, fieldName, value, namespace) {
-            try {
-                objName = objName.replace(/-/gi, "_").replace(/\//gi, "zzSlash");
-
-                if(this.settings === null) {
-                    this.settings = {};
-                }
-
-                if (this.settings[objName] == null) {
-                    this.settings[objName] = {};
-                }
-
-                this.settings[objName][fieldName] = value;
-
-                LocalStorage.setItem("settings", this.settings);
-            } catch(e) {
-                return null;
-            }
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index 953e560c..b1fb6352 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -27,11 +27,6 @@
                 "name": "LocalStorage"
             },
 
-            "settings1": {
-                "module": "js/data/settings",
-                "name": "Settings"
-            },
-
             "toolsData1": {
                 "module": "js/data/tools-data",
                 "name": "ToolsData"
diff --git a/js/panels/Panel.reel/Panel.html b/js/panels/Panel.reel/Panel.html
index 46c8fb91..7556952c 100755
--- a/js/panels/Panel.reel/Panel.html
+++ b/js/panels/Panel.reel/Panel.html
@@ -14,7 +14,8 @@
                 "properties": {
                     "element": {"#": "resizeBar"},
                     "panel": {"#": "panel"},
-                    "isVertical": true
+                    "isVertical": true,
+                    "willSave": false
                 },
                 "bindings": {
                     "ownerId": {
diff --git a/js/panels/PanelBase.js b/js/panels/PanelBase.js
index 03dcd0ee..473de596 100755
--- a/js/panels/PanelBase.js
+++ b/js/panels/PanelBase.js
@@ -36,56 +36,55 @@ exports.PanelBase = Montage.create(Component, {
                 /*
                 if(this.application.ninja.settings.getSetting(this.panelName, "contentHeight")) {
                     this._contentHeight = this.application.ninja.settings.getSetting(this.panelName, "contentHeight");
-                } else {
-                    this._contentHeight = this.defaultHeight;
-                }*/
+                } */
+
                 this._contentHeight = this.defaultHeight;
             }
              return this._contentHeight;
          },
          set: function(value) {
-            if (this.minHeight > value) value = this._minHeight;
-            if (this.maxHeight != null) if(this.maxHeight < value) value = this.maxHeight;
+             if (this.minHeight > value) value = this._minHeight;
+             if (this.maxHeight != null) if(this.maxHeight < value) value = this.maxHeight;
              this._contentHeight = value;
-//            this.application.ninja.settings.setSetting(this.panelName, "contentHeight", value);
+
+             // this.application.ninja.settings.setSetting(this.panelName, "contentHeight", value);
          }
      },
     forcedCollapse: {
         get: function() {
             if(this._forcedCollapse == null) {
+                // Old settings
                 /*
                 if(this.application.Ninja.SettingsManager.getSetting(this.panelName, "isPanelForceCollapsed")) {
                     this._forcedCollapse = this.application.Ninja.SettingsManager.getSetting(this.panelName, "isPanelForceCollapsed");
-                } else {
-                    this._forcedCollapse = false;
-                }
-                */
+                } */
                 this._forcedCollapse = false;
             }
             return this._forcedCollapse;
         },
         set: function(value) {
             this._forcedCollapse = value;
-            //this.application.Ninja.SettingsManager.setSetting(this.panelName, "isPanelForceCollapsed", value);
+
+            // this.application.Ninja.SettingsManager.setSetting(this.panelName, "isPanelForceCollapsed", value);
         }
     },
     collapsed: {
         get: function() {
             if(this._collapsed == null) {
+                // Old settings
                 /*
                 if(this.application.ninja.settings.getSetting(this.panelName, "isPanelCollapsed")) {
                     this._collapsed = this.application.ninja.settings.getSetting(this.panelName, "isPanelCollapsed");
-                } else {
-                    this._collapsed = false;
-                }
-                */
+                } */
+
                 this._collapsed = false;
             }
             return this._collapsed;
         },
         set: function(value) {
             this._collapsed = value;
-            //this.application.ninja.settings.setSetting(this.panelName, "isPanelCollapsed", value);
+
+            // this.application.ninja.settings.setSetting(this.panelName, "isPanelCollapsed", value);
         }
     },
     visible: {
@@ -95,10 +94,8 @@ exports.PanelBase = Montage.create(Component, {
                 /*
                 if(typeof(this.application.ninja.settings.getSetting(this.panelName, "visible")) !== "undefined") {
                     this._visible = this.application.ninja.settings.getSetting(this.panelName, "visible");
-                } else {
-                    this._visible = true;
-                }
-                */
+                } */
+
                 this._visible = true;
 
             }
@@ -112,7 +109,4 @@ exports.PanelBase = Montage.create(Component, {
 
         }
     }
-
-    // Methods exist in panel.js
-
 });
diff --git a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
index bdd112c6..3cbd4369 100755
--- a/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
+++ b/js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js
@@ -63,16 +63,19 @@ exports.PanelContainer = Montage.create(Component, {
         value: function() {
             //Panels Loading
             this.lastOffset = this.element.offsetHeight;
-            /*
+
+            /* Old Settings
             if( this.application.ninja.settings.getSetting(this.element.id, "panelOrder") != null) {
                 this.initPanelOrder = this.application.ninja.settings.getSetting(this.element.id, "panelOrder")
             }
             */
+
             // if Panels already loaded no need to load again.
             for(var i = 0; i < this.initPanelOrder.length; i++) {
                 this.addPanel(eval(this.initPanelOrder[i]));
                 this.panelOrder.push(this.initPanelOrder[i]);
-//                this.application.ninja.settings.setSetting(this.element.id, "panelOrder", this.panelOrder);
+
+//              this.application.ninja.settings.setSetting(this.element.id, "panelOrder", this.panelOrder);
             }