Fix empty title with new documents

This commit is contained in:
yflory
2017-01-12 15:15:10 +01:00
parent 4963c77b61
commit 605072cfbf
3 changed files with 24 additions and 3 deletions

View File

@@ -174,7 +174,9 @@ define([
defaultTitle: defaultName defaultTitle: defaultName
} }
}; };
if (!initializing) {
obj.metadata.title = document.title; obj.metadata.title = document.title;
}
// set mode too... // set mode too...
obj.highlightMode = module.highlightMode; obj.highlightMode = module.highlightMode;
@@ -348,6 +350,7 @@ define([
var updateMetadata = function(shjson) { var updateMetadata = function(shjson) {
// Extract the user list (metadata) from the hyperjson // Extract the user list (metadata) from the hyperjson
var json = (shjson === "") ? "" : JSON.parse(shjson); var json = (shjson === "") ? "" : JSON.parse(shjson);
var titleUpdated = false;
if (json && json.metadata) { if (json && json.metadata) {
if (json.metadata.users) { if (json.metadata.users) {
var userData = json.metadata.users; var userData = json.metadata.users;
@@ -359,8 +362,12 @@ define([
} }
if (typeof json.metadata.title !== "undefined") { if (typeof json.metadata.title !== "undefined") {
updateTitle(json.metadata.title || defaultName); updateTitle(json.metadata.title || defaultName);
titleUpdated = true;
} }
} }
if (!titleUpdated) {
updateTitle(defaultName);
}
}; };
var onInit = config.onInit = function (info) { var onInit = config.onInit = function (info) {

View File

@@ -370,7 +370,9 @@ define([
defaultTitle: defaultName defaultTitle: defaultName
} }
}; };
if (!initializing) {
hjson[3].metadata.title = document.title; hjson[3].metadata.title = document.title;
}
return stringify(hjson); return stringify(hjson);
}; };
@@ -438,6 +440,7 @@ define([
// Extract the user list (metadata) from the hyperjson // Extract the user list (metadata) from the hyperjson
var hjson = JSON.parse(shjson); var hjson = JSON.parse(shjson);
var peerMetadata = hjson[3]; var peerMetadata = hjson[3];
var titleUpdated = false;
if (peerMetadata && peerMetadata.metadata) { if (peerMetadata && peerMetadata.metadata) {
if (peerMetadata.metadata.users) { if (peerMetadata.metadata.users) {
var userData = peerMetadata.metadata.users; var userData = peerMetadata.metadata.users;
@@ -449,8 +452,12 @@ define([
} }
if (typeof peerMetadata.metadata.title !== "undefined") { if (typeof peerMetadata.metadata.title !== "undefined") {
updateTitle(peerMetadata.metadata.title || defaultName); updateTitle(peerMetadata.metadata.title || defaultName);
titleUpdated = true;
} }
} }
if (!titleUpdated) {
updateTitle(defaultName);
}
}; };
var unnotify = function () { var unnotify = function () {

View File

@@ -215,7 +215,9 @@ define([
defaultTitle: defaultName defaultTitle: defaultName
} }
}; };
if (!initializing) {
obj.metadata.title = APP.title; obj.metadata.title = APP.title;
}
if (textColor) { if (textColor) {
obj.metadata.color = textColor; obj.metadata.color = textColor;
} }
@@ -383,6 +385,7 @@ define([
var updateMetadata = function(shjson) { var updateMetadata = function(shjson) {
// Extract the user list (metadata) from the hyperjson // Extract the user list (metadata) from the hyperjson
var json = (shjson === "") ? "" : JSON.parse(shjson); var json = (shjson === "") ? "" : JSON.parse(shjson);
var titleUpdated = false;
if (json && json.metadata) { if (json && json.metadata) {
if (json.metadata.users) { if (json.metadata.users) {
var userData = json.metadata.users; var userData = json.metadata.users;
@@ -394,9 +397,13 @@ define([
} }
if (typeof json.metadata.title !== "undefined") { if (typeof json.metadata.title !== "undefined") {
updateTitle(json.metadata.title || defaultName); updateTitle(json.metadata.title || defaultName);
titleUpdated = true;
} }
updateColors(json.metadata.color, json.metadata.backColor); updateColors(json.metadata.color, json.metadata.backColor);
} }
if (!titleUpdated) {
updateTitle(defaultName);
}
}; };
var renameCb = function (err, title) { var renameCb = function (err, title) {