diff --git a/app/scripts/controllers/settings-aria2.js b/app/scripts/controllers/settings-aria2.js index cd538d3..d45671f 100644 --- a/app/scripts/controllers/settings-aria2.js +++ b/app/scripts/controllers/settings-aria2.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').controller('Aria2SettingsController', ['$scope', '$location', '$timeout', 'SweetAlert', 'translateFilter', 'ariaNgConstants', 'aria2AvailableOptions', 'aria2RpcService', function ($scope, $location, $timeout, SweetAlert, translateFilter, ariaNgConstants, aria2AvailableOptions, aria2RpcService) { + angular.module('ariaNg').controller('Aria2SettingsController', ['$scope', '$location', '$timeout', 'ariaNgConstants', 'aria2AvailableOptions', 'aria2RpcService', 'utils', function ($scope, $location, $timeout, ariaNgConstants, aria2AvailableOptions, aria2RpcService, utils) { var location = $location.path().substring($location.path().lastIndexOf('/') + 1); var pendingSaveRequest = {}; @@ -25,12 +25,7 @@ } else if (location == 'advanced') { return aria2AvailableOptions.advancedOptions; } else { - SweetAlert.swal({ - title: translateFilter('Error'), - text: translateFilter('Type is illegal!'), - type: 'error', - confirmButtonText: translateFilter('OK') - }); + utils.alert('Type is illegal!'); } }; diff --git a/app/scripts/core/config.js b/app/scripts/core/config.js index ead6a27..180333d 100644 --- a/app/scripts/core/config.js +++ b/app/scripts/core/config.js @@ -37,12 +37,15 @@ }); }; + $rootScope.$on('$locationChangeStart', function (event) { + SweetAlert.close(); + }); + $rootScope.$on('$routeChangeStart', function (event, next, current) { var location = $location.path(); setNavbarSelected(location); $document.unbind('keypress'); - SweetAlert.close(); }); }]); })(); diff --git a/app/scripts/core/utils.js b/app/scripts/core/utils.js index 2303929..f53f4a0 100644 --- a/app/scripts/core/utils.js +++ b/app/scripts/core/utils.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').factory('utils', ['$location', '$base64', 'ariaNgConstants', function ($location, $base64, ariaNgConstants) { + angular.module('ariaNg').factory('utils', ['$location', '$timeout', '$base64', 'SweetAlert', 'translateFilter', 'ariaNgConstants', function ($location, $timeout, $base64, SweetAlert, translateFilter, ariaNgConstants) { return { generateUniqueId: function () { var sourceId = ariaNgConstants.appPrefix + '_' + Math.round(new Date().getTime() / 1000) + '_' + Math.random(); @@ -9,6 +9,16 @@ return hashedId; }, + alert: function (text) { + $timeout(function () { + SweetAlert.swal({ + title: translateFilter('Error'), + text: translateFilter(text), + type: 'error', + confirmButtonText: translateFilter('OK') + }); + }, 100); + }, replaceArray: function (sourceArray, targetArray, keyProperty) { if (!targetArray || !sourceArray || sourceArray.length != targetArray.length) { return false; diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css index f438fbf..ef09d0e 100644 --- a/app/styles/aria-ng.css +++ b/app/styles/aria-ng.css @@ -8,7 +8,7 @@ overflow-y: hidden; } -.skin-aria-ng, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { +.skin-aria-ng, h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6, .sweet-alert { font-family: 'Hiragino Sans GB', 'Microsoft YaHei', 'STHeiti', 'Helvetica Neue', Helvetica, Arial, sans-serif; } diff --git a/app/views/settings-aria2.html b/app/views/settings-aria2.html index 4746e87..60f02ed 100644 --- a/app/views/settings-aria2.html +++ b/app/views/settings-aria2.html @@ -67,6 +67,5 @@ -