jquery-atwho-rails 0.4.1 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee0d4a6e119e2f77127b810901f3572f95cf1d62
-  data.tar.gz: 02c7cea94f2a89ff6eff5ffdeb74eb57b3dc1c64
+  metadata.gz: d2dd59a48f6a65bb4ecd8be26f8375c12aae7c0b
+  data.tar.gz: 7663cd82b31f3989bfa58fbc785cceaebff87e81
 SHA512:
-  metadata.gz: 37fb91bd4a88c5dae9c152eda4cedf20be7270b3a567581e51e510f791b4c44cae23c53a42c502a1342f8f89ff13b67a3a035780689b3e28caf20a4a56e2e64e
-  data.tar.gz: b65c453e756f540f774b5cc32e6d9ef9b9c402852fbb3528432c1f2ada50a89ef154e648552a36d0bb2204144cd5855ecd8b42519f75f89f573d4880c75c8f89
+  metadata.gz: c4ba905d140575cf2c20de6d3bbf625fee4defdc2c0d97b4d9ebb05466f0fffba8bcbd62730daa98f79c57a556facc79d25bb2f7b07f23d9f08a3720839e3edd
+  data.tar.gz: 3116c072145617a20e6ee19797dc1a07cb9e9ab02749543d5f8a7d2ab1df809c8f2c32a6b1774dd5e73d0c47685525f020ff5e4942f147f2bcb0484ddd16bf37

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

