jquery-atwho-rails 0.1.1 → 0.1.2

data/README.md

@@ -4,7 +4,7 @@ bind your textarea
 
 ```javascript
 data = ['tom','john'];
-$('textarea').atwho({'debug':true,'data':data});
+$('textarea').atwho("@",{'debug':true,'data':data});
 ```
 
 that's it, check it out!

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

@@ -40,8 +40,6 @@
                 left: 0,
                 top:0, 
                 zIndex: -20000,
-                'word-wrap':'break-word',
-                /* wrap long line as textarea do. not work in ie < 8 */
                 'white-space':'pre-wrap'
             }
             $.each(this.css,function(i,p){
@@ -74,10 +72,14 @@
         flags:{},
         theflag:null,
         options:{},
+        search_word:{},
         searchWord:function() {
-            // just used in At.watchWithData 
+            // just used in At.watchWithData
+            search_word = this.search_word[this.theflag];
+            if (search_word)
+                return search_word;
             var match = /data-keyname=['?]\$\{(\w+)\}/g.exec(this.getOpt('tpl'));
-            return !_isNil(match) ? match[1] : null;
+            return this.search_word[this.theflag] = !_isNil(match) ? match[1] : null;
         },
         getOpt: function(key) {
             var flag = this.theflag;
@@ -90,6 +92,15 @@
         /* @ offset*/
         offset: function() {
             $inputor = this.$inputor;
+
+            if (document.selection) {// IE!!! 
+                var Sel = document.selection.createRange();
+                x = Sel.boundingLeft + $inputor.scrollLeft();
+                y = Sel.boundingTop + Sel.boundingHeight 
+                    + $(window).scrollTop() + $inputor.scrollTop();
+                return {'top':y,'left':x};
+            }
+
             mirror = $inputor.data("mirror");
             if (_isNil(mirror)) {
                 mirror = new Mirror($inputor);
@@ -107,10 +118,6 @@
                     .replace(/>/g, '&gt;')
                     .replace(/`/g,'&#96;')
                     .replace(/"/g,'&quot;');
-                if ($.browser.msie) {
-                    rep_str = parseInt($.browser.version) < 8 ? "&nbsp;" : "<span> </span>"
-                    value = value.replace(/ /g,rep_str);
-                }
                 return value.replace(/\r\n|\r|\n/g,"<br />");
             } 
             /* 克隆完inputor后将原来的文本内容根据
@@ -136,10 +143,9 @@
             //FIXME: -$(window).scrollTop() get "wrong" offset.
             // but is good for $inputor.scrollTop();
             // jquey 1. + 07.1 fixed the scrollTop problem!?
-            y = offset.top + at_pos.top + line_height
-                - $inputor.scrollTop();
+            y = offset.top + at_pos.top + line_height - $inputor.scrollTop();
             x = offset.left + at_pos.left - $inputor.scrollLeft();
-
+            
             return {'top':y,'left':x};
         },
         cache: function(key,value) {
@@ -303,7 +309,12 @@
                 items = $.map(data,function(item,i) {
                     //support plain object also
                     var name = $.isPlainObject(item) ? item[self.searchWord()] : item;
-                    match = name.match((new RegExp(key.text.replace("+","\\+"),"i")));
+                    try {
+                        match = name.match((new RegExp(key.text.replace("+","\\+"),"i")));    
+                    } catch(e) {
+                        _log("watchWithData.error",e);
+                        return null;
+                    }
                     return match ? item : null;
                 });
             }
@@ -555,7 +566,8 @@
     }
     $.fn.caretPos = function(pos) {
         var inputor = this[0];
-        if (pos) {
+        inputor.focus();
+       if (pos) {
             return setCaretPos(inputor,pos);
         } else {
             return getCaretPos(inputor);

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

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

metadata

@@ -1,60 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jquery-atwho-rails
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+version: !ruby/object:Gem::Version
+  version: 0.1.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - ichord
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-19 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: generator_spec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: |-
-  This is a jQuery plugin 
-      that implement Twitter/Weibo like @ mentions.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ! "This is a jQuery plugin \n    that implement Twitter/Weibo like @
+  mentions."
+email:
 - chord.luo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.md
@@ -67,38 +63,30 @@ files:
 - lib/jquery-atwho-rails/version.rb
 - spec/generators/install_generator_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://ichord.github.com/jquery-atwho-rails
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: jquery-atwho-rails
-rubygems_version: 1.3.7
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
-summary: "jquery plugin: @mentions"
-test_files: 
+summary: ! 'jquery plugin: @mentions'
+test_files:
 - spec/generators/install_generator_spec.rb
 - spec/spec_helper.rb