diff --git a/modules/core/client/controllers/header.client.controller.js b/modules/core/client/controllers/header.client.controller.js index acdafa5c..e8ae9c98 100644 --- a/modules/core/client/controllers/header.client.controller.js +++ b/modules/core/client/controllers/header.client.controller.js @@ -5,10 +5,10 @@ .module('core') .controller('HeaderController', HeaderController); - HeaderController.$inject = ['$scope', '$state', '$stateParams', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService', + HeaderController.$inject = ['$scope', '$state', '$timeout', '$translate', 'Authentication', 'menuService', 'MeanTorrentConfig', 'localStorageService', 'ScoreLevelService', 'InvitationsService', '$interval', 'MessagesService', 'TorrentsService', 'UsersService', 'DebugConsoleService']; - function HeaderController($scope, $state, $stateParams, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService, + function HeaderController($scope, $state, $timeout, $translate, Authentication, menuService, MeanTorrentConfig, localStorageService, ScoreLevelService, InvitationsService, $interval, MessagesService, TorrentsService, UsersService, mtDebug) { var vm = this; vm.user = Authentication.user; @@ -30,6 +30,19 @@ $scope.$on('$stateChangeSuccess', stateChangeSuccess); + $(document).ready(function () { + $('#warning_popup').popup({ + outline: false, + focusdelay: 400, + vertical: 'top', + autoopen: false, + opacity: 0.6, + closetransitionend: function () { + $('.popup_wrapper').remove(); + } + }); + }); + /** * auth-user-changed */ @@ -74,6 +87,25 @@ } }; + /** + * getWarningInfo + */ + vm.getWarningInfo = function () { + var sw = localStorageService.get('showed_warning'); + if (vm.appConfig.showDemoWarningPopup && !sw) { + $timeout(function () { + $('#warning_popup').popup('show'); + //$('.warning_popup_open').trigger('click'); + //angular.element('#myselector').triggerHandler('click'); + }, 300); + + localStorageService.set('showed_warning', true); + } + if (sw) { + $('.popup_wrapper').remove(); + } + }; + /** * checkMessageUnread */ diff --git a/modules/core/client/controllers/home.client.controller.js b/modules/core/client/controllers/home.client.controller.js index a325529c..0e086b1a 100644 --- a/modules/core/client/controllers/home.client.controller.js +++ b/modules/core/client/controllers/home.client.controller.js @@ -29,19 +29,6 @@ vm.TVTopList = undefined; vm.TVNewList = undefined; - $(document).ready(function () { - $('#warning_popup').popup({ - outline: false, - focusdelay: 400, - vertical: 'top', - autoopen: false, - opacity: 0.6, - closetransitionend: function () { - $('.popup_wrapper').remove(); - } - }); - }); - /** * initTopOneInfo */ @@ -136,25 +123,6 @@ return enb; }; - /** - * getWarningInfo - */ - vm.getWarningInfo = function () { - var sw = localStorageService.get('showed_warning'); - if (vm.appConfig.showDemoWarningPopup && !sw) { - $timeout(function () { - $('#warning_popup').popup('show'); - //$('.warning_popup_open').trigger('click'); - //angular.element('#myselector').triggerHandler('click'); - }, 300); - - localStorageService.set('showed_warning', true); - } - if (sw) { - $('.popup_wrapper').remove(); - } - }; - /** * getMovieTopInfo */ diff --git a/modules/core/client/views/footer.client.view.html b/modules/core/client/views/footer.client.view.html index 8306fab2..00837f02 100644 --- a/modules/core/client/views/footer.client.view.html +++ b/modules/core/client/views/footer.client.view.html @@ -1,4 +1,4 @@ -
+
+ + + diff --git a/modules/core/client/views/home.client.view.html b/modules/core/client/views/home.client.view.html index 49c26a63..5a573ee7 100644 --- a/modules/core/client/views/home.client.view.html +++ b/modules/core/client/views/home.client.view.html @@ -1,4 +1,4 @@ -
+
@@ -1720,15 +1720,4 @@
- -