Merge branch 'staging' into slide2

2017-09-08 16:23:07 +02:00
parent 05793c220c fc069dac48
commit c3a07e879c
21 changed files with 436 additions and 89 deletions
--- a/www/common/sframe-common-outer.js
+++ b/www/common/sframe-common-outer.js
@@ -312,6 +312,10 @@ define([
            sframeChan.on('Q_TEMPLATE_USE', function (href, cb) {
                Cryptpad.useTemplate(href, Cryptget, cb);
            });
+            sframeChan.on('Q_TEMPLATE_EXIST', function (type, cb) {
+                var hasTemplate = Cryptpad.listTemplates(type).length > 0;
+                cb(hasTemplate);
+            });


            sframeChan.ready();