Merge branch 'fileManager' into fmIndex

8 years ago · c3e3aa69c3
parent 2b077a8e95 8e6830d080
commit c3e3aa69c3
1 changed files with 1 additions and 2 deletions
--- a/www/file/main.js
+++ b/www/file/main.js
@ -18,7 +18,6 @@ define([
    var saveAs = window.saveAs;
    var $iframe = $('#pad-iframe').contents();
    var ifrw = $('#pad-iframe')[0].contentWindow;
-    var homePageIframe = false;

    var ROOT = "root";
    var ROOT_NAME = Messages.fm_rootName;
@ -1367,7 +1366,7 @@ define([
            homePageIframe = true;
        }

-        var hash = window.location.hash || localStorage.FS_hash;
+        var hash = window.location.hash.slice(1) || localStorage.FS_hash;
        var secret = Cryptpad.getSecrets(hash);

        var listmapConfig = module.config = {