@@ -24,8 +24,7 @@
     }
   })(function($) {
     "use strict";
-    var EditableCaret, InputCaret, Mirror, Utils, methods, pluginName;
-
+    var EditableCaret, InputCaret, Mirror, Utils, methods, oDocument, oFrame, oWindow, pluginName;
     pluginName = 'caret';
     EditableCaret = (function() {
       function EditableCaret($inputor) {
@@ -47,9 +46,8 @@
 
       EditableCaret.prototype.getOldIEPos = function() {
         var preCaretTextRange, textRange;
-
-        textRange = document.selection.createRange();
-        preCaretTextRange = document.body.createTextRange();
+        textRange = oDocument.selection.createRange();
+        preCaretTextRange = oDocument.body.createTextRange();
         preCaretTextRange.moveToElementText(this.domInputor);
         preCaretTextRange.setEndPoint("EndToEnd", textRange);
         return preCaretTextRange.text.length;
@@ -57,7 +55,6 @@
 
       EditableCaret.prototype.getPos = function() {
         var clonedRange, pos, range;
-
         if (range = this.range()) {
           clonedRange = range.cloneRange();
           clonedRange.selectNodeContents(this.domInputor);
@@ -65,15 +62,14 @@
           pos = clonedRange.toString().length;
           clonedRange.detach();
           return pos;
-        } else if (document.selection) {
+        } else if (oDocument.selection) {
           return this.getOldIEPos();
         }
       };
 
       EditableCaret.prototype.getOldIEOffset = function() {
         var range, rect;
-
-        range = document.selection.createRange().duplicate();
+        range = oDocument.selection.createRange().duplicate();
         range.moveStart("character", -1);
         rect = range.getBoundingClientRect();
         return {
@@ -85,9 +81,7 @@
 
       EditableCaret.prototype.getOffset = function(pos) {
         var clonedRange, offset, range, rect;
-
-        offset = null;
-        if (window.getSelection && (range = this.range())) {
+        if (oWindow.getSelection && (range = this.range())) {
           if (range.endOffset - 1 < 0) {
             return null;
           }
@@ -101,20 +95,22 @@
             top: rect.top
           };
           clonedRange.detach();
-          offset;
-        } else if (document.selection) {
-          this.getOldIEOffset();
+        } else if (oDocument.selection) {
+          offset = this.getOldIEOffset();
+        }
+        if (offset && !oFrame) {
+          offset.top += $(oWindow).scrollTop();
+          offset.left += $(oWindow).scrollLeft();
         }
-        return Utils.adjustOffset(offset, this.$inputor);
+        return offset;
       };
 
       EditableCaret.prototype.range = function() {
         var sel;
-
-        if (!window.getSelection) {
+        if (!oWindow.getSelection) {
           return;
         }
-        sel = window.getSelection();
+        sel = oWindow.getSelection();
         if (sel.rangeCount > 0) {
           return sel.getRangeAt(0);
         } else {
@@ -133,9 +129,8 @@
 
       InputCaret.prototype.getIEPos = function() {
         var endRange, inputor, len, normalizedValue, pos, range, textInputRange;
-
         inputor = this.domInputor;
-        range = document.selection.createRange();
+        range = oDocument.selection.createRange();
         pos = 0;
         if (range && range.parentElement() === inputor) {
           normalizedValue = inputor.value.replace(/\r\n/g, "\n");
@@ -154,7 +149,7 @@
       };
 
       InputCaret.prototype.getPos = function() {
-        if (document.selection) {
+        if (oDocument.selection) {
           return this.getIEPos();
         } else {
           return this.domInputor.selectionStart;
@@ -163,9 +158,8 @@
 
       InputCaret.prototype.setPos = function(pos) {
         var inputor, range;
-
         inputor = this.domInputor;
-        if (document.selection) {
+        if (oDocument.selection) {
           range = inputor.createTextRange();
           range.move("character", pos);
           range.select();
@@ -176,15 +170,10 @@
       };
 
       InputCaret.prototype.getIEOffset = function(pos) {
-        var h, range, textRange, x, y;
-
+        var h, textRange, x, y;
         textRange = this.domInputor.createTextRange();
-        if (pos) {
-          textRange.move('character', pos);
-        } else {
-          range = document.selection.createRange();
-          textRange.moveToBookmark(range.getBookmark());
-        }
+        pos || (pos = this.getPos());
+        textRange.move('character', pos);
         x = textRange.boundingLeft;
         y = textRange.boundingTop;
         h = textRange.boundingHeight;
@@ -197,16 +186,18 @@
 
       InputCaret.prototype.getOffset = function(pos) {
         var $inputor, offset, position;
-
         $inputor = this.$inputor;
-        if (document.selection) {
-          return Utils.adjustOffset(this.getIEOffset(pos), $inputor);
+        if (oDocument.selection) {
+          offset = this.getIEOffset(pos);
+          offset.top += $(oWindow).scrollTop() + $inputor.scrollTop();
+          offset.left += $(oWindow).scrollLeft() + $inputor.scrollLeft();
+          return offset;
         } else {
           offset = $inputor.offset();
           position = this.getPosition(pos);
           return offset = {
-            left: offset.left + position.left,
-            top: offset.top + position.top,
+            left: offset.left + position.left - $inputor.scrollLeft(),
+            top: offset.top + position.top - $inputor.scrollTop(),
             height: position.height
           };
         }
@@ -214,7 +205,6 @@
 
       InputCaret.prototype.getPosition = function(pos) {
         var $inputor, at_rect, format, html, mirror, start_range;
-
         $inputor = this.$inputor;
         format = function(value) {
           return value.replace(/</g, '&lt').replace(/>/g, '&gt').replace(/`/g, '&#96').replace(/"/g, '&quot').replace(/\r\n|\r|\n/g, "<br />");
@@ -231,7 +221,6 @@
 
       InputCaret.prototype.getIEPosition = function(pos) {
         var h, inputorOffset, offset, x, y;
-
         offset = this.getIEOffset(pos);
         inputorOffset = this.$inputor.offset();
         x = offset.left - inputorOffset.left;
@@ -257,7 +246,6 @@
       Mirror.prototype.mirrorCss = function() {
         var css,
           _this = this;
-
         css = {
           position: 'absolute',
           left: -9999,
@@ -281,7 +269,6 @@
 
       Mirror.prototype.rect = function() {
         var $flag, pos, rect;
-
         $flag = this.$mirror.find("#caret");
         pos = $flag.position();
         rect = {
@@ -297,14 +284,6 @@
 
     })();
     Utils = {
-      adjustOffset: function(offset, $inputor) {
-        if (!offset) {
-          return;
-        }
-        offset.top += $(window).scrollTop() + $inputor.scrollTop();
-        offset.left += +$(window).scrollLeft() + $inputor.scrollLeft();
-        return offset;
-      },
       contentEditable: function($inputor) {
         return !!($inputor[0].contentEditable && $inputor[0].contentEditable === 'true');
       }
@@ -318,19 +297,31 @@
         }
       },
       position: function(pos) {
-        if (document.selection) {
+        if (oDocument.selection) {
           return this.getIEPosition(pos);
         } else {
           return this.getPosition(pos);
         }
       },
       offset: function(pos) {
-        return this.getOffset(pos);
+        var iOffset, offset;
+        offset = this.getOffset(pos);
+        if (oFrame) {
+          iOffset = $(oFrame).offset();
+          offset.top += iOffset.top;
+          offset.left += iOffset.left;
+        }
+        return offset;
       }
     };
+    oDocument = null;
+    oWindow = null;
+    oFrame = null;
     $.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]) {
         return methods[method].apply(caret, Array.prototype.slice.call(arguments, 1));
@@ -372,12 +363,13 @@
       function App(inputor) {
         this.current_flag = null;
         this.controllers = {};
+        this.alias_maps = {};
         this.$inputor = $(inputor);
         this.listen();
       }
 
       App.prototype.controller = function(at) {
-        return this.controllers[at || this.current_flag];
+        return this.controllers[this.alias_maps[at] || at || this.current_flag];
       };
 
       App.prototype.set_context_for = function(at) {
@@ -389,7 +381,7 @@
         var controller, _base;
         controller = (_base = this.controllers)[flag] || (_base[flag] = new Controller(this, flag));
         if (setting.alias) {
-          this.controllers[setting.alias] = controller;
+          this.alias_maps[setting.alias] = flag;
         }
         controller.init(setting);
         return this;
@@ -487,6 +479,8 @@
         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.setting = null;
         this.query = null;
@@ -587,7 +581,8 @@
       };
 
       Controller.prototype.mark_range = function() {
-        return this.range = this.get_range() || this.get_ie_range();
+        this.range = this.get_range();
+        return this.ie_range = this.get_ie_range();
       };
 
       Controller.prototype.clear_range = function() {
@@ -595,11 +590,11 @@
       };
 
       Controller.prototype.get_range = function() {
-        return this.range || (window.getSelection ? window.getSelection().getRangeAt(0) : void 0);
+        return this.range || (this.oWindow.getSelection ? this.oWindow.getSelection().getRangeAt(0) : void 0);
       };
 
       Controller.prototype.get_ie_range = function() {
-        return this.range || (document.selection ? document.selection.createRange() : void 0);
+        return this.ie_range || (this.oDocument.selection ? this.oDocument.selection.createRange() : void 0);
       };
 
       Controller.prototype.insert_content_for = function($li) {
@@ -624,7 +619,7 @@
           content_node = "" + content + "<span contenteditable='false'>&nbsp;<span>";
           insert_node = "<span contenteditable='false' class='" + class_name + "'>" + content_node + "</span>";
           $insert_node = $(insert_node).data('atwho-data-item', $li.data('item-data'));
-          if (document.selection) {
+          if (this.oDocument.selection) {
             $insert_node = $("<span contenteditable='true'></span>").html($insert_node);
           }
         }
@@ -642,12 +637,12 @@
           range.deleteContents();
           range.insertNode($insert_node[0]);
           range.collapse(false);
-          sel = window.getSelection();
+          sel = this.oWindow.getSelection();
           sel.removeAllRanges();
           sel.addRange(range);
         } else if (range = this.get_ie_range()) {
           range.moveStart('character', this.query.end_pos - this.query.head_pos - this.at.length);
-          range.pasteHTML($insert_node[0]);
+          range.pasteHTML(content_node);
           range.collapse(false);
           range.select();
         }
@@ -682,13 +677,11 @@
 
     })();
     Model = (function() {
-      var _storage;
-
-      _storage = {};
 
       function Model(context) {
         this.context = context;
         this.at = this.context.at;
+        this.storage = this.context.$inputor;
       }
 
       Model.prototype.saved = function() {
@@ -696,21 +689,24 @@
       };
 
       Model.prototype.query = function(query, callback) {
-        var data, search_key, _ref;
+        var data, search_key, _remote_filter;
         data = this.fetch();
         search_key = this.context.get_opt("search_key");
-        callback(data = this.context.callbacks('filter').call(this.context, query, data, search_key));
-        if (!(data && data.length > 0)) {
-          return (_ref = this.context.callbacks('remote_filter')) != null ? _ref.call(this.context, query, callback) : void 0;
+        data = this.context.callbacks('filter').call(this.context, query, data, search_key) || [];
+        _remote_filter = this.context.callbacks('remote_filter');
+        if (data.length > 0 || (!_remote_filter && data.length === 0)) {
+          return callback(data);
+        } else {
+          return _remote_filter.call(this.context, query, callback);
         }
       };
 
       Model.prototype.fetch = function() {
-        return _storage[this.at] || [];
+        return this.storage.data(this.at) || [];
       };
 
       Model.prototype.save = function(data) {
-        return _storage[this.at] = this.context.callbacks("before_save").call(this.context, data || []);
+        return this.storage.data(this.at, this.context.callbacks("before_save").call(this.context, data || []));
       };
 
       Model.prototype.load = function(data) {
@@ -848,7 +844,7 @@
 
       View.prototype.render = function(list) {
         var $li, $ul, item, li, tpl, _i, _len;
-        if (!$.isArray(list || list.length <= 0)) {
+        if (!($.isArray(list) && list.length > 0)) {
           this.hide();
           return;
         }

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

@@ -1,7 +1,7 @@
 module Jquery
   module Atwho
     module Rails
-      VERSION = "0.4.1"
+      VERSION = "0.4.5"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-atwho-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.5
 platform: ruby
 authors:
 - ichord
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-28 00:00:00.000000000 Z
+date: 2014-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec