Merge branch 'master' into vdom

2016-02-23 17:23:05 +11:00 · 2016-02-23 17:23:05 +11:00 · 27052717a4
parent 10aa1923a4 d59c9badbe
commit 27052717a4
1 changed files with 1 additions and 1 deletions
--- a/app/assets/javascripts/discourse/lib/autocomplete.js.es6
+++ b/app/assets/javascripts/discourse/lib/autocomplete.js.es6
@ -317,7 +317,7 @@ export default function(options) {
    }
  };

-  $(this).on('keyup.autocomplete', function(e) {
+  $(this).on('keyup.autocomplete', function() {

    var caretPosition = Discourse.Utilities.caretPosition(me[0]);