jquery-modal-rails-assets 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0a7d1c2ce9b7ada484825b08678b4fc017c3bfb
-  data.tar.gz: cfd11161fd506d4e5009f19af195b7172c99d84c
+  metadata.gz: aee86331f582edecdab486c2c248c99f7a8392d5
+  data.tar.gz: 3a2d4b93aa9c4986a12a09df40eaad7dc1418c32
 SHA512:
-  metadata.gz: fa3ca7c03cfab0cf944e617f8749a62e0ac40133c1079608efb7665b3d517bed0c6f3ad896f8cab3d508abbc01027727e94619c3c60ffd3855e5df83d8cc0857
-  data.tar.gz: 835f8338771ae39b9678787b5d2ed3dc7b287b86d415d06f91c923eb44cc7697f34931011e36ffbd204de51047f75df0ef4c8935077456b4f393ca958e8181df
+  metadata.gz: 46cdc0b4d24fd162bc2bae448dfdb1f2888e0d4ab38db47848c0c833feb0f1bb12db2f1bdb5cd35a227574f7ca9b8d4262801466e7a7bbcb72d0216b8ffe8a70
+  data.tar.gz: fdbb251e4ac70cba55a92fb9adfb05c0b3cb38605a1b6b6ff602ea8da70eed1003ab018ab0d504de1ecfd006f2fe04d71ee2c1cd2d452aa0aa09acb3eac92a0e

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

