olay-rails 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: d865996f1310571f34aaaf0ef4b6fcd43890fbaf
-  data.tar.gz: 0d23f8982d580c25398fadb25d9c00f5e5f1087a
 SHA512: 
-  metadata.gz: 37a68accc0d3151a40d73000f5c2eb45ad155b70e725c560a972ed8ccaa3845c7da0299d23777e74b44a096b464244fb7af9f8dd0f41d0717ecbd24095090c64
-  data.tar.gz: 6cbb597fa03e856ddd592308218dd7e2758101c035882c9a7f95c5323549def287696f3db6bc456c3d9c27f1e8aed2acd1ba67f21d5844c8650a734afce430f6
+  data.tar.gz: a7e9f507d8e88291ea0a25c42a36d6df462d03f430f90ec025a9b7a6f41a65e97d1a27512813db75859feaf571ca09661d7f37ba772650fcf6093ee1bf541b5d
+  metadata.gz: 66fd18e3cef5ae793b346d378be1b9c278a82c3977c3e0416dc706fc98ee5c4d48fd18cd7394c19c159e4b33a51e5b9cd545bbb8b6ced17d273287d7fee8c660
+SHA1: 
+  data.tar.gz: a0e3d42af15820af64d51f81ae18a555dcb8875e
+  metadata.gz: 96550cafdbc971374c92b50aa54a18eece53fe76

data/lib/olay/rails/version.rb

@@ -1,6 +1,6 @@
 module Olay
-  VERSION = '0.1.8'
+  VERSION = '0.1.9'
   module Rails
-    VERSION = '0.1.8'
+    VERSION = '0.1.9'
   end
 end

data/vendor/assets/javascripts/olay.js

@@ -4,13 +4,16 @@
   // 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 =
     ':input, [tabindex], [contenteditable], [href], iframe, object, embed';
 
+  // Convenience method for `off`/`on`ing in jQuery.
+  var delegate = function ($el, ev, selector, cb) {
+    $el.off.call($el, ev, selector, cb);
+    $el.on.call($el, ev, selector, cb);
+  };
+
   // Listen for keydown events.
   $(document).keydown(function (ev) {
     var $olay = $('.js-olay-container').last();
@@ -33,14 +36,19 @@
     // Extend the instance with its options.
     for (var name in options) this[name] = options[name];
 
-    // Store a bound `hide` to be used for callbacks. This is also used to
+    // Store bound listeners to be used for callbacks. This is also used to
     // ensure event callbacks can be removed consistently.
     var self = this;
     this._hide = function () { return self.hide(); };
+    var event;
+    this._$containerClick = function (ev) {
+      if (self.hideOnClick && event !== ev.originalEvent) self.hide();
+    };
+    this._$contentClick = function (ev) { event = ev.originalEvent; };
 
     // Create the necessary DOM nodes.
     this.$container = $('<div>')
-      .addClass('js-olay-container')
+      .addClass('js-olay-container ')
       .addClass(this.transition)
       .append(
     this.$table = $('<div>')
@@ -51,8 +59,7 @@
       .append(
     this.$content = $('<div>')
       .addClass('js-olay-content')
-      .attr({role: 'alertdialog', 'aria-label': this.ariaLabel})
-      .on('click', '.js-olay-hide', this._hide))));
+      .attr({role: 'alertdialog', 'aria-label': this.ariaLabel}))));
 
     // Finally, set the element.
     this.setElement(el);
@@ -94,19 +101,20 @@
       clearTimeout(this._timeout);
       if (!inDom) this._append();
 
-      // Force a redraw before and after adding the transition class. Not doing
-      // this will apply the end result of the transition instantly, which is
-      // not desirable in a transition...
+      // Force a redraw before adding the transition class. Not doing this will
+      // apply the end result of the transition instantly, which is not
+      // desirable in a transition...
       this.$container.data('olay', this).height();
-      this.$container.addClass('js-olay-show').off('click', this._hide);
-      this.$content.off('click', stopPropagation);
-      if (this.hideOnClick) {
-        this.$container.click(this._hide);
-        this.$content.click(stopPropagation);
-      }
+      this.$container.addClass('js-olay-show');
+
+      // Delegate events, ensuring no double-binding.
+      delegate(this.$container, 'click', this._$containerClick);
+      delegate(this.$content, 'click', this._$contentClick);
+      delegate(this.$content, 'click', '.js-olay-hide', this._hide);
+
       this.$el.trigger('show');
       var duration = this.duration;
-      if (!duration) return this;
+      if (!this.duration) return this;
       duration += this.transitionDuration;
       this._timeout = setTimeout(this._hide, duration);
       return this;
@@ -128,6 +136,7 @@
     // Use this method to set or update `$el`.
     setElement: function (el) {
       this.$content.empty().append(this.$el = el instanceof $ ? el : $(el));
+      return this;
     },
 
     // Completely remove the `$container` element and its children and all of
@@ -143,15 +152,13 @@
       var $body = $('body');
       var $olays = $('.js-olay-container');
       var active = document.activeElement;
-      this._$active =
-        $olays.length && active === $body[0] ?
-        $olays.last() :
-        $(active);
+      var useLast = $olays.length && active === $body[0];
+      this._$active = useLast ? $olays.last() : $(active);
       $(tabbable).each(function () {
         if ('olayTabindex' in this) return;
-        var $t = $(this);
-        this.olayTabindex = $t.attr('tabindex') || null;
-        $t.attr('tabindex', -1);
+        var $self = $(this);
+        this.olayTabindex = $self.attr('tabindex') || null;
+        $self.attr('tabindex', -1);
       });
       $body.addClass('js-olay-visible').append(this.$container);
       this.$content.attr('tabindex', 0).focus().removeAttr('tabindex');

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: olay-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors: 
 - Casey Foster
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-08 00:00:00 Z
+date: 2013-03-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -22,7 +22,7 @@ dependencies:
         version: "3.1"
   type: :runtime
   version_requirements: *id001
-description: Places Olay 0.1.8 in the Rails asset pipeline.
+description: Places Olay 0.1.9 in the Rails asset pipeline.
 email: 
 - c@sey.me
 executables: []