From b5f3a1254b415ae848175ba6391bc4111cdd1bbe Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Tue, 6 Dec 2016 00:26:14 -0500 Subject: [PATCH] If vault has too many sites, only show a folder list --- src/_locales/en/messages.json | 4 ++-- src/popup/app/vault/vaultController.js | 33 ++++++++++++++++---------- src/popup/app/vault/views/vault.html | 22 +++++++++++++---- src/popup/less/components.less | 1 + 4 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 225dbed363..7c042f77d4 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -312,8 +312,8 @@ "description": "Edit" }, "noSitesInList": { - "message": "There are no sites in list.", - "description": "There are no sites in list." + "message": "There are no sites to list.", + "description": "There are no sites to list." }, "siteInformation": { "message": "Site Information", diff --git a/src/popup/app/vault/vaultController.js b/src/popup/app/vault/vaultController.js index 569abad33a..4b68acc64e 100644 --- a/src/popup/app/vault/vaultController.js +++ b/src/popup/app/vault/vaultController.js @@ -75,23 +75,28 @@ }; $scope.searchSites = function () { - if (!$scope.searchText) { + if (!$scope.searchText || $scope.searchText.length < 3) { return; } - return function (site) { - var searchTerm = $scope.searchText.toLowerCase(); - if (site.name && site.name.toLowerCase().indexOf(searchTerm) !== -1) { - return true; - } - if (site.username && site.username.toLowerCase().indexOf(searchTerm) !== -1) { - return true; - } - - return false; - }; + return searchSite; }; + function searchSite(site) { + var searchTerm = $scope.searchText.toLowerCase(); + if (site.name && site.name.toLowerCase().indexOf(searchTerm) !== -1) { + return true; + } + if (site.username && site.username.toLowerCase().indexOf(searchTerm) !== -1) { + return true; + } + if (site.uri && site.uri.toLowerCase().indexOf(searchTerm) !== -1) { + return true; + } + + return false; + } + $scope.addSite = function () { $state.go('addSite', { animation: 'in-slide-up', @@ -109,6 +114,10 @@ }); }; + $scope.viewFolder = function (folder) { + // TODO: vault folder page + }; + $scope.clipboardError = function (e) { toastr.info(i18n.browserNotSupportClipboard); }; diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html index e9d9e69b53..27eee63977 100644 --- a/src/popup/app/vault/views/vault.html +++ b/src/popup/app/vault/views/vault.html @@ -8,17 +8,31 @@
-
+
+
+
+
+ {{i18n.folders}} +
+ + {{folder.name}} + + +
+
+
+