web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken elements in the new toolbar

Browse Source
This commit is contained in:
yflory
2016-10-25 17:29:13 +02:00
parent 6351d1856f
commit 87d86384ac
9 changed files with 129 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
www/slide/main.js
View File

@@ -208,15 +208,11 @@ define([
var obj = {
content: textValue,
metadata: {
users: userList
users: userList,
defaultTitle: defaultName
}
};
if (!isDefaultTitle()) {
obj.metadata.title = APP.title;
}
else {
obj.metadata.title = "";
}
obj.metadata.title = APP.title;
if (textColor) {
obj.metadata.color = textColor;
}
@@ -292,8 +288,8 @@ define([
};
var suggestName = function () {
if (Cryptpad.isDefaultName(parsedHash, APP.title)) {
return getHeadingText() || defaultName;
if (APP.title === defaultName) {
return getHeadingText() || "";
} else {
return APP.title || getHeadingText() || defaultName;
}
@@ -376,6 +372,11 @@ define([
}
};
var updateDefaultTitle = function (defaultTitle) {
defaultName = defaultTitle;
$bar.find('.' + Toolbar.constants.title).find('input').attr("placeholder", defaultName);
};
var updateMetadata = function(shjson) {
// Extract the user list (metadata) from the hyperjson
var json = (shjson === "") ? "" : JSON.parse(shjson);
@@ -385,6 +386,9 @@ define([
// Update the local user data
addToUserList(userData);
}
if (json.metadata.defaultTitle) {
updateDefaultTitle(json.metadata.defaultTitle);
}
if (typeof json.metadata.title !== "undefined") {
updateTitle(json.metadata.title);
}
@@ -407,7 +411,8 @@ define([
ifrw: ifrw,
title: {
onRename: renameCb,
defaultName: defaultName
defaultName: defaultName,
suggestName: suggestName
},
common: Cryptpad
};