jquery-atwho-rails 1.3.2 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80acb080f644075e726726590ef4844a29fcaaf1
-  data.tar.gz: 738cc9113f6208dd94674f646d77a6decc0b07f4
+  metadata.gz: 25dacabb78625142ac94373b2d12d7d8fde3090a
+  data.tar.gz: 5aeb2f0904ee79152d8e7bcb7e5bdda9aefe0036
 SHA512:
-  metadata.gz: 6bfd5e521b619a0fb9794c9c03677b6d7dcc27b636da3f8bfda4da0e000818726081880c6a65eca467e2074f5beceb19ca1dc9ecbf49c29b4ae34de11879be78
-  data.tar.gz: 9b2daefbe83e0569098e5e46e8feb61f1540312bea3bf13de4bbf2c1943e7b582af0643b6094fd23a7a09f6aa8bc7803a3f0359faa158d528673abc17d7085d2
+  metadata.gz: b3dac3daf434ec2d143fdf5990ee5dbdb9929e898e761df9b31137db58feef997fc7d678b76dd6048c354f06e0b09feff261c82a874415666b411b41d66c6ca6
+  data.tar.gz: c2b0ac76bf5416ef2efc54f4088229d5e108c96366c0f69fba3353b798022fd206493e63a52b2625a964ab104816e2f82ae37904b902b50fb910c490f6125467

data/Gemfile

@@ -1,8 +1,4 @@
-if ENV['TRAVIS']
-  source 'https://rubygems.org'
-else
-  source 'http://ruby.taobao.org'
-end
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in jquery-atwho-rails.gemspec
 gemspec

data/README.md

@@ -20,12 +20,24 @@ Issue command line bellow:
 then It will show in `public/[javascript|stylesheets]/` directory.
 
 #### Rails >= 3.1.x
-Add this gem in `Gemfile` like this:  
-`gem jquery-atwho-rails`  
+Add this gem in `Gemfile` like this:
 
-then add    
-` //= require jquery.atwho `  to `app/assets/javascripts/application.js` 
-and add ` //=require jquery.atwho ` to `app/assets/stylesheets/applications.css`  
+```ruby
+gem 'jquery-atwho-rails'
+```
+
+add in `app/assets/javascripts/application.js`:
+
+```
+//= require jquery
+//= require jquery.atwho
+```
+
+and in `app/assets/stylesheets/applications.css`:
+
+``` 
+//=require jquery.atwho
+```
 
 #### History Versions 
 All in [At.js](https://github.com/ichord/At.js) project.

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery-atwho-rails",
-  "version": "1.3.2",
+  "version": "1.5.2",
   "homepage": "https://github.com/ichord/jquery-atwho-rails",
   "authors": [
     "ichord <chord.luo@gmail.com>"
@@ -14,6 +14,6 @@
     "tests"
   ],
   "dependencies": {
-    "At.js": "~1.3.0"
+    "At.js": "~1.5.2"
   }
 }

data/lib/assets/javascripts/jquery.atwho/jquery.atwho.js

@@ -1,8 +1,9 @@
-/*! jquery.atwho - v1.3.2 %>
-* Copyright (c) 2015 chord.luo <chord.luo@gmail.com>;
-* homepage: http://ichord.github.com/At.js
-* Licensed MIT
-*/
+/**
+ * at.js - 1.5.4
+ * Copyright (c) 2017 chord.luo <chord.luo@gmail.com>;
+ * Homepage: http://ichord.github.com/At.js
+ * License: MIT
+ */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module unless amdModuleId is set
@@ -17,14 +18,110 @@
   } else {
     factory(jQuery);
   }
