Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon

www/common/outer/userObject.js

@@ -563,34 +563,41 @@ define([
                         continue;
                     }
                     // Clean missing href
-                    if (!el.href) {
+                    var parsed;
-                        debug("Removing an element in filesData with a missing href.", el);
+                    if (el.href) {
-                        toClean.push(id);
+                        if (!el.href) {
-                        continue;
+                            debug("Removing an element in filesData with a missing href.", el);
-                    }
+                            toClean.push(id);
+                            continue;
+                        }
 
-                    var parsed = Hash.parsePadUrl(el.href);
+                        parsed = Hash.parsePadUrl(el.href);
-                    // Clean invalid hash
+                        // Clean invalid hash
-                    if (!parsed.hash) {
+                        if (!parsed.hash) {
-                        debug("Removing an element in filesData with a invalid href.", el);
+                            debug("Removing an element in filesData with a invalid href.", el);
-                        toClean.push(id);
+                            toClean.push(id);
-                        continue;
+                            continue;
-                    }
+                        }
-                    // Clean invalid type
+                        // Clean invalid type
-                    if (!parsed.type) {
+                        if (!parsed.type) {
-                        debug("Removing an element in filesData with a invalid type.", el);
+                            debug("Removing an element in filesData with a invalid type.", el);
+                            toClean.push(id);
+                            continue;
+                        }
+                    } else if (!el.roHref) {
+                        debug("Removing an element in filesData with a missing href.", el);
                         toClean.push(id);
                         continue;
                     }
 
                     // Fix href
-                    if (/^https*:\/\//.test(el.href)) { el.href = Hash.getRelativeHref(el.href); }
+                    if (el.href && /^https*:\/\//.test(el.href)) { el.href = Hash.getRelativeHref(el.href); }
                     // Fix creation time
                     if (!el.ctime) { el.ctime = el.atime; }
                     // Fix title
                     if (!el.title) { el.title = Hash.getDefaultName(parsed); }
                     // Fix channel
-                    if (!el.channel) {
+                    if (el.href && !el.channel) {
                         try {
                             var secret = Hash.getSecrets(parsed.type, parsed.hash, el.password);
                             el.channel = secret.channel;

www/drive/inner.js

@@ -1367,6 +1367,10 @@ define([
             }
 
             var element = filesOp.find(newPath);
+            if (!isFolder) {
+                var data = filesOp.getFileData(element);
+                if (!data.href) { return; }
+            }
             var $icon = !isFolder ? getFileIcon(element) : undefined;
             var ro = filesOp.isReadOnlyFile(element);
             // ro undefined means it's an old hash which doesn't support read-only
@@ -2424,6 +2428,7 @@ define([
                 sortedFiles.forEach(function (key) {
                     if (filesOp.isFolder(root[key])) { return; }
                     var $element = createElement(path, key, root, false);
+                    if (!$element) { return; }
                     $element.appendTo($list);
                 });