recordselect 3.2.10 → 3.2.11

data/app/assets/javascripts/jquery/record_select.js

@@ -213,6 +213,8 @@ RecordSelect.Abstract = Class.extend({
     if (this.is_open()) return;
     var _this = this;
     jQuery.rails.fire(_this.obj, 'rs:before');
+    _this.container.html('');
+    _this.container.show();
     jQuery.ajax({
       url: this.url,
       //type: "POST",
@@ -220,8 +222,11 @@ RecordSelect.Abstract = Class.extend({
       //dataType: options.ajax_data_type,
       success: function(data){
         _this.container.html(data);
-        _this.show();
-        jQuery(document.body).mousedown(jQuery.proxy(_this, "onbodyclick"));
+        if (!_this.container.is(':visible')) _this.close();
+        else {
+          _this.show();
+          jQuery(document.body).mousedown(jQuery.proxy(_this, "onbodyclick"));
+        }
       }
     });
   },
@@ -233,9 +238,13 @@ RecordSelect.Abstract = Class.extend({
     var offset = this.obj.offset(), top = this.obj.height() + offset.top;
     this.container.show();
     this.container.css('left', offset.left);
-    if (top + this.container.height() > jQuery(window).height())
+    if (top + this.container.height() > jQuery(window).height()) {
       this.container.css('bottom', jQuery(window).height() - offset.top);
-    else this.container.css('top', top);
+      this.container.css('top', '');
+    } else {
+      this.container.css('top', top);
+      this.container.css('bottom', '');
+    }
 
     if (this._use_iframe_mask()) {
       this.container.after('<iframe src="javascript:false;" class="record-select-mask" />');
@@ -355,7 +364,8 @@ jQuery.extend(RecordSelect.Abstract.prototype, {
         elem = this.container.find('li.pagination.previous');
         if (elem) elem.find('a').click();
         break;
-      case 27, 9: // Event.KEY_ESC, Event.KEY_TAB
+      case 27: // Event.KEY_ESC
+      case 9: // Event.KEY_TAB
         this.close();
         break;
       default:

data/app/assets/javascripts/prototype/record_select.js

@@ -94,14 +94,19 @@ Object.extend(RecordSelect.Abstract.prototype, {
   open: function() {
     if (this.is_open()) return;
 
+    this.container.update('');
+    this.container.show();
     new Ajax.Updater(this.container, this.url, {
       method: 'get',
       evalScripts: true,
       asynchronous: true,
       onComplete: function() {
-        this.show();
         // needs to be mousedown so the event doesn't get canceled by other code (see issue #26)
-        Element.observe(document.body, 'mousedown', this.onbodyclick.bindAsEventListener(this));
+        if (!this.container.visible()) this.close();
+        else {
+          this.show();
+          Element.observe(document.body, 'mousedown', this.onbodyclick.bindAsEventListener(this));
+        }
       }.bind(this)
     });
   },
@@ -114,9 +119,13 @@ Object.extend(RecordSelect.Abstract.prototype, {
         top = Element.getHeight(this.obj) + offset[1],
         window_height = document.viewport.getHeight();
     this.container.style.left = offset[0] + 'px';
-    if (top + Element.getHeight(this.container) > window_height)
+    if (top + Element.getHeight(this.container) > window_height) {
       this.container.style.bottom = (window_height - offset[1]) + 'px';
-    else this.container.style.top = top + 'px';
+      this.container.style.top = '';
+    } else {
+      this.container.style.top = top + 'px';
+      this.container.style.bottom = '';
+    }
 
     if (this._use_iframe_mask()) {
       this.container.insertAdjacentHTML('afterEnd', '<iframe src="javascript:false;" class="record-select-mask" />');
@@ -236,7 +245,8 @@ Object.extend(RecordSelect.Abstract.prototype, {
         elem = this.container.down('li.pagination.previous');
         if (elem) elem.down('a').onclick();
         break;
-      case Event.KEY_ESC, Event.KEY_TAB:
+      case Event.KEY_ESC:
+      case Event.KEY_TAB:
         this.close();
         break;
       default:

data/lib/record_select/version.rb

@@ -2,7 +2,7 @@ module RecordSelect
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 10
+    PATCH = 11
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: recordselect
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 3
   - 2
-  - 10
-  version: 3.2.10
+  - 11
+  version: 3.2.11
 platform: ruby
 authors: 
 - Sergio Cambra
@@ -17,11 +17,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-04 00:00:00 Z
+date: 2013-07-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +31,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id001
-  prerelease: false
+  requirement: *id001
   name: shoulda
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -46,12 +47,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id002
-  prerelease: false
+  requirement: *id002
   name: bundler
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,8 +63,7 @@ dependencies:
         - 1
         - 3
         version: 3.1.3
-  version_requirements: *id003
-  prerelease: false
+  requirement: *id003
   name: rails
 description: RecordSelect is a Rails widget to help you pick one record out of many. I designed it as a more usable and performant alternative to generating a massive dropdown list
 email: activescaffold@googlegroups.com