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

2017-09-05 15:37:02 +02:00
parent 1c50bb3f61 d22edc03b3
commit 0e8a26e8eb
10 changed files with 20 additions and 10 deletions
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -603,7 +603,7 @@ define([
                e.preventDefault();
                var parsed = parsePadUrl(t.href);
                if(!parsed) { throw new Error("Cannot get template hash"); }
-                common.addLoadingScreen(null, true);
+                common.addLoadingScreen({hideTips: true});
                Crypt.get(parsed.hash, function (err, val) {
                    if (err) { throw new Error(err); }
                    var p = parsePadUrl(window.location.href);