From 4963c77b61946ef42cf9590e2662d886613e8e64 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 12 Jan 2017 14:26:10 +0100
Subject: [PATCH] Fix the title reset bug

---
 www/code/index.html  |  1 +
 www/code/main.js     | 11 +----------
 www/pad/index.html   |  1 +
 www/pad/main.js      | 11 +----------
 www/poll/main.js     | 14 ++++----------
 www/slide/index.html |  1 +
 www/slide/main.js    | 11 +----------
 7 files changed, 10 insertions(+), 40 deletions(-)
diff --git a/www/code/index.html b/www/code/index.html
index 20d978359..847ac2ec6 100644
--- a/www/code/index.html
+++ b/www/code/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html class="cp code">
 <head>
+    <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <script data-main="main" src="/bower_components/requirejs/require.js"></script>
     <script>
diff --git a/www/code/main.js b/www/code/main.js
index 87298cbf5..5565210ff 100644
--- a/www/code/main.js
+++ b/www/code/main.js
@@ -358,7 +358,7 @@ define([
                         updateDefaultTitle(json.metadata.defaultTitle);
                     }
                     if (typeof json.metadata.title !== "undefined") {
-                        updateTitle(json.metadata.title);
+                        updateTitle(json.metadata.title || defaultName);
                     }
                 }
             };
@@ -500,15 +500,6 @@ define([
 
                 // set the hash
                 if (!readOnly) { Cryptpad.replaceHash(editHash); }
-
-                Cryptpad.getPadTitle(function (err, title) {
-                    if (err) {
-                        console.log("Unable to get pad title");
-                        console.error(err);
-                        return;
-                    }
-                    updateTitle(title || defaultName);
-                });
             };
 
             var unnotify = module.unnotify = function () {
diff --git a/www/pad/index.html b/www/pad/index.html
index 4c20dc803..8437073af 100644
--- a/www/pad/index.html
+++ b/www/pad/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html class="cp pad">
 <head>
+    <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <link rel="icon" type="image/png"
         href="/customize/main-favicon.png"
diff --git a/www/pad/main.js b/www/pad/main.js
index 1aa7a9371..859eebfd6 100644
--- a/www/pad/main.js
+++ b/www/pad/main.js
@@ -448,7 +448,7 @@ define([
                         updateDefaultTitle(peerMetadata.metadata.defaultTitle);
                     }
                     if (typeof peerMetadata.metadata.title !== "undefined") {
-                        updateTitle(peerMetadata.metadata.title);
+                        updateTitle(peerMetadata.metadata.title || defaultName);
                     }
                 }
             };
@@ -622,15 +622,6 @@ define([
 
                 // set the hash
                 if (!readOnly) { Cryptpad.replaceHash(editHash); }
-
-                Cryptpad.getPadTitle(function (err, title) {
-                    if (err) {
-                        console.error(err);
-                        console.log("Couldn't get pad title");
-                        return;
-                    }
-                    updateTitle(title || defaultName);
-                });
             };
 
             // this should only ever get called once, when the chain syncs
diff --git a/www/poll/main.js b/www/poll/main.js
index 133f76a11..5d6064fae 100644
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -466,10 +466,13 @@ define([
             var renameCb = function (err, title) {
                 if (err) { return; }
                 document.title = title;
-                APP.proxy.info.title = title;
+                APP.proxy.info.title = title === defaultName ? "" : title;
             };
 
             var suggestName = function (fallback) {
+                if (document.title === defaultName) {
+                    return fallback || "";
+                }
                 return document.title || defaultName || "";
             };
 
@@ -692,15 +695,6 @@ define([
 
         // set the hash
         if (!readOnly) { Cryptpad.replaceHash(editHash); }
-
-        Cryptpad.getPadTitle(function (err, title) {
-            if (err) {
-                console.error(err);
-                console.log("Couldn't get pad title");
-                return;
-            }
-            updateTitle(title || defaultName);
-        });
     };
 
     var disconnect = function (info) {
diff --git a/www/slide/index.html b/www/slide/index.html
index c14ef3041..1af49e2ab 100644
--- a/www/slide/index.html
+++ b/www/slide/index.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html class="cp slide">
 <head>
+    <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <script data-main="main" src="/bower_components/requirejs/require.js"></script>
     <script>
diff --git a/www/slide/main.js b/www/slide/main.js
index adf27c3f1..25c763659 100644
--- a/www/slide/main.js
+++ b/www/slide/main.js
@@ -393,7 +393,7 @@ define([
                         updateDefaultTitle(json.metadata.defaultTitle);
                     }
                     if (typeof json.metadata.title !== "undefined") {
-                        updateTitle(json.metadata.title);
+                        updateTitle(json.metadata.title || defaultName);
                     }
                     updateColors(json.metadata.color, json.metadata.backColor);
                 }
@@ -589,15 +589,6 @@ define([
                 if (!window.location.hash || window.location.hash === '#') {
                     Cryptpad.replaceHash(editHash);
                 }
-
-                Cryptpad.getPadTitle(function (err, title) {
-                    if (err) {
-                        console.log("Unable to get pad title");
-                        console.error(err);
-                        return;
-                    }
-                    updateTitle(title || defaultName);
-                });
             };
 
             var unnotify = module.unnotify = function () {
