jquery-modal-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5367c922e6150305c4d9df5e75e76c717127b69b
+  data.tar.gz: cf67d604f1c6babef15fde20f4237c69192369d4
+SHA512:
+  metadata.gz: 27a775d8d7af23947941fe3c250f9ffedbded66db483f94393008f1d621be73992b03162eafbc607da41a632641dde036226a8056b07ca37f68f289d64227b22
+  data.tar.gz: 935746f72076b66ba8cb37301ca8a49345b30a9d5dbb75aaf539a3993c66df4448fd45983c413b5fd213d0fd61e1b9ce59b5f6e64754845ac738947f70c7bcde

data/Gemfile

@@ -11,8 +11,8 @@ gem 'sqlite3'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
+  gem 'sass-rails',   '~> 4.0.0.rc1'
+  gem 'coffee-rails', '~> 4.0.0.rc1'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   # gem 'therubyracer', :platforms => :ruby

data/demoapp/app/views/users/index.html.erb

@@ -21,7 +21,8 @@
 </table>
 
 <br />
-<div id="diag" style="display:none;">Hudel Welcom Coll</div>
+<div id="diag" style="display:none;">Hudel Welcom Coll <%= link_to_modal 'Another DIV in the page', "#diag2" %></div>
+<div id="diag2" style="display:none;">Hey you</div>
 
 <%= link_to 'New User Normal', new_user_path %><BR/>
 <%= link_to_modal 'New User Modal', new_user_path %><BR/>

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

@@ -1,7 +1,7 @@
 module Jquery
   module Modal
     module Rails
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
       JQUERY_MODAL_VERSION = "0.5"
     end
   end

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

@@ -1,15 +1,17 @@
 /*
     A simple jQuery modal (http://github.com/kylefox/jquery-modal)
-    Version 0.5
+    Version 0.5.4
 */
 (function($) {
 
   var current = null;
 
   $.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));
     if (el.is('a')) {
       target = el.attr('href');
       //Select element by id from href
@@ -47,8 +49,16 @@
     constructor: $.modal,
 
     open: function() {
-      this.block();
-      this.show();
+      var m = this;
+      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();
@@ -64,6 +74,7 @@
     },
 
     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,
@@ -71,14 +82,23 @@
         position: "fixed",
         zIndex: this.options.zIndex,
         background: this.options.overlay,
-        opacity: this.options.opacity
+        opacity: initialOpacity
       });
       this.$body.append(this.blocker);
+      if(this.options.doFade) {
+        this.blocker.animate({opacity: this.options.opacity}, this.options.fadeDuration);
+      }
       this.$elm.trigger($.modal.BLOCK, [this._ctx()]);
     },
 
     unblock: function() {
-      this.blocker.remove();
+      if(this.options.doFade) {
+        this.blocker.fadeOut(this.options.fadeDuration, function() {
+          this.remove();
+        });
+      } else {
+        this.blocker.remove();
+      }
     },
 
     show: function() {
@@ -89,13 +109,24 @@
       }
       this.$elm.addClass(this.options.modalClass + ' current');
       this.center();
-      this.$elm.show().trigger($.modal.OPEN, [this._ctx()]);
+      if(this.options.doFade) {
+        this.$elm.fadeIn(this.options.fadeDuration);
+      } else {
+        this.$elm.show();
+      }
+      this.$elm.trigger($.modal.OPEN, [this._ctx()]);
     },
 
     hide: function() {
       this.$elm.trigger($.modal.BEFORE_CLOSE, [this._ctx()]);
       if (this.closeButton) this.closeButton.remove();
-      this.$elm.removeClass('current').hide();
+      this.$elm.removeClass('current');
+
+      if(this.options.doFade) {
+        this.$elm.fadeOut(this.options.fadeDuration);
+      } else {
+        this.$elm.hide();
+      }
       this.$elm.trigger($.modal.CLOSE, [this._ctx()]);
     },
 
@@ -135,28 +166,11 @@
     if (!current) return;
     if (event) event.preventDefault();
     current.close();
+    var that = current.$elm;
     current = null;
+    return that;
   };
 
-  $.modal.showSpinner = function(event) {
-    if (!current) return;
-    if (event) event.preventDefault();
-    current.showSpinner();
-  }
-
-  $.modal.hideSpinner = function(event) {
-    if (!current) return;
-    if (event) event.preventDefault();
-    current.hideSpinner();
-  }
-
-  $.modal.getWidget = function() {
-    if (!current)
-        return null;
-    else
-        return current.$elm;
-  }
-
   $.modal.resize = function() {
     if (!current) return;
     current.resize();
@@ -172,7 +186,9 @@
     modalClass: "modal",
     spinnerHtml: null,
     showSpinner: true,
-    showClose: true
+    showClose: true,
+    fadeDuration: null,   // Number of milliseconds the fade animation takes.
+    fadeDelay: 1.0        // Point during the overlay's fade-in that the modal begins to fade in (.5 = 50%, 1.5 = 150%, etc.)
   };
 
   // Event constants
