Skip to content

Commit

Permalink
Fixed wrong path-generation when added from favorites-star
Browse files Browse the repository at this point in the history
Signed-off-by: fnuesse <felix.nuesse@t-online.de>
  • Loading branch information
newhinton committed Jul 5, 2018
1 parent 3721228 commit c2fb31d
Showing 1 changed file with 15 additions and 9 deletions.
24 changes: 15 additions & 9 deletions apps/files/js/tagsplugin.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@
var collapsibleButtonId = 'button-collapse-favorites';
var listULElements = document.getElementById(quickAccessList);
var listLIElements = listULElements.getElementsByTagName('li');
var appName = appfolder.substring(1, appfolder.length);

for (var i = 0; i <= listLIElements.length - 1; i++) {
if (listLIElements[i].getElementsByTagName('a')[0].href.endsWith("dir=" + appName)) {
console.log(listLIElements[i].getElementsByTagName('a')[0].href);
if (listLIElements[i].getElementsByTagName('a')[0].href.endsWith("dir=" + appfolder)) {
console.log("f "+listLIElements[i].getElementsByTagName('a')[0].href);

listLIElements[i].remove();
}
}
Expand All @@ -100,24 +102,28 @@
var listLIElements = listULElements.getElementsByTagName('li');

var appName = appfolder.substring(appfolder.lastIndexOf("/") + 1, appfolder.length);
var apppath=appfolder;

if(appfolder.startsWith("//")){
apppath=appfolder.substring(1, appfolder.length);
}
var url=OC.generateUrl('/apps/files/?dir=')+apppath;


var innerTagA = document.createElement('A');
innerTagA.setAttribute("href", OC.generateUrl('/apps/files/?dir=') + appfolder);
innerTagA.setAttribute("href", url);
innerTagA.setAttribute("class", "nav-icon-files svg");
innerTagA.innerHTML = appName;

var length = listLIElements.length + 1;
var innerTagLI = document.createElement('li');
innerTagLI.setAttribute("data-id", OC.generateUrl('/apps/files/?dir=') + appfolder);
innerTagLI.setAttribute("data-id", url);
innerTagLI.setAttribute("class", "nav-" + appName);
innerTagLI.setAttribute("folderpos", length.toString());
innerTagLI.appendChild(innerTagA);

console.log("fetch: "+appfolder);
$.get(OC.generateUrl("/apps/files/api/v1/quickaccess/get/NodeType"),{folderpath: appfolder}, function (data, status) {
console.log(status);
console.log(data);
if (data !== "file") {
$.get(OC.generateUrl("/apps/files/api/v1/quickaccess/get/NodeType"),{folderpath: apppath}, function (data, status) {
if (data === "dir") {
if (listULElements.childElementCount <= 0) {
listULElements.appendChild(innerTagLI);
var collapsibleButton = document.getElementById(collapsibleButtonId);
Expand Down

0 comments on commit c2fb31d

Please sign in to comment.