30 files changed, 741 insertions, 368 deletions

diff --git a/js/controllers/local-storage-controller.js b/js/controllers/local-storage-controller.js
index 6963b245..1388f3e5 100755
--- a/js/controllers/local-storage-controller.js
+++ b/js/controllers/local-storage-controller.js
@@ -7,44 +7,51 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage,
     Component       = require("montage/ui/component").Component;
 
-exports.LocalStorage = Montage.create( Montage, {
+exports.LocalStorage = Montage.create( Component, {
 
-    getItem: {
-        value: function(item) {
-            var item;
-
-            if (window.localStorage) {
-                item  = window.localStorage.getItem(item);
-                if(item !== null) return JSON.parse(item)
-                return null;
-            } else {
-                alert("Local Storage is not supported on your browser");
-                return null;
-            }
+    canStore: {
+        value: null
+    },
 
-            /*
-            if (window.localStorage) {
-                this.getItem = function(item) {
-                    return window.localStorage.getItem(item);
-                }(item);
-            } else {
-                alert("Local Storage is not supported on your browser");
+    deserializedFromTemplate: {
+        value: function() {
+            this.canStore = window.localStorage;
+            this.application.localStorage = this;
+
+            // Redefine setItem and getItem if local storage is not available.
+            if(!this.canStore) {
+                this.getItem = function() {
+                    console.log("Local Storage is not supported on your browser");
+                    return "";
+                };
+
+                this.setItem = function() {
+                    console.log("Local Storage is not supported on your browser");
+                    return false;
+                }
+            }
 
+            // Temporary clear the local storage if we find the version key
+            if(window.localStorage.version) {
+                window.localStorage.clear();
             }
-            */
+        }
+    },
+
+    getItem: {
+        value: function(key) {
+            var value = window.localStorage.getItem("ninja-" + key);
+            if(value !== null) value = JSON.parse(value);
+
+            return value;
         }
     },
 
     setItem: {
-        value: function(item, value) {
-            if (window.localStorage) {
-                window.localStorage.setItem(item, JSON.stringify(value));
-                return true;
-            } else {
-                alert("Local Storage is not supported on your browser");
-                return false;
-            }
+        value: function(key, value) {
+            window.localStorage.setItem("ninja-" + key, JSON.stringify(value));
+
+            return value;
         }
     }
-
 });
\ No newline at end of file
diff --git a/js/data/settings.js b/js/data/settings.js
deleted file mode 100755
index ffea2075..00000000
--- a/js/data/settings.js
+++ /dev/null
@@ -1,71 +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, {
-
-    version: {
-        value: "11.1213"
-    },
-
-    _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;
-            }
-        }
-    },
-    
-    deserializedFromSerialization: {
-        value: function() {
-
-            if (LocalStorage.getItem("version") != this.version) {
-                this.settings = {}
-                LocalStorage.setItem("version",this.version);
-            } else {
-                this.settings = LocalStorage.getItem("settings");
-            }
-
-        }
-    }
-});
\ No newline at end of file
diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 94202dc5..372be345 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -597,7 +597,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         }
 
             // TODO - Don't traverse components' children
-            if(elt.elementModel && elt.elementModel.isComponent)
+//            if(elt.elementModel && elt.elementModel.isComponent)
+            if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG"))))
             {
                 return;
             }
@@ -1007,7 +1008,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         }
 
             // TODO - Don't traverse components' children
-            if(elt.elementModel && elt.elementModel.isComponent)
+//            if(elt.elementModel && elt.elementModel.isComponent)
+            if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG"))))
             {
                 return;