olay-rails 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: d922b625d2399db9fd9bc1b07fe3961000174b0baf3e59a7b45a1c75970a9e67be5a79054f086c6383d2225b67276933e54c37173d582a16c7a35c19a95b135a
-  metadata.gz: 67f7e9b7f7cef9e074b5c1c89e256874cb642a8fc01d85a1e936a40e9a749b3a8313c26acfcbea55ad30bbd66ecdbd665405065f531ab3cbdf00e541470ec9c4
+  data.tar.gz: 5b642a78813dbad0b298734f7ee2d19e6ed7cb5590dc819d098f3dbd03834e92de05e999e5266e0a2a6c90ea68f9c18e5859b5cc21aadb46378a831118a62b85
+  metadata.gz: c81b19768914cdcf0dfe1abb7ce806b37804b1f10c389bd59015d9a4602e49e8c631645f5fac30c377e2b452f4321944d7a009342c8735f46ddee5bad9489a1e
 SHA1: 
-  data.tar.gz: 9e1869334061f37dcd966ecb4dd2bec62f1273f7
-  metadata.gz: e0f758ec192a8b16e759de4a89a230264fcc4626
+  data.tar.gz: 7a8c03371b6f7a35e301f3db345170309781dc23
+  metadata.gz: 854ad8f089a4b6757cf8ff9ed0efbd06aa99f477

data/lib/olay/rails/version.rb

@@ -1,6 +1,6 @@
 module Olay
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
   module Rails
-    VERSION = '0.1.6'
+    VERSION = '0.1.7'
   end
 end

data/vendor/assets/javascripts/olay.js

@@ -4,6 +4,13 @@
   // Store a local reference to jQuery.
   var $ = window.jQuery;
 
+  // This private function will be used to stop event propagation in $content.
+  var stopPropagation = function (ev) { ev.stopPropagation(); };
+
+  // Selector for tabbable elements.
+  var tabbable = 'a[href], area[href], :input, iframe, object, embed, ' +
+    '*[tabindex], *[contenteditable]';
+
   // Listen for keydown events.
   $(document).keydown(function (ev) {
     var $olay = $('.js-olay-container').last();
@@ -14,19 +21,8 @@
     for (var i = 0, l = keys.length; i < l; ++i) {
       if (which === keys[i]) return olay.hide() && false;
     }
-    if (which === 9) {
-      setTimeout(function () {
-        if (!$olay.find(':focus').length) {
-          $(':focus').blur();
-          $olay.find(':input').first().focus();
-        }
-      }, 0);
-    }
   });
 
-  // This private function will be used to stop event propagation in $content.
-  var stopPropagation = function (ev) { ev.stopPropagation(); };
-
   // Create the `Olay` constructor.
   //
   // ```js
@@ -151,6 +147,12 @@
         $olays.length && active === $body[0] ?
         $olays.last() :
         $(active);
+      $(tabbable).each(function () {
+        var $t = $(this);
+        if ('olayTabindex' in $t.data()) return;
+        $t.data('olayTabindex', $t.attr('tabindex') || null)
+          .attr('tabindex', -1);
+      });
       $body.addClass('js-olay-visible').append(this.$container);
       this.$content.attr('tabindex', 0).focus().removeAttr('tabindex');
       return this;
@@ -161,7 +163,12 @@
       this.$container.detach();
       this._$active.attr('tabindex', 0).focus().removeAttr('tabindex');
       var $olays = $('.js-olay-container');
-      if (!$olays.length) $('body').removeClass('js-olay-visible');
+      ($olays.length ? $olays.last() : $('body').removeClass('js-olay-visible'))
+        .find(tabbable).each(function () {
+          var $t = $(this);
+          $t.attr('tabindex', $t.data('olayTabindex'))
+            .removeData('olayTabindex');
+        });
       this.$el.trigger('hide');
       if (!this.preserve) this.destroy();
       return this;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: olay-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors: 
 - Casey Foster
@@ -22,7 +22,7 @@ dependencies:
         version: "3.1"
   type: :runtime
   version_requirements: *id001
-description: Places Olay 0.1.6 in the Rails asset pipeline.
+description: Places Olay 0.1.7 in the Rails asset pipeline.
 email: 
 - c@sey.me
 executables: []