Merge branch 'newtoolbar' into hpbs

2017-01-24 12:54:32 +01:00
parent f5753cf594 ce1e792419
commit 8ccd845d52
17 changed files with 85 additions and 120 deletions
--- a/www/poll/main.js
+++ b/www/poll/main.js
@@ -491,14 +491,16 @@ 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) {
-        return (document.title === defaultName) ? "" : document.title;
+        if (document.title === defaultName) {
+            return fallback || "";
+        }
+        return document.title || defaultName || "";
    };

-
    var copyObject = function (obj) {
        return JSON.parse(JSON.stringify(obj));
    };