@@ -194,72 +210,10 @@
     return this;
   };
 
-    // Automatically bind links with rel="modal:close" to, well, close the modal.
-    $(document).on('click', 'a[rel="modal:close"]', $.modal.close);
-    $(document).on('click', 'a[rel="modal:open"]', function(event) {
-        event.preventDefault();
-        $(this).modal();
-    });
-
-    // Automatically bind links with rel="modal:open:ajaxpost" to
-    $(document).on('click', 'a[rel="modal:open:ajaxpost"]', function(event)
-    {
-        //ensure that our custom events will be received
-        event.preventDefault();
-
-        // show the dialog
-        $(this).modal();
-
-        // bind the event when the ajax call is completed
-        $(this).bind($.modal.AJAX_COMPLETE, function() {
-            // configure the submit handler
-            $('form').submit(function(){
-
-                // save the current form
-                current_form = $(this);
-
-                // show the spinner again
-                $.modal.showSpinner();
-
-                // send the ajax call
-                $.ajax({
-                    type: this.method,
-                    url: this.action + '.json',
-                    data: $(this).serialize(),
-                    dataType: 'html',
-                    success: function(data)
-                    {
-                        // hide the sinner
-                        $.modal.hideSpinner();
-
-                        // close the dialog
-                        $.modal.close();
-                    },
-                    error: function(data)
-                    {
-                        // hide the sinner
-                        $.modal.hideSpinner();
-
-                        // remove the older error message
-                        current_form.find(".error").remove()
-
-                        // parse the result
-                        var obj = jQuery.parseJSON(data.responseText);
-
-                        $.each(obj.errors, function(key, value)
-                        {
-
-                           current_form.find("#"+ current_form.attr("id").split('_').pop()+ "_" + key).after('<span class="error">'+ value[0] + '</span>');
-                        });
-                    }
-                });
-                return false;
-            });
-        });
-
-
-        // return false to prevent normal anchor action
-        return false;
-    });
-
+  // Automatically bind links with rel="modal:close" to, well, close the modal.
+  $(document).on('click.modal', 'a[rel="modal:close"]', $.modal.close);
+  $(document).on('click.modal', 'a[rel="modal:open"]', function(event) {
+    event.preventDefault();
+    $(this).modal();
+  });
 })(jQuery);

data/vendor/assets/stylesheets/{jquery.modal.css → jquery.modal.css.scss}

@@ -13,17 +13,17 @@
   -o-box-shadow: 0 0 10px #000;
   -ms-box-shadow: 0 0 10px #000;
   box-shadow: 0 0 10px #000;
-}
 
-.modal a.close-modal {
-  position: absolute;
-  top: -12.5px;
-  right: -12.5px;
-  display: block;
-  width: 30px;
-  height: 30px;
-  text-indent: -9999px;
-  background: url(close.png) no-repeat 0 0;
+  a.close-modal {
+    position: absolute;
+    top: -12.5px;
+    right: -12.5px;
+    display: block;
+    width: 30px;
+    height: 30px;
+    text-indent: -9999px;
+    background: image-url('close') no-repeat 0 0;
+  }
 }
 
 .modal-spinner {
@@ -35,7 +35,7 @@
   left: 50%;
   margin-right: -32px;
   margin-top: -32px;
-  background: url(spinner.gif) #111 no-repeat center center;
+  background: image-url('spinner') #111 no-repeat center center;
   -webkit-border-radius: 8px;
   -moz-border-radius: 8px;
   -o-border-radius: 8px;

metadata

@@ -1,22 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: jquery-modal-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Dirk Eisenberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
     - - <
@@ -25,9 +23,8 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.2.0
     - - <
@@ -36,7 +33,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -44,7 +40,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,33 +47,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: The simplest possible modal for jQuery for the Rails 3.1+ asset pipeline
@@ -164,29 +155,29 @@ files:
 - vendor/assets/images/close.png
 - vendor/assets/images/spinner.gif
 - vendor/assets/javascripts/jquery.modal.js
-- vendor/assets/stylesheets/jquery.modal.css
+- vendor/assets/stylesheets/jquery.modal.css.scss
 homepage: https://github.com/dei79/jquery-modal-rails
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The simplest possible modal for jQuery for the Rails 3.1+ asset pipeline
 test_files: []
+has_rdoc: