jquery-atwho-rails 0.4.7 → 0.4.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4711b0cee4422713ce5672944e44588dcc560e8
-  data.tar.gz: a96d6fc2ee15c7d549f55e83aa855793f801b73b
+  metadata.gz: edd22436434bb09eecdc9e926d6a14a1f1f9a177
+  data.tar.gz: bbd43f1b9adf1c0294327d166f7b33d1b5b5a961
 SHA512:
-  metadata.gz: da25e5bd13ae5af69b9037d6851c498ce3febed96b2074dbf2d6ab98132c74ae7b8118f9a2a15aab50fe48a06f107bc80e04162b32b8a2521021a8167afe46b4
-  data.tar.gz: 8c71f0f82b185ead06af5a8c3311b1e59192fe451e8dcede7be675ae41668b158c082489b48ebbe6ac9c2f402475e3bc35d29ff99ceb4f93882884b685d62726
+  metadata.gz: 7b51f3042fb10491bfb2b09ed3c5df937b9006086a7e40e898111b730c7fc48ae14907ff44214c5ce5daee8c82724b90083f7be603384ac74ae43ab89bb3e879
+  data.tar.gz: d4a0286f34a546f694f46ee7d93b27cf98687db0bc724056129b863804a1b0b0a1d3da21f31da6a996f9dd17c2420db31f50aaeca043a0669152dbe2e6b0644a

data/README.md

@@ -22,9 +22,8 @@ Add this gem in `Gemfile` like this:
 `gem jquery-atwho-rails`  
 
 then add    
