diff --git a/gulpfile.js b/gulpfile.js index ebf7709477..2171d37966 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -78,7 +78,8 @@ gulp.task('lib', ['clean:lib'], function () { dest: paths.libDir + 'angular-ui-router' }, { - src: [paths.npmDir + 'angular-toastr/dist/angular-toastr.tpls.js', paths.npmDir + 'angular-toastr/dist/angular-toastr.css'], + src: [paths.npmDir + 'angular-toastr/dist/angular-toastr.tpls.js', + paths.npmDir + 'angular-toastr/dist/angular-toastr.css'], dest: paths.libDir + 'angular-toastr' }, { @@ -102,7 +103,8 @@ gulp.task('lib', ['clean:lib'], function () { dest: paths.libDir + 'q' }, { - src: [paths.npmDir + 'sweetalert/dist/sweetalert.css', paths.npmDir + 'sweetalert/dist/sweetalert.min.js', paths.npmDir + 'angular-sweetalert/SweetAlert.js'], + src: [paths.npmDir + 'sweetalert/dist/sweetalert.css', paths.npmDir + 'sweetalert/dist/sweetalert.min.js', + paths.npmDir + 'angular-sweetalert/SweetAlert.js'], dest: paths.libDir + 'sweetalert' } ]; diff --git a/src/popup/app/config.js b/src/popup/app/config.js index 1896ca9d59..0ac47d2d2d 100644 --- a/src/popup/app/config.js +++ b/src/popup/app/config.js @@ -100,7 +100,10 @@ templateUrl: 'app/vault/views/vaultAddSite.html', controller: 'vaultAddSiteController', data: { authorize: true }, - params: { animation: null, returnScrollY: 0, returnSearchText: null, name: null, uri: null, site: null, fromCurrent: false } + params: { + animation: null, returnScrollY: 0, returnSearchText: null, name: null, + uri: null, site: null, fromCurrent: false + } }) .state('editSite', { url: '/edit-site?siteId', diff --git a/src/popup/app/current/views/current.html b/src/popup/app/current/views/current.html index 2a20a46dba..35168cfbee 100644 --- a/src/popup/app/current/views/current.html +++ b/src/popup/app/current/views/current.html @@ -10,12 +10,14 @@
- + - + {{site.name}} diff --git a/src/popup/app/global/tabs.html b/src/popup/app/global/tabs.html index 206081745e..3bace3569f 100644 --- a/src/popup/app/global/tabs.html +++ b/src/popup/app/global/tabs.html @@ -1,9 +1,17 @@ 
diff --git a/src/popup/app/services/loginService.js b/src/popup/app/services/loginService.js index 357f0b3e7f..7e65bbe0a9 100644 --- a/src/popup/app/services/loginService.js +++ b/src/popup/app/services/loginService.js @@ -1,7 +1,8 @@ angular .module('bit.services') - .factory('loginService', function (cryptoService, apiService, userService, tokenService, $q, syncService, $rootScope, siteService, folderService) { + .factory('loginService', function (cryptoService, apiService, userService, tokenService, $q, syncService, + $rootScope, siteService, folderService) { var _service = {}; _service.logIn = function (email, masterPassword) { diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js index bfa2f73e92..92c5b8343c 100644 --- a/src/popup/app/settings/settingsController.js +++ b/src/popup/app/settings/settingsController.js @@ -21,7 +21,8 @@ $scope.changePassword = function () { SweetAlert.swal({ title: 'Change Master Password', - text: 'You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?', + text: 'You can change your master password on the bitwarden.com web vault. Do you want to visit the ' + + 'website now?', showCancelButton: true, confirmButtonText: 'Yes', cancelButtonText: 'Cancel' @@ -31,7 +32,8 @@ $scope.changeEmail = function () { SweetAlert.swal({ title: 'Change Email', - text: 'You can change your email address on the bitwarden.com web vault. Do you want to visit the website now?', + text: 'You can change your email address on the bitwarden.com web vault. Do you want to visit the ' + + 'website now?', showCancelButton: true, confirmButtonText: 'Yes', cancelButtonText: 'Cancel' @@ -41,7 +43,9 @@ $scope.twoStep = function () { SweetAlert.swal({ title: 'Two-step Login', - text: 'Two-step login makes your account more secure by requiring you to enter a security code from an authenticator app whenever you log in. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?', + text: 'Two-step login makes your account more secure by requiring you to enter a security code from an ' + + 'authenticator app whenever you log in. Two-step login can be enabled on the bitwarden.com web vault. ' + + 'Do you want to visit the website now?', showCancelButton: true, confirmButtonText: 'Yes', cancelButtonText: 'Cancel' @@ -71,6 +75,6 @@ default: return; } - + }; }); diff --git a/src/popup/app/settings/views/settingsFolders.html b/src/popup/app/settings/views/settingsFolders.html index 1bc5a5370e..659e71cc21 100644 --- a/src/popup/app/settings/views/settingsFolders.html +++ b/src/popup/app/settings/views/settingsFolders.html @@ -21,7 +21,8 @@

There are no folders to list. - Add a Folder + Add a Folder

diff --git a/src/popup/app/tools/toolsPasswordGeneratorController.js b/src/popup/app/tools/toolsPasswordGeneratorController.js index 20e5df4779..e8b6ecc2bd 100644 --- a/src/popup/app/tools/toolsPasswordGeneratorController.js +++ b/src/popup/app/tools/toolsPasswordGeneratorController.js @@ -1,7 +1,8 @@ angular .module('bit.tools') - .controller('toolsPasswordGeneratorController', function ($scope, $state, $stateParams, passwordGenerationService, toastr, $q) { + .controller('toolsPasswordGeneratorController', function ($scope, $state, $stateParams, passwordGenerationService, + toastr, $q) { var addState = $stateParams.addState, editState = $stateParams.editState; diff --git a/src/popup/app/tools/views/toolsPasswordGenerator.html b/src/popup/app/tools/views/toolsPasswordGenerator.html index 925393e8c9..487281afdc 100644 --- a/src/popup/app/tools/views/toolsPasswordGenerator.html +++ b/src/popup/app/tools/views/toolsPasswordGenerator.html @@ -56,11 +56,13 @@
- +
- +
diff --git a/src/popup/app/vault/views/vaultAddSite.html b/src/popup/app/vault/views/vaultAddSite.html index 32ea73b660..7164aa0798 100644 --- a/src/popup/app/vault/views/vaultAddSite.html +++ b/src/popup/app/vault/views/vaultAddSite.html @@ -43,7 +43,9 @@
diff --git a/src/popup/app/vault/views/vaultEditSite.html b/src/popup/app/vault/views/vaultEditSite.html index 1becfdf6fd..e10d5cd79b 100644 --- a/src/popup/app/vault/views/vaultEditSite.html +++ b/src/popup/app/vault/views/vaultEditSite.html @@ -43,7 +43,9 @@
diff --git a/src/popup/app/vault/views/vaultViewSite.html b/src/popup/app/vault/views/vaultViewSite.html index 5b85986c5c..8696559c40 100644 --- a/src/popup/app/vault/views/vaultViewSite.html +++ b/src/popup/app/vault/views/vaultViewSite.html @@ -19,7 +19,8 @@ {{site.name}}
- + Website diff --git a/src/popup/scripts/popup.js b/src/popup/scripts/popup.js index 9fdf4fa965..6bdd50f3c7 100644 --- a/src/popup/scripts/popup.js +++ b/src/popup/scripts/popup.js @@ -29,7 +29,7 @@ } } else if (select.length > 0) { - select.openSelect(); + select.focus(); } }); @@ -42,22 +42,3 @@ return self; }(); - - -// ref: http://stackoverflow.com/questions/19432610/jquery-open-select-by-button -(function ($) { - "use strict"; - $.fn.openSelect = function () { - return this.each(function (index, el) { - $(el).focus(); - if (document.createEvent) { - var event = document.createEvent("MouseEvents"); - event.initMouseEvent("mousedown", true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null); - el.dispatchEvent(event); - } - else if (element.fireEvent) { - el.fireEvent("onmousedown"); - } - }); - } -}(jQuery)); diff --git a/src/services/autofillService.js b/src/services/autofillService.js index a4bb289d34..ca5e7cc722 100644 --- a/src/services/autofillService.js +++ b/src/services/autofillService.js @@ -103,7 +103,7 @@ function initAutofill() { fillScript.autosubmit = { focusOpid: password.opid }; } } - else if (passwordFields.length == 1) { + else if (passwordFields.length === 1) { // The page does not have any forms with password fields. Use the one password field on the page and the // input field just before it as the username. diff --git a/src/services/tokenService.js b/src/services/tokenService.js index 0d447caadd..9353050db6 100644 --- a/src/services/tokenService.js +++ b/src/services/tokenService.js @@ -99,6 +99,8 @@ function initTokenService() { throw 'Illegal base64url string!'; } } - return window.decodeURIComponent(escape(window.atob(output))); //polyfill https://github.com/davidchambers/Base64.js + + //polyfill https://github.com/davidchambers/Base64.js + return window.decodeURIComponent(escape(window.atob(output))); }; };