From e874477e94e91e5a41fb7170f93ee31c499d0bca Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sat, 11 Jun 2016 18:52:40 +0800 Subject: [PATCH] refactor code --- app/scripts/core/__fix.js | 4 ++-- app/scripts/directives/chart.js | 8 ++------ app/scripts/directives/placeholder.js | 6 +++--- app/scripts/directives/setting.js | 10 ++++------ app/scripts/filters/dateDuration.js | 2 +- app/scripts/filters/fileOrderBy.js | 2 +- app/scripts/filters/percent.js | 2 +- app/scripts/filters/taskOrderBy.js | 2 +- app/scripts/filters/taskStatus.js | 2 +- app/scripts/filters/volumn.js | 2 +- 10 files changed, 17 insertions(+), 23 deletions(-) diff --git a/app/scripts/core/__fix.js b/app/scripts/core/__fix.js index 8d3a7fe..5fe0d93 100644 --- a/app/scripts/core/__fix.js +++ b/app/scripts/core/__fix.js @@ -6,10 +6,10 @@ var windowHeight = $(window).height(); var neg = $('.main-header').outerHeight() + $('.main-footer').outerHeight(); - $(".content-body").css('height', windowHeight - neg); + $('.content-body').css('height', windowHeight - neg); }; - $(window, ".wrapper").resize(function () { + $(window, '.wrapper').resize(function () { fixContentWrapperHeight(); }); diff --git a/app/scripts/directives/chart.js b/app/scripts/directives/chart.js index bfe6fbc..400d0c4 100644 --- a/app/scripts/directives/chart.js +++ b/app/scripts/directives/chart.js @@ -33,9 +33,7 @@ scope.$apply(); }); - scope.$watch(function () { - return scope.options; - }, function (value) { + scope.$watch('options', function (value) { if (value) { setOptions(value); } @@ -94,9 +92,7 @@ } }; - scope.$watch(function () { - return scope.options; - }, function (value) { + scope.$watch('options', function (value) { if (value) { setOptions(value); } diff --git a/app/scripts/directives/placeholder.js b/app/scripts/directives/placeholder.js index f98a182..01e5aa5 100644 --- a/app/scripts/directives/placeholder.js +++ b/app/scripts/directives/placeholder.js @@ -1,15 +1,15 @@ (function () { 'use strict'; - angular.module("ariaNg").directive('ngPlaceholder', function () { + angular.module('ariaNg').directive('ngPlaceholder', function () { return { restrict: 'A', scope: { placeholder: '=ngPlaceholder' }, - link: function (scope, elem) { + link: function (scope, element) { scope.$watch('placeholder', function () { - elem[0].placeholder = scope.placeholder; + element[0].placeholder = scope.placeholder; }); } }; diff --git a/app/scripts/directives/setting.js b/app/scripts/directives/setting.js index 3735d66..1a0a9d8 100644 --- a/app/scripts/directives/setting.js +++ b/app/scripts/directives/setting.js @@ -1,10 +1,10 @@ (function () { 'use strict'; - angular.module("ariaNg").directive('ngSetting', ['$timeout', 'ariaNgConstants', function ($timeout, ariaNgConstants) { + angular.module('ariaNg').directive('ngSetting', ['$timeout', 'ariaNgConstants', function ($timeout, ariaNgConstants) { return { restrict: 'E', - templateUrl: "views/setting.html", + templateUrl: 'views/setting.html', require: '?ngModel', replace: true, scope: { @@ -127,10 +127,8 @@ scope.optionValue = value; }); - scope.$watch(function () { - return scope.option; - }, function (value) { - angular.element('[data-toggle="popover"]').popover(); + scope.$watch('option', function () { + element.find('[data-toggle="popover"]').popover(); }); } }; diff --git a/app/scripts/filters/dateDuration.js b/app/scripts/filters/dateDuration.js index 9ee4572..8f1dd15 100644 --- a/app/scripts/filters/dateDuration.js +++ b/app/scripts/filters/dateDuration.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module("ariaNg").filter('dateDuration', ['moment', function (moment) { + angular.module('ariaNg').filter('dateDuration', ['moment', function (moment) { return function (duration, sourceUnit, format) { var timespan = moment.duration(duration, sourceUnit); var time = moment.utc(timespan.asMilliseconds()); diff --git a/app/scripts/filters/fileOrderBy.js b/app/scripts/filters/fileOrderBy.js index b6782a6..7586c16 100644 --- a/app/scripts/filters/fileOrderBy.js +++ b/app/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', ['orderByFilter', 'ariaNgCommonService', function (orderByFilter, ariaNgCommonService) { return function (array, type) { if (!angular.isArray(array)) { return array; diff --git a/app/scripts/filters/percent.js b/app/scripts/filters/percent.js index 87abcfc..3b3ca0b 100644 --- a/app/scripts/filters/percent.js +++ b/app/scripts/filters/percent.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module("ariaNg").filter('percent', ['numberFilter', function (numberFilter) { + angular.module('ariaNg').filter('percent', ['numberFilter', function (numberFilter) { return function (value, precision) { var ratio = Math.pow(10, precision); var result = parseInt(value * ratio) / ratio; diff --git a/app/scripts/filters/taskOrderBy.js b/app/scripts/filters/taskOrderBy.js index 83fbbe6..e778999 100644 --- a/app/scripts/filters/taskOrderBy.js +++ b/app/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', ['orderByFilter', 'ariaNgCommonService', function (orderByFilter, ariaNgCommonService) { return function (array, type) { if (!angular.isArray(array)) { return array; diff --git a/app/scripts/filters/taskStatus.js b/app/scripts/filters/taskStatus.js index eee82a0..59d9e15 100644 --- a/app/scripts/filters/taskStatus.js +++ b/app/scripts/filters/taskStatus.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module("ariaNg").filter('taskStatus', function () { + angular.module('ariaNg').filter('taskStatus', function () { return function (task) { if (!task) { return ''; diff --git a/app/scripts/filters/volumn.js b/app/scripts/filters/volumn.js index 193dd32..e6b0a7a 100644 --- a/app/scripts/filters/volumn.js +++ b/app/scripts/filters/volumn.js @@ -1,7 +1,7 @@ (function () { 'use strict'; - angular.module("ariaNg").filter('readableVolumn', ['numberFilter', function (numberFilter) { + angular.module('ariaNg').filter('readableVolumn', ['numberFilter', function (numberFilter) { var units = [ 'B', 'KB', 'MB', 'GB' ]; var defaultFractionSize = 2;