Fix DFL-2447: Can't add keys with "\" in storage.

Author: hzr

src/storage/data-storages.js

@@ -77,27 +77,6 @@ cls.StorageDataBase = new function()
     return item;
   };
 
-  this._encode = (function()
-  {
-    /* from the ecma spec
-      \u000A Line Feed <LF>
-      \u000D Carriage Retu rn <CR>
-      \u2028 Line separator <LS>
-      \u2029 Paragraph separator <PS>
-    */
-    var
-    re = /(\u000A)|(\u000D)|(\u2028)|(\u2029)/g,
-    fn = function(match, NL, CR, LS, PS)
-    {
-      return NL && "\\u000A" || CR && "\\u000D" || LS && "\\u2028" || PS && "\\u2029";
-    };
-
-    return function(str)
-    {
-      return str.replace(re, fn).replace(/\"/g, "\\\"");
-    }
-  })();
-
   this.set_item = function(rt_id, key, value, success_callback)
   {
     var item = this.get_item(rt_id, key);
@@ -116,8 +95,8 @@ cls.StorageDataBase = new function()
         }
       );
     }
-    var script = "local_storage.set_item(\"" + this._encode(item.key) + "\",\"" +
-      this._encode(value) + "\",\"" + item.type + "\")";
+    var script = "local_storage.set_item(\"" + window.helpers.escape_input(item.key) + "\",\"" +
+      window.helpers.escape_input(value) + "\",\"" + item.type + "\")";
     var tag = tagManager.set_callback(this, this._handle_default,
       [success_callback, "failed set_item in LocalStorageData"]);
     services['ecmascript-debugger'].requestEval(tag,
@@ -131,7 +110,7 @@ cls.StorageDataBase = new function()
     var item = this.get_item(rt_id, key);
     if (item)
     {
-      var script = "local_storage.remove_item(\"" + item.key + "\")";
+      var script = "local_storage.remove_item(\"" + window.helpers.escape_input(item.key) + "\")";
       var tag = tagManager.set_callback(this, this._handle_remove,
         [success_callback, "failed remove_item in LocalStorageData", rt_id, item.key]);
       services['ecmascript-debugger'].requestEval(tag,