-` //= require jquery.atwho `  
-to `app/assets/javascripts/application.js`  
-and `app/assets/stylesheets/applications.css`  
+` //= require jquery.atwho/index `  to `app/assets/javascripts/application.js` 
+and add ` //=require jquery.atwho ` to `app/assets/stylesheets/applications.css`  
 
 #### History Versions 
 All in [At.js](https://github.com/ichord/At.js) project.

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

@@ -1,4 +1,4 @@
-/*! jquery.atwho - v0.4.7 - 2014-02-22
+/*! jquery.atwho - v0.4.11 - 2014-04-27
 * Copyright (c) 2014 chord.luo <chord.luo@gmail.com>; 
 * homepage: http://ichord.github.com/At.js 
 * Licensed MIT
@@ -22,9 +22,29 @@ App = (function() {
     this.controllers = {};
     this.alias_maps = {};
     this.$inputor = $(inputor);
+    this.iframe = null;
+    this.setIframe();
     this.listen();
   }
 
+  App.prototype.setIframe = function(iframe) {
+    var error;
+    if (iframe) {
+      this.window = iframe.contentWindow;
+      this.document = iframe.contentDocument || this.window.document;
+      this.iframe = iframe;
+      return this;
+    } else {
+      this.document = this.$inputor[0].ownerDocument;
+      this.window = this.document.defaultView || this.document.parentWindow;
+      try {
+        return this.iframe = this.window.frameElement;
+      } catch (_error) {
+        error = _error;
+      }
+    }
+  };
+
   App.prototype.controller = function(at) {
     return this.controllers[this.alias_maps[at] || at || this.current_flag];
   };
@@ -74,6 +94,7 @@ App = (function() {
     for (_ in _ref) {
       c = _ref[_];
       c.destroy();
+      delete this.controllers[_];
     }
     return this.$inputor.off('.atwhoInner');
   };
@@ -81,8 +102,18 @@ App = (function() {
   App.prototype.dispatch = function() {
     return $.map(this.controllers, (function(_this) {
       return function(c) {
-        if (c.look_up()) {
-          return _this.set_context_for(c.at);
+        var delay;
+        if (delay = c.get_opt('delay')) {
+          clearTimeout(_this.delayedCallback);
+          return _this.delayedCallback = setTimeout(function() {
+            if (c.look_up()) {
+              return _this.set_context_for(c.at);
+            }
+          }, delay);
+        } else {
+          if (c.look_up()) {
+            return _this.set_context_for(c.at);
+          }
         }
       };
     })(this));
@@ -99,8 +130,15 @@ App = (function() {
         break;
       case KEY_CODE.DOWN:
       case KEY_CODE.UP:
+      case KEY_CODE.CTRL:
         $.noop();
         break;
+      case KEY_CODE.P:
+      case KEY_CODE.N:
+        if (!e.ctrlKey) {
+          this.dispatch();
+        }
+        break;
       default:
         this.dispatch();
     }
@@ -125,6 +163,20 @@ App = (function() {
         e.preventDefault();
         view.next();
         break;
+      case KEY_CODE.P:
+        if (!e.ctrlKey) {
+          return;
+        }
+        e.preventDefault();
+        view.prev();
+        break;
+      case KEY_CODE.N:
+        if (!e.ctrlKey) {
+          return;
+        }
+        e.preventDefault();
+        view.next();
+        break;
       case KEY_CODE.TAB:
       case KEY_CODE.ENTER:
         if (!view.visible()) {
@@ -143,21 +195,15 @@ App = (function() {
 })();
 
 Controller = (function() {
-  var uuid, _uuid;
-
-  _uuid = 0;
-
-  uuid = function() {
-    return _uuid += 1;
+  Controller.prototype.uid = function() {
+    return (Math.random().toString(16) + "000000000").substr(2, 8) + (new Date().getTime());
   };
 
   function Controller(app, at) {
     this.app = app;
     this.at = at;
     this.$inputor = this.app.$inputor;
-    this.oDocument = this.$inputor[0].ownerDocument;
-    this.oWindow = this.oDocument.defaultView || this.oDocument.parentWindow;
-    this.id = this.$inputor[0].id || uuid();
+    this.id = this.$inputor[0].id || this.uid();
     this.setting = null;
     this.query = null;
     this.pos = 0;
@@ -177,7 +223,8 @@ Controller = (function() {
   Controller.prototype.destroy = function() {
     this.trigger('beforeDestroy');
     this.model.destroy();
-    return this.view.destroy();
+    this.view.destroy();
+    return this.$el.remove();
   };
 
   Controller.prototype.call_default = function() {
@@ -235,12 +282,13 @@ Controller = (function() {
       end = start + query.length;
       this.pos = start;
       query = {
-        'text': query.toLowerCase(),
+        'text': query,
         'head_pos': start,
         'end_pos': end
       };
       this.trigger("matched", [this.at, query.text]);
     } else {
+      query = null;
       this.view.hide();
     }
     return this.query = query;
@@ -248,13 +296,15 @@ Controller = (function() {
 
   Controller.prototype.rect = function() {
     var c, scale_bottom;
-    if (!(c = this.$inputor.caret('offset', this.pos - 1))) {
+    if (!(c = this.$inputor.caret({
+      iframe: this.app.iframe
+    }).caret('offset', this.pos - 1))) {
       return;
     }
     if (this.$inputor.attr('contentEditable') === 'true') {
       c = (this.cur_rect || (this.cur_rect = c)) || c;
     }
-    scale_bottom = document.selection ? 0 : 2;
+    scale_bottom = this.app.document.selection ? 0 : 2;
     return {
       left: c.left,
       top: c.top,
@@ -270,11 +320,11 @@ Controller = (function() {
 
   Controller.prototype.mark_range = function() {
     if (this.$inputor.attr('contentEditable') === 'true') {
-      if (this.oWindow.getSelection) {
-        this.range = this.oWindow.getSelection().getRangeAt(0);
+      if (this.app.window.getSelection) {
+        this.range = this.app.window.getSelection().getRangeAt(0);
       }
-      if (this.oDocument.selection) {
-        return this.ie8_range = this.oDocument.selection.createRange();
+      if (this.app.document.selection) {
+        return this.ie8_range = this.app.document.selection.createRange();
       }
     }
   };
@@ -300,9 +350,9 @@ Controller = (function() {
       class_name = "atwho-view-flag atwho-view-flag-" + (this.get_opt('alias') || this.at);
       content_node = "" + content + "<span contenteditable='false'>&nbsp;<span>";
       insert_node = "<span contenteditable='false' class='" + class_name + "'>" + content_node + "</span>";
-      $insert_node = $(insert_node, this.oDocument).data('atwho-data-item', $li.data('item-data'));
-      if (this.oDocument.selection) {
-        $insert_node = $("<span contenteditable='true'></span>", this.oDocument).html($insert_node);
+      $insert_node = $(insert_node, this.app.document).data('atwho-data-item', $li.data('item-data'));
+      if (this.app.document.selection) {
+        $insert_node = $("<span contenteditable='true'></span>", this.app.document).html($insert_node);
       }
     }
     if ($inputor.is('textarea, input')) {
@@ -319,7 +369,7 @@ Controller = (function() {
       range.deleteContents();
       range.insertNode($insert_node[0]);
       range.collapse(false);
-      sel = this.oWindow.getSelection();
+      sel = this.app.window.getSelection();
       sel.removeAllRanges();
       sel.addRange(range);
     } else if (range = this.ie8_range) {
@@ -466,15 +516,16 @@ View = (function() {
 
   View.prototype.choose = function() {
     var $li, content;
-    $li = this.$el.find(".cur");
-    content = this.context.insert_content_for($li);
-    this.context.insert(this.context.callbacks("before_insert").call(this.context, content, $li), $li);
-    this.context.trigger("inserted", [$li]);
-    return this.hide();
+    if (($li = this.$el.find(".cur")).length) {
+      content = this.context.insert_content_for($li);
+      this.context.insert(this.context.callbacks("before_insert").call(this.context, content, $li), $li);
+      this.context.trigger("inserted", [$li]);
+      return this.hide();
+    }
   };
 
   View.prototype.reposition = function(rect) {
-    var offset;
+    var offset, _ref;
     if (rect.bottom + this.$el.height() - $(window).scrollTop() > $(window).height()) {
       rect.bottom = rect.top - this.$el.height();
     }
@@ -482,6 +533,9 @@ View = (function() {
       left: rect.left,
       top: rect.bottom
     };
+    if ((_ref = this.context.callbacks("before_reposition")) != null) {
+      _ref.call(this.context, offset);
+    }
     this.$el.offset(offset);
     return this.context.trigger("reposition", [offset]);
   };
@@ -511,6 +565,7 @@ View = (function() {
     this.context.mark_range();
     if (!this.visible()) {
       this.$el.show();
+      this.context.trigger('shown');
     }
     if (rect = this.context.rect()) {
       return this.reposition(rect);
@@ -521,7 +576,8 @@ View = (function() {
     var callback;
     if (isNaN(time && this.visible())) {
       this.context.reset_rect();
-      return this.$el.hide();
+      this.$el.hide();
+      return this.context.trigger('hidden');
     } else {
       callback = (function(_this) {
         return function() {
@@ -553,7 +609,9 @@ View = (function() {
       $ul.append($li);
     }
     this.show();
-    return $ul.find("li:first").addClass("cur");
+    if (this.context.get_opt('highlight_first')) {
+      return $ul.find("li:first").addClass("cur");
+    }
   };
 
   return View;
@@ -565,7 +623,10 @@ KEY_CODE = {
   UP: 38,
   ESC: 27,
   TAB: 9,
-  ENTER: 13
+  ENTER: 13,
+  CTRL: 17,
+  P: 80,
+  N: 78
 };
 
 DEFAULT_CALLBACKS = {
@@ -606,7 +667,7 @@ DEFAULT_CALLBACKS = {
     _results = [];
     for (_i = 0, _len = data.length; _i < _len; _i++) {
       item = data[_i];
-      if (~item[search_key].toLowerCase().indexOf(query)) {
+      if (~item[search_key].toLowerCase().indexOf(query.toLowerCase())) {
         _results.push(item);
       }
     }
@@ -621,7 +682,7 @@ DEFAULT_CALLBACKS = {
     _results = [];
     for (_i = 0, _len = items.length; _i < _len; _i++) {
       item = items[_i];
-      item.atwho_order = item[search_key].toLowerCase().indexOf(query);
+      item.atwho_order = item[search_key].toLowerCase().indexOf(query.toLowerCase());
       if (item.atwho_order > -1) {
         _results.push(item);
       }
@@ -691,6 +752,9 @@ Api = {
   getInsertedIDs: function(at) {
     return Api.getInsertedItemsWithIDs.apply(this, [at])[0];
   },
+  setIframe: function(iframe) {
+    return this.setIframe(iframe);
+  },
   run: function() {
     return this.dispatch();
   },
@@ -743,9 +807,11 @@ $.fn.atwho["default"] = {
   callbacks: DEFAULT_CALLBACKS,
   search_key: "name",
   start_with_space: true,
+  highlight_first: true,
   limit: 5,
   max_len: 20,
-  display_timeout: 300
+  display_timeout: 300,
+  delay: null
 };
 
   });

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

@@ -24,7 +24,7 @@
     }
   })(function($) {
     "use strict";
-    var EditableCaret, InputCaret, Mirror, Utils, methods, oDocument, oFrame, oWindow, pluginName;
+    var EditableCaret, InputCaret, Mirror, Utils, configure, methods, oDocument, oFrame, oWindow, pluginName, setContextBy;
     pluginName = 'caret';
     EditableCaret = (function() {
       function EditableCaret($inputor) {
@@ -290,7 +290,7 @@
     };
     methods = {
       pos: function(pos) {
-        if (pos) {
+        if (pos || pos === 0) {
           return this.setPos(pos);
         } else {
           return this.getPos();
@@ -317,13 +317,36 @@
     oDocument = null;
     oWindow = null;
     oFrame = null;
+    setContextBy = function(iframe) {
+      oFrame = iframe;
+      oWindow = iframe.contentWindow;
+      return oDocument = iframe.contentDocument || oWindow.document;
+    };
+    configure = function($dom, settings) {
+      var error, iframe;
+      if ($.isPlainObject(settings) && (iframe = settings.iframe)) {
+        $dom.data('caret-iframe', iframe);
+        return setContextBy(iframe);
+      } else if (iframe = $dom.data('caret-iframe')) {
+        return setContextBy(iframe);
+      } else {
+        oDocument = $dom[0].ownerDocument;
+        oWindow = oDocument.defaultView || oDocument.parentWindow;
+        try {
+          return oFrame = oWindow.frameElement;
+        } catch (_error) {
+          error = _error;
+        }
+      }
+    };
     $.fn.caret = function(method) {
       var caret;
-      oDocument = this[0].ownerDocument;
-      oWindow = oDocument.defaultView || oDocument.parentWindow;
-      oFrame = oWindow.frameElement;
-      caret = Utils.contentEditable(this) ? new EditableCaret(this) : new InputCaret(this);
-      if (methods[method]) {
+      if (typeof method === 'object') {
+        configure(this, method);
+        return this;
+      } else if (methods[method]) {
+        configure(this);
+        caret = Utils.contentEditable(this) ? new EditableCaret(this) : new InputCaret(this);
         return methods[method].apply(caret, Array.prototype.slice.call(arguments, 1));
       } else {
         return $.error("Method " + method + " does not exist on jQuery.caret");

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

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = "0.4.7"
+      VERSION = "0.4.11"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-atwho-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.11
 platform: ruby
 authors:
 - ichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: jquery-atwho-rails
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: 'jquery plugin: @mentions'