diff --git a/apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js b/apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js index 930b232ed..462618e97 100644 --- a/apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js +++ b/apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js @@ -1,83 +1,83 @@ /** * Created by ty on 11/7/16. */ (function () { 'use strict'; // -- register controller with angular -- // - angular.module('shrine-tools', ['ngRoute']) + angular.module('shrine-tools')//, ['ngRoute']) .controller('DashboardController', DashboardController); /** * * @type {string[]} */ - DashboardController.$inject = ['$app', '$log', '$location', '$route']; - function DashboardController ($app, $log, $location, $route) { + DashboardController.$inject = ['$app', '$log', '$location'];//, '$route']; + function DashboardController ($app, $log, $location) {//, $route) { var vm = this; var map = $app.model.map; vm.keyStoreError = false; init(); /** * */ function init () { $app.model.getKeystore() .then(setDashboard, handleFailure); } function handleFailure (failure) { vm.keyStoreError = failure; } /** * * @param keystore */ function setDashboard (keystore) { var modelStatuses = $app.model.m.remoteSiteStatuses; var tempList = []; for (var i = 0; i < modelStatuses.length; i++) { var abbreviatedEntry = modelStatuses[i]; if (abbreviatedEntry.url != "") tempList.push(abbreviatedEntry) } vm.otherDashboards = [['Hub', '']].concat(map(entryToPair, tempList)); vm.otherDashboards.sort(comparator); vm.clearCache = clearCache; vm.switchDashboard = switchDashboard; } function comparator(first, second) { if (first[0] == 'Hub') { return -2; } else { var less = first[0].toLowerCase() < second[0].toLowerCase(); var eq = first[0].toLowerCase() == second[0].toLowerCase(); return less? -1: eq? 0 : 1 } } //todo remove duplication with header.js function switchDashboard(url, alias) { $app.model.toDashboard.url = url; $app.model.m.siteAlias = alias == 'Hub'? '': alias; clearCache(); $location.url("/diagnostic/summary"); - $route.reload(); + //$route.reload(); } function clearCache() { $app.model.clearCache(); } function entryToPair(entry){ return [entry.siteAlias, entry.url]; } } })(); diff --git a/apps/dashboard-app/src/main/js/src/app/header/header.js b/apps/dashboard-app/src/main/js/src/app/header/header.js index 736d98a21..fc6662a36 100755 --- a/apps/dashboard-app/src/main/js/src/app/header/header.js +++ b/apps/dashboard-app/src/main/js/src/app/header/header.js @@ -1,69 +1,69 @@ (function () { 'use strict'; // -- register directive with angular -- // - angular.module('shrine-tools', ['ngRoute']) + angular.module('shrine-tools')//, ['ngRoute']) .directive('header', Header); /** * * @returns {{restrict: string, replace: boolean, templateUrl: string, * controller: HeaderController, controllerAs: string, link: HeaderLinker, scope: {title: string}}} * @constructor */ function Header () { return { restrict: 'E', replace: true, templateUrl: 'src/app/header/header.tpl.html', controller: HeaderController, controllerAs: 'vm', link: HeaderLinker, scope: { title: '@' } } } /** * * @type {string[]} */ - HeaderController.$inject = ['$app', '$scope', '$location', '$route']; - function HeaderController($app, $scope, $location, $route) { + HeaderController.$inject = ['$app', '$scope', '$location'];//, '$route']; + function HeaderController($app, $scope, $location) {//, $route) { $scope.m = $app.model.m; $scope.goHome = goHome; function goHome() { //todo remove duplication with dashboardcontroller $app.model.toDashboard.url = ''; $app.model.m.siteAlias = ''; clearCache(); $location.url("/diagnostic/summary"); - $route.reload(); + //$route.reload(); } function clearCache() { for (var member in $app.model.cache) { if($app.model.cache.hasOwnProperty(member)) delete $app.model.cache[member]; } } } /** * * @type {string[]} */ HeaderLinker.$inject = ['scope', 'element', 'attributes' ]; function HeaderLinker (s, e, a) { var vm = s.vm; } })();