Changeset 917

Timestamp:

2008-03-30 21:18:52 (2 years ago)

Author:

MaierMan

Message:

#662 Use nsIJSON as serializer

Files:

• trunk/chrome/content/dta/manager.js (modified) (2 diffs)
• trunk/chrome/content/dta/manager/sessionmanager.js (modified) (2 diffs)

trunk/chrome/content/dta/manager.js

@@ -1662 +1662 @@
-                        );
-                }
-e.toSource(
+Serializer.encode(e
-        }
-}
@@ -2683 +2683 @@
-        }
-};
+
+var Serializer = {
+        encode: function(obj) {
+                if ('nsIJSON' in Ci) {
+                        Debug.logString("hello json");
+                        let json = Serv('@mozilla.org/dom/json;1', 'nsIJSON');
+                        this.encode = function(obj) {
+                                return json.encode(obj);
+                        }
+                }
+                else {
+                        this.encode = function(obj) {
+                                return obj.toSource();
+                        }
+                }
+                return this.encode(obj);
+        },
+        decode: function(str) {
+                if ('nsIJSON' in Ci) {
+                        Debug.logString("hello json");
+                        let json = Serv('@mozilla.org/dom/json;1', 'nsIJSON');
+                        this.decode = function(str) {
+                                return json.decode(str);
+                        }
+                }
+                else {
+                        this.decode = function(str) {
+                                return eval(str);
+                        }
+                }
+                return this.decode(str);
+        }
+};

trunk/chrome/content/dta/manager/sessionmanager.js

@@ -42 +42 @@
-
-var SessionManager = {
-
-        init: function() {
-                this._con = Serv('@mozilla.org/storage/service;1', 'mozIStorageService')
@@ -169 +168 @@
-                        try {
-                                let dbId = stmt.getInt64(0);
-eval
+Serializer.decode
-                                let get = function(attr) {
-                                        if (attr in down) {