add user and instance awere localstorage to prevent collisions when using localstorage

diff --git a/core/js/js.js b/core/js/js.js
index 2bb6cff0cb0b073b29f0e21d33b72837cc264a07..56ce87f1c21fa0aac014bf4018accf4c2de5755c 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -130,6 +130,35 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
+if(typeof localStorage !='undefined'){
+       //user and instance awere localstorage
+       OC.localStorage={
+               namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_',
+               hasItem:function(name){
+                       return OC.localStorage.getItem(name)!=null;
+               },
+               setItem:function(name,item){
+                       return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item));
+               },
+               getItem:function(name){
+                       return JSON.parse(localStorage.getItem(OC.localStorage.namespace+name));
+               }
+       }
+}else{
+       //dummy localstorage
+       OC.localStorage={
+               hasItem:function(name){
+                       return false;
+               },
+               setItem:function(name,item){
+                       return false;
+               },
+               getItem:function(name){
+                       return null;
+               }
+       }
+}
+
 /**
  * implement Array.filter for browsers without native support
  */
@@ -410,3 +439,5 @@ if (!Array.prototype.map){
 $.fn.filterAttr = function(attr_name, attr_value) {  
    return this.filter(function() { return $(this).attr(attr_name) === attr_value; });
 };
+
+