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

2017-08-17 18:29:24 +02:00
parent fab3d67b75 909bda4302
commit 604415b32c
4 changed files with 37 additions and 4 deletions
--- a/www/common/sframe-common.js
+++ b/www/common/sframe-common.js
@@ -36,6 +36,11 @@ define([
        return ctx.cpNfInner.metadataMgr.getMetadata().defaultTitle;
    };

+    funcs.setDisplayName = function (name, cb) {
+        ctx.sframeChan.query('Q_SETTINGS_SET_DISPLAY_NAME', name, function (err) {
+            if (cb) { cb(err); }
+        });
+    };

    Object.freeze(funcs);
    return { create: function (cb) {