diff --git a/app/index.html b/app/index.html index fbd61fb..bf8ffed 100644 --- a/app/index.html +++ b/app/index.html @@ -34,72 +34,84 @@ diff --git a/app/langs/zh-CN.json b/app/langs/zh-CN.json index f32b6a3..f95eda3 100644 --- a/app/langs/zh-CN.json +++ b/app/langs/zh-CN.json @@ -12,6 +12,7 @@ "Pause": "暂停下载任务", "Delete": "删除下载任务", "Display Order": "显示顺序", + "Search": "搜索", "Default": "默认", "By File Name": "按文件名", "By File Size": "按文件大小", diff --git a/app/scripts/controllers/list.js b/app/scripts/controllers/list.js index 47f3348..a22c22a 100644 --- a/app/scripts/controllers/list.js +++ b/app/scripts/controllers/list.js @@ -85,6 +85,18 @@ $scope.titleWidth = getTitleWidth(); + $scope.filterByTaskName = function (task) { + if (!task || !angular.isString(task.taskName)) { + return false; + } + + if (!$scope.searchContext || !$scope.searchContext.text) { + return true; + } + + return (task.taskName.toLowerCase().indexOf($scope.searchContext.text.toLowerCase()) >= 0); + }; + $scope.getOrderType = function () { return ariaNgSettingService.getDisplayOrder(); }; diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index 8843218..a9d550f 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -26,6 +26,10 @@ refreshGlobalStat(); + $scope.searchContext = { + text: '' + }; + $scope.changeDisplayOrder = function (type, autoSetReverse) { var oldType = utils.parseOrderType(ariaNgSettingService.getDisplayOrder()); var newType = utils.parseOrderType(type); diff --git a/app/scripts/core/lang-default.js b/app/scripts/core/lang-default.js index 8e5cc10..84124a4 100644 --- a/app/scripts/core/lang-default.js +++ b/app/scripts/core/lang-default.js @@ -16,6 +16,7 @@ 'Pause': 'Pause', 'Delete': 'Delete', 'Display Order': 'Display Order', + 'Search': 'Search', 'Default': 'Default', 'By File Name': 'By File Name', 'By File Size': 'By File Size', diff --git a/app/styles/aria-ng.css b/app/styles/aria-ng.css index 72ded28..bccd11d 100644 --- a/app/styles/aria-ng.css +++ b/app/styles/aria-ng.css @@ -43,6 +43,16 @@ color: #0080ff; } +.skin-aria-ng .main-header .navbar .navbar-searchbar { + padding-top: 8px; + padding-right: 20px; + float: right; +} + +.skin-aria-ng .main-header .navbar .navbar-searchbar .form-control-icon { + color: #999999; +} + @media (max-width: 767px) { .skin-aria-ng .main-header .navbar { padding-left: 20px; diff --git a/app/views/list.html b/app/views/list.html index 4ec65bc..1b4e840 100644 --- a/app/views/list.html +++ b/app/views/list.html @@ -35,7 +35,7 @@
-
+