diff --git a/src/scripts/filters/fileOrderBy.js b/src/scripts/filters/fileOrderBy.js index 7586c16..fab8e9f 100644 --- a/src/scripts/filters/fileOrderBy.js +++ b/src/scripts/filters/fileOrderBy.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').filter('fileOrderBy', ['orderByFilter', 'ariaNgCommonService', function (orderByFilter, ariaNgCommonService) { + angular.module('ariaNg').filter('fileOrderBy', ['$filter', 'ariaNgCommonService', function ($filter, ariaNgCommonService) { return function (array, type) { if (!angular.isArray(array)) { return array; @@ -14,11 +14,11 @@ } if (orderType.type == 'name') { - return orderByFilter(array, ['fileName'], orderType.reverse); + return $filter('orderBy')(array, ['fileName'], orderType.reverse); } else if (orderType.type == 'size') { - return orderByFilter(array, ['length'], orderType.reverse); + return $filter('orderBy')(array, ['length'], orderType.reverse); } else if (orderType.type == 'percent') { - return orderByFilter(array, ['completePercent'], orderType.reverse); + return $filter('orderBy')(array, ['completePercent'], orderType.reverse); } else { return array; } diff --git a/src/scripts/filters/peerOrderBy.js b/src/scripts/filters/peerOrderBy.js index a49b2d4..ff4aa7a 100644 --- a/src/scripts/filters/peerOrderBy.js +++ b/src/scripts/filters/peerOrderBy.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').filter('peerOrderBy', ['orderByFilter', 'ariaNgCommonService', function (orderByFilter, ariaNgCommonService) { + angular.module('ariaNg').filter('peerOrderBy', ['$filter', 'ariaNgCommonService', function ($filter, ariaNgCommonService) { return function (array, type) { if (!angular.isArray(array)) { return array; @@ -14,13 +14,13 @@ } if (orderType.type == 'address') { - return orderByFilter(array, ['ip', 'port'], orderType.reverse); + return $filter('orderBy')(array, ['ip', 'port'], orderType.reverse); } else if (orderType.type == 'percent') { - return orderByFilter(array, ['completePercent'], orderType.reverse); + return $filter('orderBy')(array, ['completePercent'], orderType.reverse); } else if (orderType.type == 'dspeed') { - return orderByFilter(array, ['downloadSpeed'], orderType.reverse); + return $filter('orderBy')(array, ['downloadSpeed'], orderType.reverse); } else if (orderType.type == 'uspeed') { - return orderByFilter(array, ['uploadSpeed'], orderType.reverse); + return $filter('orderBy')(array, ['uploadSpeed'], orderType.reverse); } else { return array; } diff --git a/src/scripts/filters/percent.js b/src/scripts/filters/percent.js index 3b3ca0b..8c674cc 100644 --- a/src/scripts/filters/percent.js +++ b/src/scripts/filters/percent.js @@ -1,12 +1,12 @@ (function () { 'use strict'; - angular.module('ariaNg').filter('percent', ['numberFilter', function (numberFilter) { + angular.module('ariaNg').filter('percent', ['$filter', function ($filter) { return function (value, precision) { var ratio = Math.pow(10, precision); var result = parseInt(value * ratio) / ratio; - return numberFilter(result, precision); + return $filter('number')(result, precision); } }]); })(); diff --git a/src/scripts/filters/taskOrderBy.js b/src/scripts/filters/taskOrderBy.js index e778999..94565d6 100644 --- a/src/scripts/filters/taskOrderBy.js +++ b/src/scripts/filters/taskOrderBy.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').filter('taskOrderBy', ['orderByFilter', 'ariaNgCommonService', function (orderByFilter, ariaNgCommonService) { + angular.module('ariaNg').filter('taskOrderBy', ['$filter', 'ariaNgCommonService', function ($filter, ariaNgCommonService) { return function (array, type) { if (!angular.isArray(array)) { return array; @@ -14,17 +14,17 @@ } if (orderType.type == 'name') { - return orderByFilter(array, ['taskName'], orderType.reverse); + return $filter('orderBy')(array, ['taskName'], orderType.reverse); } else if (orderType.type == 'size') { - return orderByFilter(array, ['totalLength'], orderType.reverse); + return $filter('orderBy')(array, ['totalLength'], orderType.reverse); } else if (orderType.type == 'percent') { - return orderByFilter(array, ['completePercent'], orderType.reverse); + return $filter('orderBy')(array, ['completePercent'], orderType.reverse); } else if (orderType.type == 'remain') { - return orderByFilter(array, ['idle', 'remainTime', 'remainLength'], orderType.reverse); + return $filter('orderBy')(array, ['idle', 'remainTime', 'remainLength'], orderType.reverse); } else if (orderType.type == 'dspeed') { - return orderByFilter(array, ['downloadSpeed'], orderType.reverse); + return $filter('orderBy')(array, ['downloadSpeed'], orderType.reverse); } else if (orderType.type == 'uspeed') { - return orderByFilter(array, ['uploadSpeed'], orderType.reverse); + return $filter('orderBy')(array, ['uploadSpeed'], orderType.reverse); } else { return array; } diff --git a/src/scripts/filters/volumn.js b/src/scripts/filters/volumn.js index 321bb30..a6eebb2 100644 --- a/src/scripts/filters/volumn.js +++ b/src/scripts/filters/volumn.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').filter('readableVolumn', ['numberFilter', function (numberFilter) { + angular.module('ariaNg').filter('readableVolumn', ['$filter', function ($filter) { var units = [ 'B', 'KB', 'MB', 'GB' ]; var defaultFractionSize = 2; @@ -29,7 +29,7 @@ } } - value = numberFilter(value, fractionSize); + value = $filter('number')(value, fractionSize); return value + ' ' + unit; } diff --git a/src/scripts/services/ariaNgMonitorService.js b/src/scripts/services/ariaNgMonitorService.js index b78f273..8b8d072 100644 --- a/src/scripts/services/ariaNgMonitorService.js +++ b/src/scripts/services/ariaNgMonitorService.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module('ariaNg').factory('ariaNgMonitorService', ['$translate', 'moment', 'ariaNgConstants', 'readableVolumnFilter', function ($translate, moment, ariaNgConstants, readableVolumnFilter) { + angular.module('ariaNg').factory('ariaNgMonitorService', ['$filter', '$translate', 'moment', 'ariaNgConstants', function ($filter, $translate, moment, ariaNgConstants) { var storagesInMemory = {}; var globalStorageKey = 'global'; @@ -32,8 +32,8 @@ } var time = moment(params[0].name, 'X').format('HH:mm:ss'); - var uploadSpeed = readableVolumnFilter(params[0].value) + '/s'; - var downloadSpeed = readableVolumnFilter(params[1].value) + '/s'; + var uploadSpeed = $filter('readableVolumn')(params[0].value) + '/s'; + var downloadSpeed = $filter('readableVolumn')(params[1].value) + '/s'; return '
' + time + '
' + '
' + downloadSpeed +'
' @@ -52,7 +52,7 @@ type: 'value', axisLabel: { formatter: function (value) { - return readableVolumnFilter(value, 0); + return $filter('readableVolumn')(value, 0); } } },