@@ -1,17 +1,34 @@
 /*
     A simple jQuery modal (http://github.com/kylefox/jquery-modal)
-    Version 0.6.1
+    Version 0.7.0
 */
 (function($) {
 
-  var current = null;
+  var modals = [],
+      getCurrent = function() {
+        return modals.length ? modals[modals.length - 1] : null;
+      },
+      selectCurrent = function() {
+        var i,
+            selected = false;
+        for (i=modals.length-1; i>=0; i--) {
+          if (modals[i].$blocker) {
+            modals[i].$blocker.toggleClass('current',!selected).toggleClass('behind',selected);
+            selected = true;
+          }
+        }
+      };
 
   $.modal = function(el, options) {
-    $.modal.close(); // Close any open modals.
     var remove, target;
     this.$body = $('body');
     this.options = $.extend({}, $.modal.defaults, options);
     this.options.doFade = !isNaN(parseInt(this.options.fadeDuration, 10));
+    this.$blocker = null;
+    if (this.options.closeExisting)
+      while ($.modal.isActive())
+        $.modal.close(); // Close any open modals.
+    modals.push(this);
     if (el.is('a')) {
       target = el.attr('href');
       //Select element by id from href
@@ -28,15 +45,18 @@
         this.showSpinner();
         el.trigger($.modal.AJAX_SEND);
         $.get(target).done(function(html) {
-          if (!current) return;
+          if (!$.modal.isActive()) return;
           el.trigger($.modal.AJAX_SUCCESS);
+          var current = getCurrent();
           current.$elm.empty().append(html).on($.modal.CLOSE, remove);
           current.hideSpinner();
           current.open();
           el.trigger($.modal.AJAX_COMPLETE);
         }).fail(function() {
           el.trigger($.modal.AJAX_FAIL);
+          var current = getCurrent();
           current.hideSpinner();
+          modals.pop(); // remove expected modal from the list
           el.trigger($.modal.AJAX_COMPLETE);
         });
       }
@@ -52,55 +72,54 @@
 
     open: function() {
       var m = this;
+      this.block();
       if(this.options.doFade) {
-        this.block();
         setTimeout(function() {
           m.show();
         }, this.options.fadeDuration * this.options.fadeDelay);
       } else {
-        this.block();
         this.show();
       }
-      if (this.options.escapeClose) {
-        $(document).on('keydown.modal', function(event) {
-          if (event.which == 27) $.modal.close();
-        });
-      }
-      if (this.options.clickClose) this.blocker.click(function(e){
-        if (e.target==this)
-          $.modal.close();
+      $(document).off('keydown.modal').on('keydown.modal', function(event) {
+        var current = getCurrent();
+        if (event.which == 27 && current.options.escapeClose) current.close();
       });
+      if (this.options.clickClose)
+        this.$blocker.click(function(e) {
+          if (e.target==this)
+            $.modal.close();
+        });
     },
 
     close: function() {
+      modals.pop();
       this.unblock();
       this.hide();
-      $(document).off('keydown.modal');
+      if (!$.modal.isActive())
+        $(document).off('keydown.modal');
     },
 
     block: function() {
       this.$elm.trigger($.modal.BEFORE_BLOCK, [this._ctx()]);
-      this.blocker = $('<div class="jquery-modal blocker"></div>');
       this.$body.css('overflow','hidden');
-      this.$body.append(this.blocker);
+      this.$blocker = $('<div class="jquery-modal blocker current"></div>').appendTo(this.$body);
+      selectCurrent();
       if(this.options.doFade) {
-        this.blocker.css('opacity',0).animate({opacity: 1}, this.options.fadeDuration);
+        this.$blocker.css('opacity',0).animate({opacity: 1}, this.options.fadeDuration);
       }
       this.$elm.trigger($.modal.BLOCK, [this._ctx()]);
     },
 
-    unblock: function() {
-      if(this.options.doFade) {
-        var self=this;
-        this.blocker.fadeOut(this.options.fadeDuration, function() {
-          self.blocker.children().appendTo(self.$body);
-          self.blocker.remove();
-          self.$body.css('overflow','');
-        });
-      } else {
-        this.blocker.children().appendTo(this.$body);
-        this.blocker.remove();
-        this.$body.css('overflow','');
+    unblock: function(now) {
+      if (!now && this.options.doFade)
+        this.$blocker.fadeOut(this.options.fadeDuration, this.unblock.bind(this,true));
+      else {
+        this.$blocker.children().appendTo(this.$body);
+        this.$blocker.remove();
+        this.$blocker = null;
+        selectCurrent();
+        if (!$.modal.isActive())
+          this.$body.css('overflow','');
       }
     },
 
@@ -110,8 +129,7 @@
         this.closeButton = $('<a href="#close-modal" rel="modal:close" class="close-modal ' + this.options.closeClass + '">' + this.options.closeText + '</a>');
         this.$elm.append(this.closeButton);
       }
-      this.$elm.addClass(this.options.modalClass + ' current');
-      this.$elm.appendTo(this.blocker);
+      this.$elm.addClass(this.options.modalClass).appendTo(this.$blocker);
       if(this.options.doFade) {
         this.$elm.css('opacity',0).show().animate({opacity: 1}, this.options.fadeDuration);
       } else {
@@ -123,8 +141,6 @@
     hide: function() {
       this.$elm.trigger($.modal.BEFORE_CLOSE, [this._ctx()]);
       if (this.closeButton) this.closeButton.remove();
-      this.$elm.removeClass('current');
-
       var _this = this;
       if(this.options.doFade) {
         this.$elm.fadeOut(this.options.fadeDuration, function () {
@@ -152,25 +168,25 @@
 
     //Return context for custom events
     _ctx: function() {
-      return { elm: this.$elm, blocker: this.blocker, options: this.options };
+      return { elm: this.$elm, $blocker: this.$blocker, options: this.options };
     }
   };
 
   $.modal.close = function(event) {
-    if (!current) return;
+    if (!$.modal.isActive()) return;
     if (event) event.preventDefault();
+    var current = getCurrent();
     current.close();
-    var that = current.$elm;
-    current = null;
-    return that;
+    return current.$elm;
   };
 
   // Returns if there currently is an active modal
   $.modal.isActive = function () {
-    return current ? true : false;
+    return modals.length > 0;
   }
 
   $.modal.defaults = {
+    closeExisting: true,
     escapeClose: true,
     clickClose: true,
     closeText: 'Close',
@@ -198,7 +214,7 @@
 
   $.fn.modal = function(options){
     if (this.length === 1) {
-      current = new $.modal(this, options);
+      new $.modal(this, options);
     }
     return this;
   };

data/app/assets/stylesheets/jquery.modal.css

@@ -17,6 +17,9 @@
   vertical-align: middle;
   margin-right: -0.05em;
 }
+.blocker.behind {
+  background-color: transparent;
+}
 .modal {
   display: inline-block;
   vertical-align: middle;

data/lib/jquery-modal-rails-assets/version.rb

@@ -1,3 +1,3 @@
 module JqueryModalRailsAssets
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-modal-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - RogerE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler