Merge branch 'pwFoundList'

6 files changed, 50 insertions, 15 deletions

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 199ff13..31a2c0f 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -207,6 +207,10 @@
     "message": "Enable password picker",
     "description": "Disable password picker"
   },
+  "password_picker_gotolist": {
+    "message": "When passwords found, go to list rather than last active tab",
+    "description": "Disable password picker"
+  },
   "enable_debug": {
     "message": "Enable debug mode",
     "description": "Enable debug mode"
diff --git a/css/browser_action.css b/css/browser_action.css
index b9252c4..b950aef 100644
--- a/css/browser_action.css
+++ b/css/browser_action.css
@@ -731,6 +731,13 @@ label, .switch-label, label:not(.input-checkbox):not(.label) {
     margin-bottom: 35px;
     padding-left: 5px; }
 
+#tab1-content {
+  border-right: 1px solid #333333; }
+
+.tab-wrap .tab-label-content label.tab-title {
+  padding: 16px 90px;
+  margin-bottom: 0; }
+
 .tab-wrap .tab-label-content.account .tab-content.active {
   margin-top: 10px; }
 
diff --git a/html/browser_action/views/settings.html b/html/browser_action/views/settings.html
index 5986dd4..532d908 100644
--- a/html/browser_action/views/settings.html
+++ b/html/browser_action/views/settings.html
@@ -72,6 +72,12 @@
                     translate}}</label>
             </div>
             <div class="switch-row">
+                <input type="checkbox" id="password_picker_gotolist" ng-model="settings.passwordPickerGotoList"
+                       class="switch-input">
+                <label for="password_picker_gotolist" class="switch-label">{{'password_picker_gotolist' |
+                    translate}}</label>
+            </div>
+            <div class="switch-row">
                 <input type="checkbox" id="enable_debug" ng-model="settings.debug" class="switch-input">
                 <label for="enable_debug" class="switch-label">{{'enable_debug' | translate}}</label>
             </div>
diff --git a/js/background/service/background.js b/js/background/service/background.js
index e34eb1c..cd586fd 100644
--- a/js/background/service/background.js
+++ b/js/background/service/background.js
@@ -104,6 +104,9 @@ var background = (function () {
             if (!_self.settings.hasOwnProperty('enableUpdateUrl')) {
                 _self.settings.enableUpdateUrl = true;
             }
+            if (!_self.settings.hasOwnProperty('passwordPickerGotoList')) {
+                _self.settings.passwordPickerGotoList = false;
+            }
 
             getCredentials();
 
diff --git a/js/ui/password_picker/password_picker.js b/js/ui/password_picker/password_picker.js
index 5bd9192..d872c35 100644
--- a/js/ui/password_picker/password_picker.js
+++ b/js/ui/password_picker/password_picker.js
@@ -1,6 +1,22 @@
 $(document).ready(function () {
     var _this = this;
     var storage = new API.Storage();
+    var runtimeSettings = {};
+
+    API.runtime.sendMessage(API.runtime.id, {'method': 'getRuntimeSettings'}).then(function (settings) {
+        var accounts = settings.accounts;
+        runtimeSettings = settings;
+        for(var i = 0; i < accounts.length; i++) {
+            $('#savepw-vault').append('<option value=' + i + '>' + accounts[i].vault.name + '</option>');
+        }
+        storage.get('activeTab').then(function (name) {
+            if (name && name !== '') {
+                makeTabActive(name);
+                API.runtime.sendMessage(API.runtime.id, {method: "getActiveTab", args: {returnFn: "returnActiveTab"}});
+            }
+        });
+
+    });
 
     $('[t]').each(function () {
         var string = $(this).attr('t');
@@ -215,15 +231,9 @@ $(document).ready(function () {
         storage.set('activeTab', name).then(function (r) {
             makeTabActive(name);
         });
-
     });
     
-    makeTabActive('list');
-    storage.get('activeTab').then(function (name) {
-        if (name && name !== '') {
-            makeTabActive(name);
-        }
-    });
+
 
     $('.tab.close').click(function () {
         removePasswordPicker();
@@ -244,7 +254,7 @@ $(document).ready(function () {
         });
     }
 
-    API.runtime.sendMessage(API.runtime.id, {method: "getActiveTab", args: {returnFn: "returnActiveTab"}});
+
 
     function returnActiveTab(tab) {
 
@@ -271,6 +281,9 @@ $(document).ready(function () {
             }
             if (logins.length !== 0) {
                 picker.find('.tab-list-content').html('');
+                if(runtimeSettings.passwordPickerGotoList){
+                    makeTabActive('list');
+                }
             }
             for (var i = 0; i < logins.length; i++) {
                 var login = logins[i];
@@ -373,10 +386,4 @@ $(document).ready(function () {
         });
     }
 
-    API.runtime.sendMessage(API.runtime.id, {'method': 'getRuntimeSettings'}).then(function (settings) {
-        var accounts = settings.accounts;
-        for(var i = 0; i < accounts.length; i++) {
-            $('#savepw-vault').append('<option value=' + i + '>' + accounts[i].vault.name + '</option>');
-        }
-    });
 });
diff --git a/style/browser_action.scss b/style/browser_action.scss
index 07764bf..b57c2c6 100644
--- a/style/browser_action.scss
+++ b/style/browser_action.scss
@@ -264,7 +264,15 @@ label, .switch-label, label:not(.input-checkbox):not(.label) {
     padding-left: 5px;
   }
 }
-
+#tab1-content{
+  border-right: 1px solid #333333;
+}
+.tab-wrap .tab-label-content{
+ label.tab-title{
+   padding: 16px 90px;
+   margin-bottom: 0;
+ }
+}
 .tab-wrap .tab-label-content.account .tab-content.active{
   margin-top: 10px;
 }