update to v0.5.0

Author: ichord

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

@@ -1,4 +1,4 @@
-/*! jquery.atwho - v0.4.11 - 2014-04-27
+/*! jquery.atwho - v0.5.0 - 2014-07-14
 * Copyright (c) 2014 chord.luo <chord.luo@gmail.com>; 
 * homepage: http://ichord.github.com/At.js 
 * Licensed MIT
@@ -13,7 +13,7 @@
     }
   })(function($) {
 
-var $CONTAINER, Api, App, Atwho, Controller, DEFAULT_CALLBACKS, KEY_CODE, Model, View,
+var $CONTAINER, Api, App, Controller, DEFAULT_CALLBACKS, KEY_CODE, Model, View,
   __slice = [].slice;
 
 App = (function() {
@@ -28,25 +28,36 @@ App = (function() {
   }
 
   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;
+      return this.iframe = iframe;
     } 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;
-      }
+      this.document = document;
+      this.window = window;
+      return this.iframe = null;
     }
   };
 
   App.prototype.controller = function(at) {
-    return this.controllers[this.alias_maps[at] || at || this.current_flag];
+    var c, current, current_flag, _ref;
+    if (this.alias_maps[at]) {
+      current = this.controllers[this.alias_maps[at]];
+    } else {
+      _ref = this.controllers;
+      for (current_flag in _ref) {
+        c = _ref[current_flag];
+        if (current_flag === at) {
+          current = c;
+          break;
+        }
+      }
+    }
+    if (current) {
+      return current;
+    } else {
+      return this.controllers[this.current_flag];
+    }
   };
 
   App.prototype.set_context_for = function(at) {
@@ -76,15 +87,20 @@ App = (function() {
     })(this)).on('scroll.atwhoInner', (function(_this) {
       return function(e) {
         var _ref;
-        return (_ref = _this.controller()) != null ? _ref.view.hide() : void 0;
+        return (_ref = _this.controller()) != null ? _ref.view.hide(e) : void 0;
       };
     })(this)).on('blur.atwhoInner', (function(_this) {
       return function(e) {
         var c;
         if (c = _this.controller()) {
-          return c.view.hide(c.get_opt("display_timeout"));
+          return c.view.hide(e, c.get_opt("display_timeout"));
         }
       };
+    })(this)).on('click.atwhoInner', (function(_this) {
+      return function(e) {
+        var _ref;
+        return (_ref = _this.controller()) != null ? _ref.view.hide(e) : void 0;
+      };
     })(this));
   };
 
@@ -153,7 +169,7 @@ App = (function() {
     switch (e.keyCode) {
       case KEY_CODE.ESC:
         e.preventDefault();
-        view.hide();
+        view.hide(e);
         break;
       case KEY_CODE.UP:
         e.preventDefault();
@@ -183,7 +199,7 @@ App = (function() {
           return;
         }
         e.preventDefault();
-        view.choose();
+        view.choose(e);
         break;
       default:
         $.noop();
@@ -274,7 +290,9 @@ Controller = (function() {
   Controller.prototype.catch_query = function() {
     var caret_pos, content, end, query, start, subtext;
     content = this.content();
-    caret_pos = this.$inputor.caret('pos');
+    caret_pos = this.$inputor.caret('pos', {
+      iframe: this.app.iframe
+    });
     subtext = content.slice(0, caret_pos);
     query = this.callbacks("matcher").call(this, this.at, subtext, this.get_opt('start_with_space'));
     if (typeof query === "string" && query.length <= this.get_opt('max_len', 20)) {
@@ -296,9 +314,9 @@ Controller = (function() {
 
   Controller.prototype.rect = function() {
     var c, scale_bottom;
-    if (!(c = this.$inputor.caret({
+    if (!(c = this.$inputor.caret('offset', this.pos - 1, {
       iframe: this.app.iframe
-    }).caret('offset', this.pos - 1))) {
+    }))) {
       return;
     }
     if (this.$inputor.attr('contentEditable') === 'true') {
@@ -344,37 +362,32 @@ Controller = (function() {
   };
 
   Controller.prototype.insert = function(content, $li) {
-    var $inputor, $insert_node, class_name, content_node, insert_node, pos, range, sel, source, start_str, text;
+    var $inputor, content_node, pos, range, sel, source, start_str, text, wrapped_content;
     $inputor = this.$inputor;
-    if ($inputor.attr('contentEditable') === 'true') {
-      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.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);
-      }
-    }
+    wrapped_content = this.callbacks('inserting_wrapper').call(this, $inputor, content, this.get_opt("suffix"));
     if ($inputor.is('textarea, input')) {
-      content = '' + content;
       source = $inputor.val();
       start_str = source.slice(0, Math.max(this.query.head_pos - this.at.length, 0));
-      text = "" + start_str + content + " " + (source.slice(this.query['end_pos'] || 0));
+      text = "" + start_str + wrapped_content + (source.slice(this.query['end_pos'] || 0));
       $inputor.val(text);
-      $inputor.caret('pos', start_str.length + content.length + 1);
+      $inputor.caret('pos', start_str.length + wrapped_content.length, {
+        iframe: this.app.iframe
+      });
     } else if (range = this.range) {
       pos = range.startOffset - (this.query.end_pos - this.query.head_pos) - this.at.length;
       range.setStart(range.endContainer, Math.max(pos, 0));
       range.setEnd(range.endContainer, range.endOffset);
       range.deleteContents();
-      range.insertNode($insert_node[0]);
+      content_node = $(wrapped_content, this.app.document)[0];
+      range.insertNode(content_node);
+      range.setEndAfter(content_node);
       range.collapse(false);
       sel = this.app.window.getSelection();
       sel.removeAllRanges();
       sel.addRange(range);
     } else if (range = this.ie8_range) {
       range.moveStart('character', this.query.end_pos - this.query.head_pos - this.at.length);
-      range.pasteHTML(content_node);
+      range.pasteHTML(wrapped_content);
       range.collapse(false);
       range.select();
     }
@@ -504,7 +517,7 @@ View = (function() {
       return $(e.currentTarget).addClass('cur');
     }).on('click', (function(_this) {
       return function(e) {
-        _this.choose();
+        _this.choose(e);
         return e.preventDefault();
       };
     })(this));
@@ -514,13 +527,16 @@ View = (function() {
     return this.$el.is(":visible");
   };
 
-  View.prototype.choose = function() {
+  View.prototype.choose = function(e) {
     var $li, content;
     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();
+      this.context.trigger("inserted", [$li, e]);
+      this.hide(e);
+    }
+    if (this.context.get_opt("hide_without_suffix")) {
+      return this.stop_showing = true;
     }
   };
 
@@ -562,6 +578,10 @@ View = (function() {
 
   View.prototype.show = function() {
     var rect;
+    if (this.stop_showing) {
+      this.stop_showing = false;
+      return;
+    }
     this.context.mark_range();
     if (!this.visible()) {
       this.$el.show();
@@ -572,12 +592,15 @@ View = (function() {
     }
   };
 
-  View.prototype.hide = function(time) {
+  View.prototype.hide = function(e, time) {
     var callback;
-    if (isNaN(time && this.visible())) {
+    if (!this.visible()) {
+      return;
+    }
+    if (isNaN(time)) {
       this.context.reset_rect();
       this.$el.hide();
-      return this.context.trigger('hidden');
+      return this.context.trigger('hidden', [e]);
     } else {
       callback = (function(_this) {
         return function() {
@@ -707,13 +730,32 @@ DEFAULT_CALLBACKS = {
     if (!query) {
       return li;
     }
-    regexp = new RegExp(">\\s*(\\w*)(" + query.replace("+", "\\+") + ")(\\w*)\\s*<", 'ig');
+    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 + ' <';
     });
   },
   before_insert: function(value, $li) {
     return value;
+  },
+  inserting_wrapper: function($inputor, content, suffix) {
+    var new_suffix, wrapped_content;
+    new_suffix = suffix === "" ? suffix : suffix || " ";
+    if ($inputor.is('textarea, input')) {
+      return '' + content + new_suffix;
+    } else if ($inputor.attr('contentEditable') === 'true') {
+      new_suffix = suffix === "" ? suffix : suffix || "&nbsp;";
+      if (/firefox/i.test(navigator.userAgent)) {
+        wrapped_content = "<span>" + content + new_suffix + "</span>";
+      } else {
+        suffix = "<span contenteditable='false'>" + new_suffix + "<span>";
+        wrapped_content = "<span contenteditable='false'>" + content + suffix + "</span>";
+      }
+      if (this.app.document.selection) {
+        wrapped_content = "<span contenteditable='true'>" + content + "</span>";
+      }
+      return wrapped_content;
+    }
   }
 };
 
@@ -724,36 +766,9 @@ Api = {
       return c.model.load(data);
     }
   },
-  getInsertedItemsWithIDs: function(at) {
-    var c, ids, items;
-    if (!(c = this.controller(at))) {
-      return [null, null];
-    }
-    if (at) {
-      at = "-" + (c.get_opt('alias') || c.at);
-    }
-    ids = [];
-    items = $.map(this.$inputor.find("span.atwho-view-flag" + (at || "")), function(item) {
-      var data;
-      data = $(item).data('atwho-data-item');
-      if (ids.indexOf(data.id) > -1) {
-        return;
-      }
-      if (data.id) {
-        ids.push = data.id;
-      }
-      return data;
-    });
-    return [ids, items];
-  },
-  getInsertedItems: function(at) {
-    return Api.getInsertedItemsWithIDs.apply(this, [at])[1];
-  },
-  getInsertedIDs: function(at) {
-    return Api.getInsertedItemsWithIDs.apply(this, [at])[0];
-  },
   setIframe: function(iframe) {
-    return this.setIframe(iframe);
+    this.setIframe(iframe);
+    return null;
   },
   run: function() {
     return this.dispatch();
@@ -764,18 +779,6 @@ Api = {
   }
 };
 
-Atwho = {
-  init: function(options) {
-    var $this, app;
-    app = ($this = $(this)).data("atwho");
-    if (!app) {
-      $this.data('atwho', (app = new App(this)));
-    }
-    app.reg(options.at, options);
-    return this;
-  }
-};
-
 $CONTAINER = $("<div id='atwho-container'></div>");
 
 $.fn.atwho = function(method) {
@@ -784,13 +787,14 @@ $.fn.atwho = function(method) {
   $('body').append($CONTAINER);
   result = null;
   this.filter('textarea, input, [contenteditable=true]').each(function() {
-    var app;
+    var $this, app;
+    if (!(app = ($this = $(this)).data("atwho"))) {
+      $this.data('atwho', (app = new App(this)));
+    }
     if (typeof method === 'object' || !method) {
-      return Atwho.init.apply(this, _args);
-    } else if (Api[method]) {
-      if (app = $(this).data('atwho')) {
-        return result = Api[method].apply(app, Array.prototype.slice.call(_args, 1));
-      }
+      return app.reg(method.at, method);
+    } else if (Api[method] && app) {
+      return result = Api[method].apply(app, Array.prototype.slice.call(_args, 1));
     } else {
       return $.error("Method " + method + " does not exist on jQuery.caret");
     }
@@ -803,9 +807,11 @@ $.fn.atwho["default"] = {
   alias: void 0,
   data: null,
   tpl: "<li data-value='${atwho-at}${name}'>${name}</li>",
-  insert_tpl: "<span>${atwho-data-value}</span>",
+  insert_tpl: "<span id='${id}'>${atwho-data-value}</span>",
   callbacks: DEFAULT_CALLBACKS,
   search_key: "name",
+  suffix: void 0,
+  hide_without_suffix: false,
   start_with_space: true,
   highlight_first: true,
   limit: 5,