Permalink
Browse files

Merge pull request #5 from lingo/master

Fixup mistake in merge
  • Loading branch information...
2 parents 997deec + b0d7079 commit d684bfe059c2321b50d1a983f8a05bb990c0909f @msjolund committed Mar 12, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 jstorage.js
View
6 jstorage.js
@@ -68,10 +68,10 @@
_storage_elm: null,
/* function to encode objects to JSON strings */
- json_encode = $.toJSON || Object.toJSON || (window.JSON && (JSON.encode || JSON.stringify)),
+ json_encode: $.toJSON || Object.toJSON || (window.JSON && (JSON.encode || JSON.stringify)),
/* function to decode objects from JSON strings */
- json_decode = $.evalJSON || (window.JSON && (JSON.decode || JSON.parse)) || function(str){
+ json_decode: $.evalJSON || (window.JSON && (JSON.decode || JSON.parse)) || function(str){
return String(str).evalJSON();
},
@@ -216,4 +216,4 @@
}
// load saved data from browser
$.jStorage._init();
-})(typeof jQuery != "undefined" && jQuery || $);
+})(typeof jQuery != "undefined" && jQuery || $);

0 comments on commit d684bfe

Please sign in to comment.