From bff951375a318c20d3ecf7582d823c29d6848e50 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Fri, 2 Aug 2013 11:44:53 +0200 Subject: [PATCH] use fixed OC.Breadcrumb.push() Conflicts: core/js/js.js --- core/js/js.js | 40 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/core/js/js.js b/core/js/js.js index aa1bcf642ee..d878ac5c18e 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -370,6 +370,44 @@ OC.Notification={ OC.Breadcrumb={ container:null, crumbs:[], + show:function(dir, leafname, leaflink){ + OC.Breadcrumb.clear(); + + // show home + path in subdirectories + if (dir && 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); + OC.Breadcrumb.container.prepend(crumb); + OC.Breadcrumb.crumbs.push(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); + OC.Breadcrumb.push(name, link); + } + }); + } + + //add leafname + if (leafname && leaflink) { + OC.Breadcrumb.push(leafname, leaflink); + } + }, push:function(name, link){ if(!OC.Breadcrumb.container){//default OC.Breadcrumb.container=$('#controls'); @@ -387,7 +425,7 @@ OC.Breadcrumb={ existing.removeClass('last'); existing.last().after(crumb); }else{ - OC.Breadcrumb.container.append(crumb); + OC.Breadcrumb.container.prepend(crumb); } OC.Breadcrumb.crumbs.push(crumb); return crumb; -- 2.39.5