jquery-atwho-rails 0.2.1 → 0.2.2

data/changelog.md

@@ -1,2 +1,3 @@
+* 2013.3.1 - v0.2.2 fix some bugs.
 * 2013.1.24 updated to v0.2.0.
 * 2012.7.1 remove the mirror(copy) element of the textarea(inputor) which will disturb css style. increase timeout of displaying the result list view.

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

@@ -20,7 +20,7 @@
     var Controller, DEFAULT_CALLBACKS, DEFAULT_TPL, KEY_CODE, Mirror, View;
     Mirror = (function() {
 
-      Mirror.prototype.css_attr = ["overflowY", "height", "width", "paddingTop", "paddingLeft", "paddingRight", "paddingBottom", "marginTop", "marginLeft", "marginRight", "marginBottom", 'fontFamily', 'borderStyle', 'borderWidth', 'wordWrap', 'fontSize', 'lineHeight', 'overflowX'];
+      Mirror.prototype.css_attr = ["overflowY", "height", "width", "paddingTop", "paddingLeft", "paddingRight", "paddingBottom", "marginTop", "marginLeft", "marginRight", "marginBottom", "fontFamily", "borderStyle", "borderWidth", "wordWrap", "fontSize", "lineHeight", "overflowX", "text-align"];
 
       function Mirror($inputor) {
         this.$inputor = $inputor;
@@ -75,6 +75,9 @@
     };
     DEFAULT_CALLBACKS = {
       data_refactor: function(data) {
+        if (!$.isArray(data)) {
+          return data;
+        }
         return $.map(data, function(item, k) {
           if (!$.isPlainObject(item)) {
             item = {
@@ -115,8 +118,9 @@
       sorter: function(query, items, search_key) {
         var item, results, text, _i, _len;
         if (!query) {
-          items;
-
+          return items.sort(function(a, b) {
+            return a[search_key].toLowerCase() > b[search_key].toLowerCase();
+          });
         }
         results = [];
         for (_i = 0, _len = items.length; _i < _len; _i++) {
@@ -187,11 +191,7 @@
         current_settings = {};
         current_settings = $.isPlainObject(flag) ? this.common_settings = $.extend({}, this.common_settings, flag) : !this.settings[flag] ? this.settings[flag] = $.extend({}, settings) : this.settings[flag] = $.extend({}, this.settings[flag], settings);
         data = current_settings["data"];
-        if (typeof data === "string") {
-          current_settings["data"] = data;
-        } else if (data) {
-          current_settings["data"] = this.callbacks("data_refactor").call(this, data);
-        }
+        current_settings["data"] = this.callbacks("data_refactor").call(this, data);
         return this;
       };
 
@@ -373,21 +373,33 @@
         return this.view.render(data);
       };
 
+      Controller.prototype.remote_call = function(data, query) {
+        var params, _callback;
+        params = {
+          q: query.text,
+          limit: this.get_opt("limit")
+        };
+        _callback = function(data) {
+          this.reg(this.current_flag, {
+            data: data
+          });
+          return this.render_view(this.data());
+        };
+        _callback = $.proxy(_callback, this);
+        return this.callbacks('remote_filter').call(this, params, data, _callback);
+      };
+
       Controller.prototype.look_up = function() {
-        var data, origin_data, params, query, search_key;
+        var data, query, search_key;
         query = this.catch_query();
         if (!query) {
           return false;
         }
-        origin_data = this.get_opt("data");
+        data = this.data();
         search_key = this.get_opt("search_key");
-        if (typeof origin_data === "string") {
-          params = {
-            q: query.text,
-            limit: this.get_opt("limit")
-          };
-          this.callbacks('remote_filter').call(this, params, origin_data, $.proxy(this.render_view, this));
-        } else if ((data = this.callbacks('filter').call(this, query.text, origin_data, search_key))) {
+        if (typeof data === "string") {
+          this.remote_call(data, query);
+        } else if ((data = this.callbacks('filter').call(this, query.text, data, search_key))) {
           this.render_view(data);
         } else {
           this.view.hide();

data/lib/jquery-atwho-rails.rb

@@ -1,5 +1,5 @@
 require "jquery-atwho-rails/version"
-require "ActiveSupport"
+require "active_support"
 
 module Jquery
   module Atwho

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

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = "0.2.1"
+      VERSION = "0.2.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery-atwho-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3411578706402898122
+      hash: -2700002809925972358
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3411578706402898122
+      hash: -2700002809925972358
 requirements: []
 rubyforge_project: jquery-atwho-rails
 rubygems_version: 1.8.24