Merge branch 'lawrencium-lock-after-auto-type' into develop

app/scripts/auto-type/index.js

@@ -8,6 +8,7 @@ const AutoTypeSelectView = require('../views/auto-type/auto-type-select-view');
 const Logger = require('../util/logger');
 const Locale = require('../util/locale');
 const Timeouts = require('../const/timeouts');
+const AppSettingsModel = require('../models/app-settings-model');
 
 const logger = new Logger('auto-type');
 const clearTextAutoTypeLog = localStorage.autoTypeDebug;
@@ -61,6 +62,10 @@ const AutoType = {
                 });
             }
         });
+
+        if (AppSettingsModel.instance.get('lockOnAutoType')) {
+            Backbone.trigger('lock-workspace');
+        }
     },
 
     run(entry, callback) {

app/scripts/locales/base.json

@@ -358,6 +358,7 @@
   "setGenMinInstead": "Minimize app instead of close",
   "setGenLockMinimize": "Auto-lock on minimize",
   "setGenLockCopy": "Auto-lock on password copy",
+  "setGenLockAutoType": "Auto-lock on auto-type",
   "setGenStorage": "Storage",
   "setGenShowAdvanced": "Show advanced settings",
   "setGenDevTools": "Show dev tools",

app/scripts/models/app-settings-model.js

@@ -20,6 +20,7 @@ const AppSettingsModel = Backbone.Model.extend({
         titlebarStyle: 'default',
         lockOnMinimize: true,
         lockOnCopy: false,
+        lockOnAutoType: false,
         helpTipCopyShown: false,
         skipOpenLocalWarn: false,
         hideEmptyFields: false,

app/scripts/views/settings/settings-general-view.js

@@ -13,6 +13,7 @@ const Storage = require('../../storage');
 const FeatureDetector = require('../../util/feature-detector');
 const Locale = require('../../util/locale');
 const Links = require('../../const/links');
+const AutoType = require('../../auto-type');
 
 const SettingsGeneralView = Backbone.View.extend({
     template: require('templates/settings/settings-general.hbs'),
@@ -30,6 +31,7 @@ const SettingsGeneralView = Backbone.View.extend({
         'change .settings__general-minimize': 'changeMinimize',
         'change .settings__general-lock-on-minimize': 'changeLockOnMinimize',
         'change .settings__general-lock-on-copy': 'changeLockOnCopy',
+        'change .settings__general-lock-on-auto-type': 'changeLockOnAutoType',
         'change .settings__general-table-view': 'changeTableView',
         'change .settings__general-colorful-icons': 'changeColorfulIcons',
         'change .settings__general-titlebar-style': 'changeTitlebarStyle',
@@ -76,8 +78,10 @@ const SettingsGeneralView = Backbone.View.extend({
             canAutoUpdate: Updater.enabled,
             canMinimize: Launcher && Launcher.canMinimize(),
             canDetectMinimize: !!Launcher,
+            canAutoType: AutoType.enabled,
             lockOnMinimize: Launcher && AppSettingsModel.instance.get('lockOnMinimize'),
             lockOnCopy: AppSettingsModel.instance.get('lockOnCopy'),
+            lockOnAutoType: AppSettingsModel.instance.get('lockOnAutoType'),
             tableView: AppSettingsModel.instance.get('tableView'),
             canSetTableView: !FeatureDetector.isMobile,
             autoUpdate: Updater.getAutoUpdateType(),
@@ -241,6 +245,11 @@ const SettingsGeneralView = Backbone.View.extend({
         AppSettingsModel.instance.set('lockOnCopy', lockOnCopy);
     },
 
+    changeLockOnAutoType: function(e) {
+        const lockOnAutoType = e.target.checked || false;
+        AppSettingsModel.instance.set('lockOnAutoType', lockOnAutoType);
+    },
+
     changeTableView: function(e) {
         const tableView = e.target.checked || false;
         AppSettingsModel.instance.set('tableView', tableView);

app/templates/settings/settings-general.hbs

@@ -146,7 +146,13 @@
                {{#if lockOnCopy}}checked{{/if}} />
         <label for="settings__general-lock-on-copy">{{res 'setGenLockCopy'}}</label>
     </div>
-
+    {{#if canAutoType}}
+    <div>
+        <input type="checkbox" class="settings__input input-base settings__general-lock-on-auto-type" id="settings__general-lock-on-auto-type"
+               {{#if lockOnAutoType}}checked{{/if}} />
+        <label for="settings__general-lock-on-auto-type">{{res 'setGenLockAutoType'}}</label>
+    </div>
+    {{/if}}
     <h2>{{res 'setGenStorage'}}</h2>
     {{#each storageProviders as |prv|}}
     <h4 class="settings__general-storage-header"><input

desktop/app.js

@@ -147,9 +147,6 @@ function createMainWindow() {
     mainWindow.on('minimize', () => {
         emitBackboneEvent('launcher-minimize');
     });
-    mainWindow.on('hide', () => {
-        emitBackboneEvent('launcher-minimize');
-    });
     mainWindow.on('leave-full-screen', () => {
         emitBackboneEvent('leave-full-screen');
     });