get auto-type properties from entry

app/scripts/auto-type/index.js

@@ -14,9 +14,11 @@ var AutoType = {
 
     enabled: !!Launcher,
 
-    run: function(entry, sequence, obfuscate, callback) {
+    run: function(entry, callback) {
+        var sequence = entry.getEffectiveAutoTypeSeq();
         logger.debug('Start', sequence);
         var that = this;
+        var ts = logger.ts();
         try {
             var parser = new AutoTypeParser(sequence);
             var runner = parser.parse();
@@ -24,30 +26,30 @@ var AutoType = {
             runner.resolve(entry, function(err) {
                 if (err) {
                     logger.error('Resolve error', err);
-                    return callback(err);
+                    return callback && callback(err);
                 }
                 logger.debug('Resolved', that.printOps(runner.ops));
-                if (obfuscate) {
+                if (entry.get('autoTypeObfuscation')) {
                     try {
                         runner.obfuscate();
                     } catch (e) {
                         logger.error('Obfuscate error', e);
-                        return callback(e);
+                        return callback && callback(e);
                     }
                     logger.debug('Obfuscated');
                 }
                 runner.run(function(err) {
                     if (err) {
                         logger.error('Run error', err);
-                        return callback(err);
+                        return callback && callback(err);
                     }
-                    logger.debug('Complete');
-                    return callback();
+                    logger.debug('Complete', logger.ts(ts));
+                    return callback && callback();
                 });
             });
         } catch (ex) {
             logger.error('Parse error', ex);
-            return callback(ex);
+            return callback && callback(ex);
         }
     },
 

app/scripts/models/entry-model.js

@@ -467,6 +467,10 @@ var EntryModel = Backbone.Model.extend({
         return this.group.getEffectiveEnableAutoType();
     },
 
+    getEffectiveAutoTypeSeq: function() {
+        return this.entry.autoType.defaultSequence || this.group.getEffectiveAutoTypeSeq();
+    },
+
     setEnableAutoType: function(enabled) {
         this._entryModified();
         if (enabled === this.group.getEffectiveEnableAutoType()) {

app/scripts/views/details/details-view.js

@@ -772,7 +772,7 @@ var DetailsView = Backbone.View.extend({
     autoType: function() {
         var entry = this.model;
         AutoType.hideWindow(function() {
-            AutoType.run(entry, '{password}', true, _.noop);
+            AutoType.run(entry);
         });
     },