Manual merge work done on loading page to pad2

2017-08-21 10:53:40 +02:00
parent 8b702e0150 e65b2f4e9f
commit 6dd1643738
9 changed files with 352 additions and 159 deletions
--- a/www/common/sframe-common-title.js
+++ b/www/common/sframe-common-title.js
@@ -35,7 +35,8 @@ define(['jquery'], function ($) {
            if (isDefaultTitle()) {
                return getHeadingText() || fallback || "";
            } else {
-                return exp.title || getHeadingText() || exp.defaultTitle;
+                var title = metadataMgr.getMetadata().title;
+                return title || getHeadingText() || exp.defaultTitle;
            }
        };