diff options
Diffstat (limited to 'plugins/CoreUpdater')
4 files changed, 13 insertions, 5 deletions
diff --git a/plugins/CoreUpdater/Controller.php b/plugins/CoreUpdater/Controller.php index e647fcdb42..dcfb7532d7 100644 --- a/plugins/CoreUpdater/Controller.php +++ b/plugins/CoreUpdater/Controller.php @@ -14,6 +14,7 @@ use Piwik\Common; use Piwik\Config; use Piwik\DataTable\Renderer\Json; use Piwik\DbHelper; +use Piwik\Development; use Piwik\Filechecks; use Piwik\FileIntegrity; use Piwik\Filesystem; @@ -22,6 +23,7 @@ use Piwik\Nonce; use Piwik\Option; use Piwik\Piwik; use Piwik\Plugin\Manager as PluginManager; +use Piwik\Plugins\CoreVue\CoreVue; use Piwik\Plugins\LanguagesManager\LanguagesManager; use Piwik\Plugins\Marketplace\Plugins; use Piwik\SettingsPiwik; @@ -98,6 +100,7 @@ class Controller extends \Piwik\Plugin\Controller 'node_modules/materialize-css/dist/js/materialize.min.js', "plugins/CoreHome/javascripts/materialize-bc.js", 'plugins/Morpheus/javascripts/piwikHelper.js', + "plugins/CoreHome/javascripts/broadcast.js", 'plugins/CoreUpdater/javascripts/updateLayout.js', 'node_modules/angular/angular.min.js', 'node_modules/angular-sanitize/angular-sanitize.min.js', @@ -108,12 +111,16 @@ class Controller extends \Piwik\Plugin\Controller 'plugins/CoreHome/angularjs/common/filters/filter.module.js', 'plugins/CoreHome/angularjs/common/filters/translate.js', 'plugins/CoreHome/angularjs/common/directives/directive.module.js', - 'plugins/CoreHome/angularjs/common/directives/focus-anywhere-but-here.js', 'plugins/CoreHome/angularjs/piwikApp.config.js', 'plugins/CoreHome/angularjs/piwikApp.js', 'plugins/Installation/javascripts/installation.js', ); + CoreVue::addJsFilesTo($files); + + $coreHomeUmd = Development::isEnabled() ? 'CoreHome.umd.js' : 'CoreHome.umd.min.js'; + $files[] = "plugins/CoreHome/vue/dist/$coreHomeUmd"; + return AssetManager::compileCustomJs($files); } diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig index 5593435c4f..a78aff6603 100644 --- a/plugins/CoreUpdater/templates/layout.twig +++ b/plugins/CoreUpdater/templates/layout.twig @@ -8,6 +8,7 @@ <meta name="robots" content="noindex,nofollow"> <meta name="google" content="notranslate"> + <script>window.piwik = {};</script> <link rel="stylesheet" type="text/css" href="index.php?module=CoreUpdater&action=getUpdaterCss"/> <script type="text/javascript" src="index.php?module=CoreUpdater&action=getUpdaterJs"></script> diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png index 0908ac8ef9..50221a34a2 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:88d2b601b770783a3cb9a71357859c6bf7ef48775ce2b7e59412ad6abb8099a9 -size 348613 +oid sha256:ffe28867eeb1e4bc3315f74360d1b6966063b2b396b90d318469f7184f43eb78 +size 348576 diff --git a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png index 7e62977a0f..bb37df3ad0 100644 --- a/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png +++ b/plugins/CoreUpdater/tests/UI/expected-screenshots/CoreUpdaterDb_main_instance.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abe28d78c7cf52bcfd71a3b77641db7dbcdb428157ba10d7f07ea59e324576d1 -size 350194 +oid sha256:33282b0571e22f4aa815f3c8d3062150b5f53591776101571d0536a07b44aa8b +size 350156 |
