Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2025-01-03 18:28:13 +01:00
Code Issues Projects Releases Wiki Activity

refactored out main. props to each ctrl.

Browse Source
This commit is contained in:
Kyle Spearrin 2017-11-14 10:10:13 -05:00
parent 947e51f3b5
commit b9139eec33
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/popup/app/current/currentController.js
View File

@ -14,6 +14,8 @@ angular
$scope.otherCiphers = []; $scope.otherCiphers = [];
$scope.loaded = false; $scope.loaded = false;
$scope.searchText = null; $scope.searchText = null;
$scope.inSidebar = utilsService.inSidebar($window);
$scope.disableSearch = utilsService.isEdge();
document.getElementById('search').focus(); document.getElementById('search').focus();
$scope.$on('$viewContentLoaded', function () { $scope.$on('$viewContentLoaded', function () {

6
src/popup/app/current/views/current.html
View File

@ -1,11 +1,11 @@
<div class="header header-search"> <div class="header header-search">
<div class="left" ng-if="!main.inSidebar"> <div class="left" ng-if="!inSidebar">
<pop-out></pop-out> <pop-out></pop-out>
</div> </div>
<div class="left" ng-if="main.inSidebar"> <div class="left" ng-if="inSidebar">
<a href="" ng-click="refresh()"><i class="fa fa-refresh fa-lg"></i></a> <a href="" ng-click="refresh()"><i class="fa fa-refresh fa-lg"></i></a>
</div> </div>
<div class="search" ng-style="{'visibility': main.disableSearch ? 'hidden' : 'visible'}"> <div class="search" ng-style="{'visibility': disableSearch ? 'hidden' : 'visible'}">
<input type="search" placeholder="{{i18n.searchVault}}" id="search" ng-model="searchText" ng-change="searchVault()" /> <input type="search" placeholder="{{i18n.searchVault}}" id="search" ng-model="searchText" ng-change="searchVault()" />
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
</div> </div>

2
src/popup/app/global/mainController.js
View File

@ -7,8 +7,6 @@ angular
self.animation = ''; self.animation = '';
self.xsBody = $window.screen.availHeight < 600; self.xsBody = $window.screen.availHeight < 600;
self.smBody = !self.xsBody && $window.screen.availHeight <= 800; self.smBody = !self.xsBody && $window.screen.availHeight <= 800;
self.disableSearch = utilsService && utilsService.isEdge();
self.inSidebar = utilsService && utilsService.inSidebar($window);
$transitions.onSuccess({}, function(transition) { $transitions.onSuccess({}, function(transition) {
const toParams = transition.params("to"); const toParams = transition.params("to");

1
src/popup/app/vault/vaultController.js
View File

@ -9,6 +9,7 @@ angular
$scope.i18n = i18nService; $scope.i18n = i18nService;
$scope.showFolderCounts = !utilsService.isEdge(); $scope.showFolderCounts = !utilsService.isEdge();
$scope.showOnlyFolderView = utilsService.isEdge(); $scope.showOnlyFolderView = utilsService.isEdge();
$scope.disableSearch = utilsService.isEdge();
document.getElementById('search').focus(); document.getElementById('search').focus();
var syncOnLoad = $stateParams.syncOnLoad; var syncOnLoad = $stateParams.syncOnLoad;

2
src/popup/app/vault/views/vault.html
View File

@ -2,7 +2,7 @@
<div class="left"> <div class="left">
<pop-out></pop-out> <pop-out></pop-out>
</div> </div>
<div class="search" ng-style="{'visibility': main.disableSearch ? 'hidden' : 'visible'}"> <div class="search" ng-style="{'visibility': disableSearch ? 'hidden' : 'visible'}">
<input type="search" placeholder="{{::i18n.searchVault}}" id="search" ng-model="searchText" /> <input type="search" placeholder="{{::i18n.searchVault}}" id="search" ng-model="searchText" />
<i class="fa fa-search"></i> <i class="fa fa-search"></i>
</div> </div>