Enable title in pad2

www/common/sframe-common-title.js

@@ -0,0 +1,94 @@
+define(['jquery'], function ($) {
+    var module = {};
+
+    module.create = function (cfg, onLocal, Common, metadataMgr) {
+        var exp = {};
+
+        exp.defaultTitle = Common.getDefaultTitle();
+
+        exp.title = document.title; // TOOD slides
+
+        cfg = cfg || {};
+
+        var getHeadingText = cfg.getHeadingText || function () { return; };
+
+        var updateLocalTitle = function (newTitle) {
+            console.log(newTitle);
+            exp.title = newTitle;
+            onLocal();
+            if (typeof cfg.updateLocalTitle === "function") {
+                cfg.updateLocalTitle(newTitle);
+            } else {
+                document.title = newTitle;
+            }
+        };
+
+        var $title;
+        exp.setToolbar = function (toolbar) {
+            $title = toolbar && toolbar.title;
+        };
+
+        exp.getTitle = function () { return exp.title; };
+        var isDefaultTitle = exp.isDefaultTitle = function (){return exp.title === exp.defaultTitle;};
+
+        var suggestTitle = exp.suggestTitle = function (fallback) {
+            if (isDefaultTitle()) {
+                return getHeadingText() || fallback || "";
+            } else {
+                return exp.title || getHeadingText() || exp.defaultTitle;
+            }
+        };
+
+        var renameCb = function (err, newTitle) {
+            if (err) { return; }
+            updateLocalTitle(newTitle);
+            onLocal();
+        };
+
+        // update title: href is optional; if not specified, we use window.location.href
+        exp.updateTitle = function (newTitle, cb) {
+            cb = cb || $.noop;
+            if (newTitle === exp.title) { return; }
+            // Change the title now, and set it back to the old value if there is an error
+            var oldTitle = exp.title;
+            Common.setPadTitleInDrive(newTitle, function (err, data) {
+                if (err) {
+                    console.log("Couldn't set pad title");
+                    console.error(err);
+                    updateLocalTitle(oldTitle);
+                    return void cb(err);
+                }
+                updateLocalTitle(data);
+                cb(null, data);
+                if (!$title) { return; }
+                $title.find('span.title').text(data);
+                $title.find('input').val(data);
+            });
+        };
+
+        // TODO not needed?
+        /*exp.updateDefaultTitle = function (newDefaultTitle) {
+            exp.defaultTitle = newDefaultTitle;
+            if (!$title) { return; }
+            $title.find('input').attr("placeholder", exp.defaultTitle);
+        };*/
+
+        metadataMgr.onChange(function () {
+            var md = metadataMgr.getMetadata();
+            exp.updateTitle(md.title || md.defaultTitle);
+        });
+
+        exp.getTitleConfig = function () {
+            return {
+                onRename: renameCb,
+                suggestName: suggestTitle,
+                defaultName: exp.defaultTitle
+            };
+        };
+
+        return exp;
+    };
+
+    return module;
+});
+

www/common/sframe-common.js

@@ -1,8 +1,10 @@
 define([
     '/bower_components/nthen/index.js',
     '/common/sframe-chainpad-netflux-inner.js',
-    '/common/sframe-channel.js'
-], function (nThen, CpNfInner, SFrameChannel) {
+    '/common/sframe-channel.js',
+    '/common/sframe-common-title.js'
+
+], function (nThen, CpNfInner, SFrameChannel, Title) {
 
     // Chainpad Netflux Inner
     var funcs = {};
@@ -22,10 +24,19 @@ define([
 
     funcs.setPadTitleInDrive = function (title, cb) {
         ctx.sframeChan.query('Q_SET_PAD_TITLE_IN_DRIVE', title, function (err) {
-            if (cb) { cb(err); }
+            if (cb) { cb(err, title); }
         });
     };
 
+    // Title module
+    funcs.createTitle = Title.create;
+
+    funcs.getDefaultTitle = function () {
+        if (!ctx.cpNfInner) { throw new Error("cpNfInner is not ready!"); }
+        return ctx.cpNfInner.metadataMgr.getMetadata().defaultTitle;
+    };
+
+
     Object.freeze(funcs);
     return { create: function (cb) {
         nThen(function (waitFor) {

www/common/toolbar3.js

@@ -5,6 +5,7 @@ define([
 ], function ($, Config, ApiConfig) {
     var Messages = {};
     var Cryptpad;
+    var Common;
 
     var Bar = {
         constants: {},
@@ -567,7 +568,9 @@ define([
             if (name === "") {
                 name = $input.attr('placeholder');
             }
-            Cryptpad.renamePad(name, null, function (err, newtitle) {
+                console.log('here');
+            Common.setPadTitleInDrive(name, function (err, newtitle) {
+                console.log('here');
                 if (err) { return console.error(err); }
                 $text.text(newtitle);
                 callback(null, newtitle);
@@ -957,6 +960,7 @@ define([
     Bar.create = function (cfg) {
         var config = cfg || {};
         Cryptpad = config.common;
+        Common = config.sfCommon;
         Messages = Cryptpad.Messages;
         config.readOnly = (typeof config.readOnly !== "undefined") ? (config.readOnly ? 1 : 0) : -1;
         config.displayed = config.displayed || [];