From 33c3293d056c34dcb0a9dfa25b8b950cc06bcb3e Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 20 Oct 2016 12:16:44 +0200 Subject: [PATCH 1/2] Remove OC.localStorage and object method * use the localstorage APIs of the browser instead * use new Object() instead Signed-off-by: Morris Jobke --- core/js/js.js | 76 --------------------------------------------------- 1 file changed, 76 deletions(-) diff --git a/core/js/js.js b/core/js/js.js index 4b09cc4903..c12eb1d87e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1305,82 +1305,6 @@ OC.Breadcrumb={ } }; -if(typeof localStorage !=='undefined' && localStorage !== null){ - /** - * User and instance aware localstorage - * @namespace - */ - OC.localStorage={ - namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_', - - /** - * Whether the storage contains items - * @param {string} name - * @return {boolean} - */ - hasItem:function(name){ - return OC.localStorage.getItem(name)!==null; - }, - - /** - * Add an item to the storage - * @param {string} name - * @param {string} item - */ - setItem:function(name,item){ - return localStorage.setItem(OC.localStorage.namespace+name,JSON.stringify(item)); - }, - - /** - * Removes an item from the storage - * @param {string} name - * @param {string} item - */ - removeItem:function(name,item){ - return localStorage.removeItem(OC.localStorage.namespace+name); - }, - - /** - * Get an item from the storage - * @param {string} name - * @return {null|string} - */ - getItem:function(name){ - var item = localStorage.getItem(OC.localStorage.namespace+name); - if(item === null) { - return null; - } else { - return JSON.parse(item); - } - } - }; -}else{ - //dummy localstorage - OC.localStorage={ - hasItem:function(){ - return false; - }, - setItem:function(){ - return false; - }, - getItem:function(){ - return null; - } - }; -} - -/** - * prototypical inheritance functions - * @todo Write documentation - * usage: - * MySubObject=object(MyObject) - */ -function object(o) { - function F() {} - F.prototype = o; - return new F(); -} - /** * Initializes core */ From 867f72a485099381fb5ddc950d366f825381bec9 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Thu, 20 Oct 2016 12:18:33 +0200 Subject: [PATCH 2/2] Remove deprecated breadcrumbs implementation * was replaced by the version in files/ Signed-off-by: Morris Jobke --- core/js/js.js | 117 -------------------------------------------------- 1 file changed, 117 deletions(-) diff --git a/core/js/js.js b/core/js/js.js index c12eb1d87e..16da273c8e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1188,123 +1188,6 @@ OC.Notification={ } }; -/** - * Breadcrumb class - * - * @namespace - * - * @deprecated will be replaced by the breadcrumb implementation - * of the files app in the future - */ -OC.Breadcrumb={ - container:null, - /** - * @todo Write documentation - * @param dir - * @param leafName - * @param leafLink - */ - show:function(dir, leafName, leafLink){ - if(!this.container){//default - this.container=$('#controls'); - } - this._show(this.container, dir, leafName, leafLink); - }, - _show:function(container, dir, leafname, leaflink){ - var self = this; - - this._clear(container); - - // show home + path in subdirectories - if (dir) { - //add home - var link = OC.linkTo('files','index.php'); - - var crumb=$('
'); - crumb.addClass('crumb'); - - var crumbLink=$(''); - crumbLink.attr('href',link); - - var crumbImg=$(''); - crumbImg.attr('src',OC.imagePath('core','places/home')); - crumbLink.append(crumbImg); - crumb.append(crumbLink); - container.prepend(crumb); - - //add path parts - var segments = dir.split('/'); - var pathurl = ''; - jQuery.each(segments, function(i,name) { - if (name !== '') { - pathurl = pathurl+'/'+name; - var link = OC.linkTo('files','index.php')+'?dir='+encodeURIComponent(pathurl); - self._push(container, name, link); - } - }); - } - - //add leafname - if (leafname && leaflink) { - this._push(container, leafname, leaflink); - } - }, - - /** - * @todo Write documentation - * @param {string} name - * @param {string} link - */ - push:function(name, link){ - if(!this.container){//default - this.container=$('#controls'); - } - return this._push(OC.Breadcrumb.container, name, link); - }, - _push:function(container, name, link){ - var crumb=$('
'); - crumb.addClass('crumb').addClass('last'); - - var crumbLink=$(''); - crumbLink.attr('href',link); - crumbLink.text(name); - crumb.append(crumbLink); - - var existing=container.find('div.crumb'); - if(existing.length){ - existing.removeClass('last'); - existing.last().after(crumb); - }else{ - container.prepend(crumb); - } - return crumb; - }, - - /** - * @todo Write documentation - */ - pop:function(){ - if(!this.container){//default - this.container=$('#controls'); - } - this.container.find('div.crumb').last().remove(); - this.container.find('div.crumb').last().addClass('last'); - }, - - /** - * @todo Write documentation - */ - clear:function(){ - if(!this.container){//default - this.container=$('#controls'); - } - this._clear(this.container); - }, - _clear:function(container) { - container.find('div.crumb').remove(); - } -}; - /** * Initializes core */