-}(this, function (jquery) {
+}(this, function ($) {
+var DEFAULT_CALLBACKS, KEY_CODE;
 
-var $, Api, App, Controller, DEFAULT_CALLBACKS, EditableController, KEY_CODE, Model, TextareaController, View,
-  slice = [].slice,
-  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-  hasProp = {}.hasOwnProperty;
+KEY_CODE = {
+  ESC: 27,
+  TAB: 9,
+  ENTER: 13,
+  CTRL: 17,
+  A: 65,
+  P: 80,
+  N: 78,
+  LEFT: 37,
+  UP: 38,
+  RIGHT: 39,
+  DOWN: 40,
+  BACKSPACE: 8,
+  SPACE: 32
+};
+
+DEFAULT_CALLBACKS = {
+  beforeSave: function(data) {
+    return Controller.arrayToDefaultHash(data);
+  },
+  matcher: function(flag, subtext, should_startWithSpace, acceptSpaceBar) {
+    var _a, _y, match, regexp, space;
+    flag = flag.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+    if (should_startWithSpace) {
+      flag = '(?:^|\\s)' + flag;
+    }
+    _a = decodeURI("%C3%80");
+    _y = decodeURI("%C3%BF");
+    space = acceptSpaceBar ? "\ " : "";
+    regexp = new RegExp(flag + "([A-Za-z" + _a + "-" + _y + "0-9_" + space + "\'\.\+\-]*)$|" + flag + "([^\\x00-\\xff]*)$", 'gi');
+    match = regexp.exec(subtext);
+    if (match) {
+      return match[2] || match[1];
+    } else {
+      return null;
+    }
+  },
+  filter: function(query, data, searchKey) {
+    var _results, i, item, len;
+    _results = [];
+    for (i = 0, len = data.length; i < len; i++) {
+      item = data[i];
+      if (~new String(item[searchKey]).toLowerCase().indexOf(query.toLowerCase())) {
+        _results.push(item);
+      }
+    }
+    return _results;
+  },
+  remoteFilter: null,
+  sorter: function(query, items, searchKey) {
+    var _results, i, item, len;
+    if (!query) {
+      return items;
+    }
+    _results = [];
+    for (i = 0, len = items.length; i < len; i++) {
+      item = items[i];
+      item.atwho_order = new String(item[searchKey]).toLowerCase().indexOf(query.toLowerCase());
+      if (item.atwho_order > -1) {
+        _results.push(item);
+      }
+    }
+    return _results.sort(function(a, b) {
+      return a.atwho_order - b.atwho_order;
+    });
+  },
+  tplEval: function(tpl, map) {
+    var error, error1, template;
+    template = tpl;
+    try {
+      if (typeof tpl !== 'string') {
+        template = tpl(map);
+      }
+      return template.replace(/\$\{([^\}]*)\}/g, function(tag, key, pos) {
+        return map[key];
+      });
+    } catch (error1) {
+      error = error1;
+      return "";
+    }
+  },
+  highlighter: function(li, query) {
+    var regexp;
+    if (!query) {
+      return li;
+    }
+    regexp = new RegExp(">\\s*([^\<]*?)(" + query.replace("+", "\\+") + ")([^\<]*)\\s*<", 'ig');
+    return li.replace(regexp, function(str, $1, $2, $3) {
+      return '> ' + $1 + '<strong>' + $2 + '</strong>' + $3 + ' <';
+    });
+  },
+  beforeInsert: function(value, $li, e) {
+    return value;
+  },
+  beforeReposition: function(offset) {
+    return offset;
+  },
+  afterMatchFailed: function(at, el) {}
+};
 
-$ = jquery;
+var App;
 
 App = (function() {
   function App(inputor) {
@@ -45,7 +142,7 @@ App = (function() {
   };
 
   App.prototype.setupRootElement = function(iframe, asRoot) {
-    var error;
+    var error, error1;
     if (asRoot == null) {
       asRoot = false;
     }
@@ -58,8 +155,8 @@ App = (function() {
       this.window = this.document.defaultView || this.document.parentWindow;
       try {
         this.iframe = this.window.frameElement;
-      } catch (_error) {
-        error = _error;
+      } catch (error1) {
+        error = error1;
         this.iframe = null;
         if ($.fn.atwho.debug) {
           throw new Error("iframe auto-discovery is failed.\nPlease use `setIframe` to set the target iframe manually.\n" + error);
@@ -112,11 +209,16 @@ App = (function() {
         if ((ref = _this.controller()) != null) {
           ref.view.hide();
         }
-        return _this.isComposing = true;
+        _this.isComposing = true;
+        return null;
       };
     })(this)).on('compositionend', (function(_this) {
       return function(e) {
-        return _this.isComposing = false;
+        _this.isComposing = false;
+        setTimeout(function(e) {
+          return _this.dispatch(e);
+        });
+        return null;
       };
     })(this)).on('keyup.atwhoInner', (function(_this) {
       return function(e) {
@@ -192,6 +294,7 @@ App = (function() {
       case KEY_CODE.DOWN:
       case KEY_CODE.UP:
       case KEY_CODE.CTRL:
+      case KEY_CODE.ENTER:
         $.noop();
         break;
       case KEY_CODE.P:
@@ -266,13 +369,16 @@ App = (function() {
 
 })();
 
+var Controller,
+  slice = [].slice;
+
 Controller = (function() {
   Controller.prototype.uid = function() {
     return (Math.random().toString(16) + "000000000").substr(2, 8) + (new Date().getTime());
   };
 
-  function Controller(app1, at1) {
-    this.app = app1;
+  function Controller(app, at1) {
+    this.app = app;
     this.at = at1;
     this.$inputor = this.app.$inputor;
     this.id = this.$inputor[0].id || this.uid();
@@ -302,12 +408,12 @@ Controller = (function() {
   };
 
   Controller.prototype.callDefault = function() {
-    var args, error, funcName;
+    var args, error, error1, funcName;
     funcName = arguments[0], args = 2 <= arguments.length ? slice.call(arguments, 1) : [];
     try {
       return DEFAULT_CALLBACKS[funcName].apply(this, args);
-    } catch (_error) {
-      error = _error;
+    } catch (error1) {
+      error = error1;
       return $.error(error + " Or maybe At.js doesn't have function " + funcName);
     }
   };
@@ -328,11 +434,11 @@ Controller = (function() {
   };
 
   Controller.prototype.getOpt = function(at, default_value) {
-    var e;
+    var e, error1;
     try {
       return this.setting[at];
-    } catch (_error) {
-      e = _error;
+    } catch (error1) {
+      e = error1;
       return null;
     }
   };
@@ -374,6 +480,12 @@ Controller = (function() {
 
   Controller.prototype.lookUp = function(e) {
     var query, wait;
+    if (e && e.type === 'click' && !this.getOpt('lookUpOnClick')) {
+      return;
+    }
+    if (this.getOpt('suspendOnComposing') && this.app.isComposing) {
+      return;
+    }
     query = this.catchQuery(e);
     if (!query) {
       this.expectedQueryCBId = null;
@@ -443,6 +555,10 @@ Controller = (function() {
 
 })();
 
+var TextareaController,
+  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  hasProp = {}.hasOwnProperty;
+
 TextareaController = (function(superClass) {
   extend(TextareaController, superClass);
 
@@ -451,14 +567,18 @@ TextareaController = (function(superClass) {
   }
 
   TextareaController.prototype.catchQuery = function() {
-    var caretPos, content, end, query, start, subtext;
+    var caretPos, content, end, isString, query, start, subtext;
     content = this.$inputor.val();
     caretPos = this.$inputor.caret('pos', {
       iframe: this.app.iframe
     });
     subtext = content.slice(0, caretPos);
-    query = this.callbacks("matcher").call(this, this.at, subtext, this.getOpt('startWithSpace'));
-    if (typeof query === "string" && query.length <= this.getOpt('maxLen', 20)) {
+    query = this.callbacks("matcher").call(this, this.at, subtext, this.getOpt('startWithSpace'), this.getOpt("acceptSpaceBar"));
+    isString = typeof query === 'string';
+    if (isString && query.length < this.getOpt('minLen', 0)) {
+      return;
+    }
+    if (isString && query.length <= this.getOpt('maxLen', 20)) {
       start = caretPos - query.length;
       end = start + query.length;
       this.pos = start;
@@ -517,6 +637,10 @@ TextareaController = (function(superClass) {
 
 })(Controller);
 
+var EditableController,
+  extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
+  hasProp = {}.hasOwnProperty;
+
 EditableController = (function(superClass) {
   extend(EditableController, superClass);
 
@@ -536,7 +660,7 @@ EditableController = (function(superClass) {
     if (range == null) {
       range = this._getRange();
     }
-    if (!range) {
+    if (!(range && node)) {
       return;
     }
     node = $(node)[0];
@@ -579,22 +703,12 @@ EditableController = (function(superClass) {
   };
 
   EditableController.prototype.catchQuery = function(e) {
-    var $inserted, $query, _range, index, inserted, lastNode, matched, offset, query, range;
-    if (this.app.isComposing) {
-      return;
-    }
+    var $inserted, $query, _range, index, inserted, isString, lastNode, matched, offset, query, query_content, range;
     if (!(range = this._getRange())) {
       return;
     }
-    if (e.which === KEY_CODE.CTRL) {
-      this.ctrl_pressed = true;
-    } else if (e.which === KEY_CODE.A) {
-      if (this.ctrl_pressed == null) {
-        this.ctrl_a_pressed = true;
-      }
-    } else {
-      delete this.ctrl_a_pressed;
-      delete this.ctrl_pressed;
+    if (!range.collapsed) {
+      return;
     }
     if (e.which === KEY_CODE.ENTER) {
       ($query = $(range.startContainer).closest('.atwho-query')).contents().unwrap();
@@ -631,23 +745,45 @@ EditableController = (function(superClass) {
     if (!this._movingEvent(e)) {
       $query.removeClass('atwho-inserted');
     }
+    if ($query.length > 0) {
+      switch (e.which) {
+        case KEY_CODE.LEFT:
+          this._setRange('before', $query.get(0), range);
+          $query.removeClass('atwho-query');
+          return;
+        case KEY_CODE.RIGHT:
+          this._setRange('after', $query.get(0).nextSibling, range);
+          $query.removeClass('atwho-query');
+          return;
+      }
+    }
+    if ($query.length > 0 && (query_content = $query.attr('data-atwho-at-query'))) {
+      $query.empty().html(query_content).attr('data-atwho-at-query', null);
+      this._setRange('after', $query.get(0), range);
+    }
     _range = range.cloneRange();
     _range.setStart(range.startContainer, 0);
-    matched = this.callbacks("matcher").call(this, this.at, _range.toString(), this.getOpt('startWithSpace'));
-    if ($query.length === 0 && typeof matched === 'string' && (index = range.startOffset - this.at.length - matched.length) >= 0) {
+    matched = this.callbacks("matcher").call(this, this.at, _range.toString(), this.getOpt('startWithSpace'), this.getOpt("acceptSpaceBar"));
+    isString = typeof matched === 'string';
+    if ($query.length === 0 && isString && (index = range.startOffset - this.at.length - matched.length) >= 0) {
       range.setStart(range.startContainer, index);
       $query = $('<span/>', this.app.document).attr(this.getOpt("editableAtwhoQueryAttrs")).addClass('atwho-query');
       range.surroundContents($query.get(0));
       lastNode = $query.contents().last().get(0);
-      if (/firefox/i.test(navigator.userAgent)) {
-        range.setStart(lastNode, lastNode.length);
-        range.setEnd(lastNode, lastNode.length);
-        this._clearRange(range);
-      } else {
-        this._setRange('after', lastNode, range);
+      if (lastNode) {
+        if (/firefox/i.test(navigator.userAgent)) {
+          range.setStart(lastNode, lastNode.length);
+          range.setEnd(lastNode, lastNode.length);
+          this._clearRange(range);
+        } else {
+          this._setRange('after', lastNode, range);
+        }
       }
     }
-    if (typeof matched === 'string' && matched.length <= this.getOpt('maxLen', 20)) {
+    if (isString && matched.length < this.getOpt('minLen', 0)) {
+      return;
+    }
+    if (isString && matched.length <= this.getOpt('maxLen', 20)) {
       query = {
         text: matched,
         el: $query
@@ -673,6 +809,9 @@ EditableController = (function(superClass) {
   EditableController.prototype.rect = function() {
     var $iframe, iframeOffset, rect;
     rect = this.query.el.offset();
+    if (!(rect && this.query.el[0].getClientRects().length)) {
+      return;
+    }
     if (this.app.iframe && !this.app.iframeAsRoot) {
       iframeOffset = ($iframe = $(this.app.iframe)).offset();
       rect.left += iframeOffset.left - this.$inputor.scrollLeft();
@@ -683,13 +822,23 @@ EditableController = (function(superClass) {
   };
 
   EditableController.prototype.insert = function(content, $li) {
-    var range, suffix, suffixNode;
+    var data, overrides, range, suffix, suffixNode;
+    if (!this.$inputor.is(':focus')) {
+      this.$inputor.focus();
+    }
+    overrides = this.getOpt('functionOverrides');
+    if (overrides.insert) {
+      return overrides.insert.call(this, content, $li);
+    }
     suffix = (suffix = this.getOpt('suffix')) === "" ? suffix : suffix || "\u00A0";
-    this.query.el.removeClass('atwho-query').addClass('atwho-inserted').html(content);
+    data = $li.data('item-data');
+    this.query.el.removeClass('atwho-query').addClass('atwho-inserted').html(content).attr('data-atwho-at-query', "" + data['atwho-at'] + this.query.text).attr('contenteditable', "false");
     if (range = this._getRange()) {
-      range.setEndAfter(this.query.el[0]);
+      if (this.query.el.length) {
+        range.setEndAfter(this.query.el[0]);
+      }
       range.collapse(false);
-      range.insertNode(suffixNode = this.app.document.createTextNode(suffix));
+      range.insertNode(suffixNode = this.app.document.createTextNode("" + suffix));
       this._setRange('after', suffixNode, range);
     }
     if (!this.$inputor.is(':focus')) {
@@ -702,6 +851,8 @@ EditableController = (function(superClass) {
 
 })(Controller);
 
+var Model;
+
 Model = (function() {
   function Model(context) {
     this.context = context;
@@ -766,18 +917,25 @@ Model = (function() {
 
 })();
 
+var View;
+
 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
     });
@@ -788,12 +946,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');
@@ -804,7 +976,7 @@ View = (function() {
   };
 
   View.prototype.visible = function() {
-    return this.$el.is(":visible");
+    return $.expr.filters.visible(this.$el[0]);
   };
 
   View.prototype.highlighted = function() {
@@ -815,7 +987,8 @@ View = (function() {
     var $li, content;
     if (($li = this.$el.find(".cur")).length) {
       content = this.context.insertContentFor($li);
-      this.context.insert(this.context.callbacks("beforeInsert").call(this.context, content, $li), $li);
+      this.context._stopDelayedCall();
+      this.context.insert(this.context.callbacks("beforeInsert").call(this.context, content, $li, e), $li);
       this.context.trigger("inserted", [$li, e]);
       this.hide(e);
     }
@@ -845,36 +1018,40 @@ View = (function() {
   };
 
   View.prototype.next = function() {
-    var cur, next;
+    var cur, next, nextEl, offset;
     cur = this.$el.find('.cur').removeClass('cur');
     next = cur.next();
     if (!next.length) {
       next = this.$el.find('li:first');
     }
     next.addClass('cur');
-    return this.scrollTop(Math.max(0, cur.innerHeight() * (next.index() + 2) - this.$el.height()));
+    nextEl = next[0];
+    offset = nextEl.offsetTop + nextEl.offsetHeight + (nextEl.nextSibling ? nextEl.nextSibling.offsetHeight : 0);
+    return this.scrollTop(Math.max(0, offset - this.$el.height()));
   };
 
   View.prototype.prev = function() {
-    var cur, prev;
+    var cur, offset, prev, prevEl;
     cur = this.$el.find('.cur').removeClass('cur');
     prev = cur.prev();
     if (!prev.length) {
       prev = this.$el.find('li:last');
     }
     prev.addClass('cur');
-    return this.scrollTop(Math.max(0, cur.innerHeight() * (prev.index() + 2) - this.$el.height()));
+    prevEl = prev[0];
+    offset = prevEl.offsetTop + prevEl.offsetHeight + (prevEl.nextSibling ? prevEl.nextSibling.offsetHeight : 0);
+    return this.scrollTop(Math.max(0, offset - 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);
     }
   };
 
@@ -942,107 +1119,7 @@ View = (function() {
 
 })();
 
-KEY_CODE = {
-  DOWN: 40,
-  UP: 38,
-  ESC: 27,
-  TAB: 9,
-  ENTER: 13,
-  CTRL: 17,
-  A: 65,
-  P: 80,
-  N: 78,
-  LEFT: 37,
-  UP: 38,
-  RIGHT: 39,
-  DOWN: 40,
-  BACKSPACE: 8,
-  SPACE: 32
-};
-
-DEFAULT_CALLBACKS = {
-  beforeSave: function(data) {
-    return Controller.arrayToDefaultHash(data);
-  },
-  matcher: function(flag, subtext, should_startWithSpace, acceptSpaceBar) {
-    var _a, _y, match, regexp, space;
-    flag = flag.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-    if (should_startWithSpace) {
-      flag = '(?:^|\\s)' + flag;
-    }
-    _a = decodeURI("%C3%80");
-    _y = decodeURI("%C3%BF");
-    space = acceptSpaceBar ? "\ " : "";
-    regexp = new RegExp(flag + "([A-Za-z" + _a + "-" + _y + "0-9_" + space + "\.\+\-]*)$|" + flag + "([^\\x00-\\xff]*)$", 'gi');
-    match = regexp.exec(subtext);
-    if (match) {
-      return match[2] || match[1];
-    } else {
-      return null;
-    }
-  },
-  filter: function(query, data, searchKey) {
-    var _results, i, item, len;
-    _results = [];
-    for (i = 0, len = data.length; i < len; i++) {
-      item = data[i];
-      if (~new String(item[searchKey]).toLowerCase().indexOf(query.toLowerCase())) {
-        _results.push(item);
-      }
-    }
-    return _results;
-  },
-  remoteFilter: null,
-  sorter: function(query, items, searchKey) {
-    var _results, i, item, len;
-    if (!query) {
-      return items;
-    }
-    _results = [];
-    for (i = 0, len = items.length; i < len; i++) {
-      item = items[i];
-      item.atwho_order = new String(item[searchKey]).toLowerCase().indexOf(query.toLowerCase());
-      if (item.atwho_order > -1) {
-        _results.push(item);
-      }
-    }
-    return _results.sort(function(a, b) {
-      return a.atwho_order - b.atwho_order;
-    });
-  },
-  tplEval: function(tpl, map) {
-    var error, template;
-    template = tpl;
-    try {
-      if (typeof tpl !== 'string') {
-        template = tpl(map);
-      }
-      return template.replace(/\$\{([^\}]*)\}/g, function(tag, key, pos) {
-        return map[key];
-      });
-    } catch (_error) {
-      error = _error;
-      return "";
-    }
-  },
-  highlighter: function(li, query) {
-    var regexp;
-    if (!query) {
-      return li;
-    }
-    regexp = new RegExp(">\\s*(\\w*?)(" + query.replace("+", "\\+") + ")(\\w*)\\s*<", 'ig');
-    return li.replace(regexp, function(str, $1, $2, $3) {
-      return '> ' + $1 + '<strong>' + $2 + '</strong>' + $3 + ' <';
-    });
-  },
-  beforeInsert: function(value, $li) {
-    return value;
-  },
-  beforeReposition: function(offset) {
-    return offset;
-  },
-  afterMatchFailed: function(at, el) {}
-};
+var Api;
 
 Api = {
   load: function(at, data) {
@@ -1053,7 +1130,7 @@ Api = {
   },
   isSelecting: function() {
     var ref;
-    return (ref = this.controller()) != null ? ref.view.visible() : void 0;
+    return !!((ref = this.controller()) != null ? ref.view.visible() : void 0);
   },
   hide: function() {
     var ref;
@@ -1108,23 +1185,28 @@ $.fn.atwho["default"] = {
   data: null,
   displayTpl: "<li>${name}</li>",
   insertTpl: "${atwho-at}${name}",
+  headerTpl: null,
   callbacks: DEFAULT_CALLBACKS,
+  functionOverrides: {},
   searchKey: "name",
   suffix: void 0,
   hideWithoutSuffix: false,
   startWithSpace: true,
+  acceptSpaceBar: false,
   highlightFirst: true,
   limit: 5,
   maxLen: 20,
+  minLen: 0,
   displayTimeout: 300,
   delay: null,
   spaceSelectsMatch: false,
   tabSelectsMatch: true,
   editableAtwhoQueryAttrs: {},
-  scrollDuration: 150
+  scrollDuration: 150,
+  suspendOnComposing: true,
+  lookUpOnClick: true
 };
 
 $.fn.atwho.debug = false;
 
-
 }));

data/lib/assets/stylesheets/jquery.atwho.css

@@ -10,11 +10,32 @@
     border-radius: 3px;
     box-shadow: 0 0 5px rgba(0,0,0,0.1);
     min-width: 120px;
-    max-height: 200px;
-    overflow: auto;
     z-index: 11110 !important;
 }
 
+.atwho-view .atwho-header {
+    padding: 5px;
+    margin: 5px;
+    cursor: pointer;
+    border-bottom: solid 1px #eaeff1;
+    color: #6f8092;
+    font-size: 11px;
+    font-weight: bold;
+}
+
+.atwho-view .atwho-header .small {
+    color: #6f8092;
+    float: right;
+    padding-top: 2px;
+    margin-right: -5px;
+    font-size: 12px;
+    font-weight: normal;
+}
+
+.atwho-view .atwho-header:hover {
+    cursor: default;
+}
+
 .atwho-view .cur {
     background: #3366FF;
     color: white;
@@ -34,6 +55,8 @@
     list-style:none;
     padding:0;
     margin:auto;
+    max-height: 200px;
+    overflow-y: auto;
 }
 .atwho-view ul li {
     display: block;

data/lib/jquery-atwho-rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = '1.3.2'
+      VERSION = '1.5.4'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-atwho-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.5.4
 platform: ruby
 authors:
 - ichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jquery-atwho-rails
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: 'jquery plugin: @mentions'