Fix default title issues when using a template

www/common/common-ui-elements.js

@@ -626,7 +626,6 @@ define([
                                 }
                             }
                             sframeChan.query('Q_SAVE_AS_TEMPLATE', {
-                                title: title,
                                 toSave: toSave
                             }, function () {
                                 UI.alert(Messages.templateSaved);

www/common/cryptpad-common.js

@@ -446,6 +446,26 @@ define([
         }).nThen(function () {
             Crypt.get(parsed.hash, function (err, val) {
                 if (err) { throw new Error(err); }
+                try {
+                    // Try to fix the title before importing the template
+                    var parsed = JSON.parse(val);
+                    var meta;
+                    if (Array.isArray(parsed) && typeof(parsed[3]) === "object") {
+                        meta = parsed[3].metadata; // pad
+                    } else if (parsed.info) {
+                        meta = parsed.info; // poll
+                    } else {
+                        meta = parsed.metadata;
+                    }
+                    if (typeof(meta) === "object") {
+                        meta.defaultTitle = meta.title || meta.defaultTitle;
+                        delete meta.users;
+                        delete meta.title;
+                    }
+                    val = JSON.stringify(parsed);
+                } catch (e) {
+                    console.log("Can't fix template title", e);
+                }
                 Crypt.put(parsed2.hash, val, cb, optsPut);
             }, optsGet);
         });

www/common/sframe-common-title.js

@@ -42,6 +42,9 @@ define([
         exp.updateTitle = function (newTitle, cb) {
             cb = cb || $.noop;
             if (newTitle === exp.title) { return void cb(); }
+            if (newTitle === exp.defaultTitle) {
+                newTitle = "";
+            }
             metadataMgr.updateTitle(newTitle);
             titleUpdated = cb;
         };
@@ -51,7 +54,9 @@ define([
             if ($title) {
                 $title.find('span.cp-toolbar-title-value').text(md.title || md.defaultTitle);
                 $title.find('input').val(md.title || md.defaultTitle);
+                $title.find('input').prop('placeholder', md.defaultTitle);
             }
+            exp.defaultTitle = md.defaultTitle;
             exp.title = md.title;
         });
         metadataMgr.onTitleChange(function (title) {