Merge branch 'staging' into framework

2017-10-06 14:50:35 +03:00
parent 9509d538e0 888028c542
commit f0eb58ee95
27 changed files with 3411 additions and 955 deletions
--- a/www/common/sframe-common-title.js
+++ b/www/common/sframe-common-title.js
@@ -21,6 +21,7 @@ define([
        var $title;
        exp.setToolbar = function (toolbar) {
            $title = toolbar && (toolbar.title || toolbar.pageTitle);
+            console.log('SET TOOLBAR');
        };

        exp.getTitle = function () { return exp.title; };