jquery-modal-rails-assets 0.5.11 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a59d48095714fae90339c7bc3e988b89c7f515b
-  data.tar.gz: 8ff30046b1950fc55045e7c26764eee89843cb26
+  metadata.gz: ea9f21c14f8650d2ebbf95a82484b9af37aa78c5
+  data.tar.gz: cda39e2d833012ebf12f7bd0950204145e57547d
 SHA512:
-  metadata.gz: 8108a60b517f9647397f522f9cbdae1504fbe5eb92e89953fb18ee430e01704ff19a08bc8c464f3017c10c2f6f717dd67a6c687d6943f1bab3f5aa2197e54d76
-  data.tar.gz: 7a66d1fa5118d7fbb8500ccdd3513fe45814de1808aaab2148ad279a117d6d96589bd20981c16ce8b5f7e0bd460c00b1f30f00a7b2b8f063655d3028f8c5d791
+  metadata.gz: 4b6f7d47072369bc6e1da4d6f183b6264ca32688da1c05dfa3db4909001065fa3edc98af640a243d805fbc731508fa73c3aa1695663d94308cf410fc197c11b1
+  data.tar.gz: 1b9e1c72645633606f6052eca56746d34eb3d3ba86a5662132ece0e42c82867395fb2a6ba1f8f8853780ffa5cbd418e1ee0a8e2583bccd0798c7f93337a06d7f

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

@@ -1,6 +1,6 @@
 /*
     A simple jQuery modal (http://github.com/kylefox/jquery-modal)
-    Version 0.5.11
+    Version 0.6.0
 */
 (function($) {
 
@@ -18,6 +18,7 @@
       if (/^#/.test(target)) {
         this.$elm = $(target);
         if (this.$elm.length !== 1) return null;
+        this.$body.append(this.$elm);
         this.open();
       //AJAX
       } else {
@@ -65,7 +66,10 @@
           if (event.which == 27) $.modal.close();
         });
       }
-      if (this.options.clickClose) this.blocker.click($.modal.close);
+      if (this.options.clickClose) this.blocker.click(function(e){
+        if (e.target==this)
+          $.modal.close();
+      });
     },
 
     close: function() {
@@ -75,30 +79,28 @@
     },
 
     block: function() {
-      var initialOpacity = this.options.doFade ? 0 : this.options.opacity;
       this.$elm.trigger($.modal.BEFORE_BLOCK, [this._ctx()]);
-      this.blocker = $('<div class="jquery-modal blocker"></div>').css({
-        top: 0, right: 0, bottom: 0, left: 0,
-        width: "100%", height: "100%",
-        position: "fixed",
-        zIndex: this.options.zIndex,
-        background: this.options.overlay,
-        opacity: initialOpacity
-      });
+      this.blocker = $('<div class="jquery-modal blocker"></div>');
+      this.$body.css('overflow','hidden');
       this.$body.append(this.blocker);
       if(this.options.doFade) {
-        this.blocker.animate({opacity: this.options.opacity}, 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() {
-          $(this).remove();
+          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','');
       }
     },
 
@@ -109,9 +111,9 @@
         this.$elm.append(this.closeButton);
       }
       this.$elm.addClass(this.options.modalClass + ' current');
-      this.center();
+      this.$elm.appendTo(this.blocker);
       if(this.options.doFade) {
-        this.$elm.fadeIn(this.options.fadeDuration);
+        this.$elm.css('opacity',0).animate({opacity: 1}, this.options.fadeDuration);
       } else {
         this.$elm.show();
       }
@@ -148,26 +150,12 @@
       if (this.spinner) this.spinner.remove();
     },
 
-    center: function() {
-      this.$elm.css({
-        position: 'fixed',
-        top: "50%",
-        left: "50%",
-        marginTop: - (this.$elm.outerHeight() / 2),
-        marginLeft: - (this.$elm.outerWidth() / 2),
-        zIndex: this.options.zIndex + 1
-      });
-    },
-
     //Return context for custom events
     _ctx: function() {
       return { elm: this.$elm, blocker: this.blocker, options: this.options };
     }
   };
 
-  //resize is alias for center for now
-  $.modal.prototype.resize = $.modal.prototype.center;
-
   $.modal.close = function(event) {
     if (!current) return;
     if (event) event.preventDefault();
@@ -177,20 +165,12 @@
     return that;
   };
 
-  $.modal.resize = function() {
-    if (!current) return;
-    current.resize();
-  };
-
   // Returns if there currently is an active modal
   $.modal.isActive = function () {
     return current ? true : false;
   }
 
   $.modal.defaults = {
-    overlay: "#000",
-    opacity: 0.75,
-    zIndex: 1,
     escapeClose: true,
     clickClose: true,
     closeText: 'Close',

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

@@ -1,5 +1,27 @@
+.blocker {
+  position: fixed;
+  top: 0; right: 0; bottom: 0; left: 0;
+  width: 100%; height: 100%;
+  overflow: auto;
+  z-index: 1;
+  padding: 20px;
+  box-sizing: border-box;
+  background-color: rgb(0,0,0);
+  background-color: rgba(0,0,0,0.75);
+  text-align: center;
+}
+.blocker:before{
+  content: "";
+  display: inline-block;
+  height: 100%;
+  vertical-align: middle;
+  margin-right: -0.05em;
+}
 .modal {
-  display: none;
+  display: inline-block;
+  vertical-align: middle;
+  position: relative;
+  z-index: 2;
   width: 400px;
   background: #fff;
   padding: 15px 30px;
@@ -13,6 +35,7 @@
   -o-box-shadow: 0 0 10px #000;
   -ms-box-shadow: 0 0 10px #000;
   box-shadow: 0 0 10px #000;
+  text-align: left;
 }
 
 .modal a.close-modal {
@@ -41,4 +64,4 @@
   -o-border-radius: 8px;
   -ms-border-radius: 8px;
   border-radius: 8px;
-}
+}

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

@@ -1,3 +1,3 @@
 module JqueryModalRailsAssets
-  VERSION = "0.5.11"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jquery-modal-rails-assets
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.6.0
 platform: ruby
 authors:
 - RogerE
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Use jQuery Modal with Rails Asset Pipeline