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

2017-08-21 18:38:16 +02:00
parent 4b70fc9f49 20a68ad71c
commit 4f3b4a30ee
3 changed files with 10 additions and 134 deletions
--- a/www/pad2/outer.js
+++ b/www/pad2/outer.js
@@ -74,7 +74,8 @@ define([
                            origin: window.location.origin,
                            pathname: window.location.pathname,
                            readOnly: readOnly,
-                            availableHashes: hashes
+                            availableHashes: hashes,
+                            isTemplate: Cryptpad.isTemplate(window.location.href)
                        }
                    });
                });
@@ -138,7 +139,6 @@ define([
                Cryptpad.moveToTrash(cb);
            });

-
            sframeChan.on('Q_SAVE_AS_TEMPLATE', function (data, cb) {
                Cryptpad.saveAsTemplate(Cryptget.put, data, cb);
            });