aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-28 12:44:31 -0800
committerValerio Virgillito2012-02-28 12:44:31 -0800
commit7c9291a5bab4abd849547f8878f6fb962fc88250 (patch)
treed5dd4ee6ff901c00b40f3e89c3cfb620e60a5051 /js/data
parent6054d13cf1254447d2396889eafc6a953f0b8d4a (diff)
parent700611c9aaee6093bbf4e86503c1decb5ac65c83 (diff)
downloadninja-7c9291a5bab4abd849547f8878f6fb962fc88250.tar.gz
Merge branch 'refs/heads/integration-candidate'
Diffstat (limited to 'js/data')
-rwxr-xr-xjs/data/menu-data.js2
-rwxr-xr-xjs/data/settings.js71
2 files changed, 1 insertions, 72 deletions
diff --git a/js/data/menu-data.js b/js/data/menu-data.js
index 7c3ca5d4..52710b3a 100755
--- a/js/data/menu-data.js
+++ b/js/data/menu-data.js
@@ -44,7 +44,7 @@ exports.MenuData = Montage.create( Montage, {
44 "displayText" : "Save As", 44 "displayText" : "Save As",
45 "hasSubMenu" : false, 45 "hasSubMenu" : false,
46 "enabled": true, 46 "enabled": true,
47 "action":"saveAs" 47 "action":"executeSaveAs"
48 }, 48 },
49 { 49 {
50 "displayText" : "Save All", 50 "displayText" : "Save All",
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 @@
1/* <copyright>
2This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5</copyright> */
6
7var Montage = require("montage/core/core").Montage,
8 Component = require("montage/ui/component").Component,
9 LocalStorage = require("js/controllers/local-storage-controller").LocalStorage;
10
11exports.Settings = Montage.create( Component, {
12
13 version: {
14 value: "11.1213"
15 },
16
17 _settings: {
18 value: null
19 },
20
21 settings: {
22 get: function() { return this._settings; },
23 set: function(value) { this._settings = value; }
24 },
25
26 getSetting: {
27 value: function(objName, fieldName, namespace) {
28 try {
29 objName = objName.replace(/-/gi, "_").replace(/\//gi, "zzSlash");
30 return this.settings[objName][fieldName];
31 } catch(e) {
32 return null;
33 }
34 }
35 },
36
37 setSetting: {
38 value: function(objName, fieldName, value, namespace) {
39 try {
40 objName = objName.replace(/-/gi, "_").replace(/\//gi, "zzSlash");
41
42 if(this.settings === null) {
43 this.settings = {};
44 }
45
46 if (this.settings[objName] == null) {
47 this.settings[objName] = {};
48 }
49
50 this.settings[objName][fieldName] = value;
51
52 LocalStorage.setItem("settings", this.settings);
53 } catch(e) {
54 return null;
55 }
56 }
57 },
58
59 deserializedFromSerialization: {
60 value: function() {
61
62 if (LocalStorage.getItem("version") != this.version) {
63 this.settings = {}
64 LocalStorage.setItem("version",this.version);
65 } else {
66 this.settings = LocalStorage.getItem("settings");
67 }
68
69 }
70 }
71}); \ No newline at end of file