dump version

Author: ichord

Gruntfile.coffee

@@ -1,5 +1,6 @@
 {
   "name": "At.js",
+  "version": "1.4.0",
   "main": [
     "dist/js/jquery.atwho.js",
     "dist/css/jquery.atwho.css"
@@ -28,4 +29,4 @@
     "atjs",
     "at.js"
   ]
-}
+}

bower.json

@@ -685,8 +685,18 @@ EditableController = (function(superClass) {
     return e.type === 'click' || ((ref = e.which) === KEY_CODE.RIGHT || ref === KEY_CODE.LEFT || ref === KEY_CODE.UP || ref === KEY_CODE.DOWN);
   };
 
+  EditableController.prototype._unwrap = function(node) {
+    var next;
+    node = $(node).unwrap().get(0);
+    if ((next = node.nextSibling) && next.nodeValue) {
+      node.nodeValue += next.nodeValue;
+      $(next).remove();
+    }
+    return node;
+  };
+
   EditableController.prototype.catchQuery = function(e) {
-    var $inserted, $query, _range, index, inserted, isString, lastNode, matched, offset, parentNode, query, query_content, range;
+    var $inserted, $query, _range, index, inserted, isString, lastNode, matched, offset, query, query_content, range;
     if (!(range = this._getRange())) {
       return;
     }
@@ -780,9 +790,7 @@ EditableController = (function(superClass) {
         if (this._movingEvent(e) && $query.hasClass('atwho-inserted')) {
           $query.removeClass('atwho-query');
         } else if (false !== this.callbacks('afterMatchFailed').call(this, this.at, $query)) {
-          parentNode = $query[0].parentNode;
-          this._setRange("after", $query.text($query.text()).contents().first().unwrap());
-          parentNode.normalize();
+          this._setRange("after", this._unwrap($query.text($query.text()).contents().first()));
         }
       }
       return null;
@@ -894,14 +902,19 @@ View = (function() {
   function View(context) {
     this.context = context;
     this.$el = $("<div class='atwho-view'><ul class='atwho-view-ul'></ul></div>");
+    this.$elUl = this.$el.children();
     this.timeoutID = null;
     this.context.$el.append(this.$el);
     this.bindEvent();
   }
 
   View.prototype.init = function() {
-    var id;
+    var header_tpl, id;
     id = this.context.getOpt("alias") || this.context.at.charCodeAt(0);
+    header_tpl = this.context.getOpt("headerTpl");
+    if (header_tpl && this.$el.children().length === 1) {
+      this.$el.prepend(header_tpl);
+    }
     return this.$el.attr({
       'id': "at-view-" + id
     });
@@ -912,12 +925,26 @@ View = (function() {
   };
 
   View.prototype.bindEvent = function() {
-    var $menu;
+    var $menu, lastCoordX, lastCoordY;
     $menu = this.$el.find('ul');
-    return $menu.on('mouseenter.atwho-view', 'li', function(e) {
-      $menu.find('.cur').removeClass('cur');
-      return $(e.currentTarget).addClass('cur');
-    }).on('click.atwho-view', 'li', (function(_this) {
+    lastCoordX = 0;
+    lastCoordY = 0;
+    return $menu.on('mousemove.atwho-view', 'li', (function(_this) {
+      return function(e) {
+        var $cur;
+        if (lastCoordX === e.clientX && lastCoordY === e.clientY) {
+          return;
+        }
+        lastCoordX = e.clientX;
+        lastCoordY = e.clientY;
+        $cur = $(e.currentTarget);
+        if ($cur.hasClass('cur')) {
+          return;
+        }
+        $menu.find('.cur').removeClass('cur');
+        return $cur.addClass('cur');
+      };
+    })(this)).on('click.atwho-view', 'li', (function(_this) {
       return function(e) {
         $menu.find('.cur').removeClass('cur');
         $(e.currentTarget).addClass('cur');
@@ -977,7 +1004,7 @@ View = (function() {
       next = this.$el.find('li:first');
     }
     next.addClass('cur');
-    return this.scrollTop(Math.max(0, cur.innerHeight() * (next.index() + 2) - this.$el.height()));
+    return this.scrollTop(Math.max(0, cur.outerHeight(true) * (next.index() + 2) - this.$el.height()));
   };
 
   View.prototype.prev = function() {
@@ -988,18 +1015,18 @@ View = (function() {
       prev = this.$el.find('li:last');
     }
     prev.addClass('cur');
-    return this.scrollTop(Math.max(0, cur.innerHeight() * (prev.index() + 2) - this.$el.height()));
+    return this.scrollTop(Math.max(0, cur.outerHeight(true) * (prev.index() + 2) - this.$el.height()));
   };
 
   View.prototype.scrollTop = function(scrollTop) {
     var scrollDuration;
     scrollDuration = this.context.getOpt('scrollDuration');
     if (scrollDuration) {
-      return this.$el.animate({
+      return this.$elUl.animate({
         scrollTop: scrollTop
       }, scrollDuration);
     } else {
-      return this.$el.scrollTop(scrollTop);
+      return this.$elUl.scrollTop(scrollTop);
     }
   };