update to v1.1.0

close #17

Author: ichord

.gitignore

@@ -5,3 +5,4 @@ pkg/*
 *.swp
 tmp/*
 build/*
+bower_components/

Rakefile

@@ -2,28 +2,18 @@ require 'rubygems'
 require 'bundler/setup'
 require "bundler/gem_tasks"
 
-at_dir = "tmp/At.js"
-bower_dir = "#{at_dir}/bower_components/"
+bower_dir = "bower_components/"
 
 desc "sync from At.js"
 task :sync do
-  puts " * syncing..."
-  FileUtils.mkdir_p("tmp") unless Dir.exist? "tmp"
-  unless Dir.exist? at_dir
-    system "git clone git://github.com/ichord/At.js.git #{at_dir}"
-  else
-    Dir.chdir(at_dir) { puts %x{git pull -X theirs} }
-  end
-  Dir.chdir(at_dir) {
-    puts "* bower install..."
-    puts %x{bower install}
-  }
+  puts "* bower install..."
+  puts %x{bower install}
 end
 
 desc "copy assets"
-task fresh: :sync do
+task refresh: :sync do
   puts " * Copying..."
-  source_dir = "tmp/At.js/dist"
+  source_dir = "bower_components/At.js/dist"
   dist_dir = "lib/assets"
 
   js_dist_dir = "#{dist_dir}/javascripts/jquery.atwho/"

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

@@ -1,13 +1,13 @@
-/*! jquery.atwho - v1.0.1 %>
+/*! jquery.atwho - v1.1.0 %>
 * Copyright (c) 2015 chord.luo <chord.luo@gmail.com>;
 * homepage: http://ichord.github.com/At.js
 * Licensed MIT
 */
 (function (root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(["jquery"], function ($) {
-      return (root.returnExportsGlobal = factory($));
+    define(["jquery"], function (jquery) {
+      return (root.returnExportsGlobal = factory(jquery));
     });
   } else if (typeof exports === 'object') {
     // Node. Does not work with strict CommonJS, but
@@ -17,7 +17,7 @@
   } else {
     factory(jQuery);
   }
-}(this, function ($) {
+}(this, function (jquery) {
 
 var Api, App, Controller, DEFAULT_CALLBACKS, EditableController, KEY_CODE, Model, TextareaController, View,
   __slice = [].slice,
@@ -35,13 +35,15 @@ App = (function() {
   }
 
   App.prototype.createContainer = function(doc) {
-    if ((this.$el = $("#atwho-container", doc)).length === 0) {
-      return $(doc.body).append(this.$el = $("<div id='atwho-container'></div>"));
+    var _ref;
+    if ((_ref = this.$el) != null) {
+      _ref.remove();
     }
+    return $(doc.body).append(this.$el = $("<div class='atwho-container'></div>"));
   };
 
   App.prototype.setupRootElement = function(iframe, asRoot) {
-    var error, _ref;
+    var error;
     if (asRoot == null) {
       asRoot = false;
     }
@@ -57,17 +59,10 @@ App = (function() {
       } catch (_error) {
         error = _error;
         this.iframe = null;
-        throw new Error("iframe auto-discovery is failed.\nPlease use `serIframe` to set the target iframe manually.");
-      }
-    }
-    if (this.iframeAsRoot = asRoot) {
-      if ((_ref = this.$el) != null) {
-        _ref.remove();
+        throw new Error("iframe auto-discovery is failed.\nPlease use `setIframe` to set the target iframe manually.");
       }
-      return this.createContainer(this.document);
-    } else {
-      return this.createContainer(document);
     }
+    return this.createContainer((this.iframeAsRoot = asRoot) ? this.document : document);
   };
 
   App.prototype.controller = function(at) {
@@ -107,7 +102,19 @@ App = (function() {
   };
 
   App.prototype.listen = function() {
-    return this.$inputor.on('keyup.atwhoInner', (function(_this) {
+    return this.$inputor.on('compositionstart', (function(_this) {
+      return function(e) {
+        var _ref;
+        if ((_ref = _this.controller()) != null) {
+          _ref.view.hide();
+        }
+        return _this.isComposing = true;
+      };
+    })(this)).on('compositionend', (function(_this) {
+      return function(e) {
+        return _this.isComposing = false;
+      };
+    })(this)).on('keyup.atwhoInner', (function(_this) {
       return function(e) {
         return _this.onKeyup(e);
       };
@@ -226,9 +233,13 @@ App = (function() {
         break;
       case KEY_CODE.TAB:
       case KEY_CODE.ENTER:
+      case KEY_CODE.SPACE:
         if (!view.visible()) {
           return;
         }
+        if (!this.controller().getOpt('spaceSelectsMatch') && e.keyCode === KEY_CODE.SPACE) {
+          return;
+        }
         e.preventDefault();
         view.choose(e);
         break;
@@ -501,6 +512,9 @@ EditableController = (function(_super) {
 
   EditableController.prototype.catchQuery = function(e) {
     var $inserted, $query, index, inserted, lastNode, matched, offset, query, range, _range;
+    if (this.app.isComposing) {
+      return;
+    }
     if (!(range = this._getRange())) {
       return;
     }
@@ -544,7 +558,8 @@ EditableController = (function(_super) {
     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) {
       range.setStart(range.startContainer, index);
-      range.surroundContents(($query = $("<span class='atwho-query'/>", this.app.document))[0]);
+      $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);
@@ -560,18 +575,21 @@ EditableController = (function(_super) {
         el: $query
       };
       this.trigger("matched", [this.at, query.text]);
+      return this.query = query;
     } else {
       this.view.hide();
-      query = null;
+      this.query = {
+        el: $query
+      };
       if ($query.text().indexOf(this.at) >= 0) {
         if (this._movingEvent(e) && $query.hasClass('atwho-inserted')) {
           $query.removeClass('atwho-query');
         } else if (false !== this.callbacks('afterMatchFailed').call(this, this.at, $query)) {
           this._setRange("after", this._unwrap($query.text($query.text()).contents().first()));
         }
       }
+      return null;
     }
-    return this.query = query;
   };
 
   EditableController.prototype.rect = function() {
@@ -847,7 +865,8 @@ KEY_CODE = {
   UP: 38,
   RIGHT: 39,
   DOWN: 40,
-  BACKSPACE: 8
+  BACKSPACE: 8,
+  SPACE: 32
 };
 
 DEFAULT_CALLBACKS = {
@@ -862,7 +881,7 @@ DEFAULT_CALLBACKS = {
     }
     _a = decodeURI("%C3%80");
     _y = decodeURI("%C3%BF");
-    regexp = new RegExp("" + flag + "([A-Za-z" + _a + "-" + _y + "0-9_\+\-]*)$|" + flag + "([^\\x00-\\xff]*)$", 'gi');
+    regexp = new RegExp("" + flag + "([A-Za-z" + _a + "-" + _y + "0-9_\.\+\-]*)$|" + flag + "([^\\x00-\\xff]*)$", 'gi');
     match = regexp.exec(subtext);
     if (match) {
       return match[2] || match[1];
@@ -900,9 +919,13 @@ DEFAULT_CALLBACKS = {
     });
   },
   tplEval: function(tpl, map) {
-    var error;
+    var error, template;
+    template = tpl;
     try {
-      return tpl.replace(/\$\{([^\}]*)\}/g, function(tag, key, pos) {
+      if (typeof tpl !== 'string') {
+        template = tpl(map);
+      }
+      return template.replace(/\$\{([^\}]*)\}/g, function(tag, key, pos) {
         return map[key];
       });
     } catch (_error) {
@@ -988,7 +1011,9 @@ $.fn.atwho["default"] = {
   limit: 5,
   maxLen: 20,
   displayTimeout: 300,
-  delay: null
+  delay: null,
+  spaceSelectsMatch: false,
+  editableAtwhoQueryAttrs: {}
 };
 
 

lib/jquery-atwho-rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = '1.0.1'
+      VERSION = '1.1.0'
     end
   end
 end