bootstrap_modal_rails 2.1.0 → 2.1.1

data/lib/bootstrap_modal_rails/version.rb

@@ -1,3 +1,3 @@
 module BootstrapModalRails
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/vendor/assets/javascripts/bootstrap_modal_rails/bootstrap-modal.js

@@ -1,20 +1,20 @@
 /* ===========================================================
- * bootstrap-modal.js v2.1
- * ===========================================================
- * Copyright 2012 Jordan Schroter
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
+* bootstrap-modal.js v2.1
+* ===========================================================
+* Copyright 2012 Jordan Schroter
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ========================================================== */
 
 
 !function ($) {
@@ -36,15 +36,15 @@
       this.options = options;
 
       this.$element = $(element)
-        .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this));
+      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this));
 
       this.options.remote && this.$element.find('.modal-body').load(this.options.remote);
 
       var manager = typeof this.options.manager === 'function' ?
-        this.options.manager.call(this) : this.options.manager;
+      this.options.manager.call(this) : this.options.manager;
 
       manager = manager.appendModal ?
-        manager : $(manager).modalmanager().data('modalmanager');
+      manager : $(manager).modalmanager().data('modalmanager');
 
       manager.appendModal(this);
     },
@@ -58,7 +58,7 @@
 
       if (this.isShown) return;
 
-      this.$element.triggerHandler(e);
+      this.$element.trigger(e);
 
       if (e.isDefaultPrevented()) return;
 
@@ -74,7 +74,7 @@
 
       e = $.Event('hide');
 
-      this.$element.triggerHandler(e);
+      this.$element.trigger(e);
 
       if (!this.isShown || e.isDefaultPrevented()) return (this.isShown = false);
 
@@ -89,20 +89,20 @@
       $(document).off('focusin.modal');
 
       this.$element
-        .removeClass('in')
-        .removeClass('animated')
-        .removeClass(this.options.attentionAnimation)
-        .removeClass('modal-overflow')
-        .attr('aria-hidden', true);
+      .removeClass('in')
+      .removeClass('animated')
+      .removeClass(this.options.attentionAnimation)
+      .removeClass('modal-overflow')
+      .attr('aria-hidden', true);
 
       $.support.transition && this.$element.hasClass('fade') ?
-        this.hideWithTransition() :
-        this.hideModal();
+      this.hideWithTransition() :
+      this.hideModal();
     },
 
     layout: function () {
       var prop = this.options.height ? 'height' : 'max-height',
-        value = this.options.height || this.options.maxHeight;
+      value = this.options.height || this.options.maxHeight;
 
       if (this.options.width){
         this.$element.css('width', this.options.width);
@@ -121,25 +121,25 @@
       }
 
       this.$element.find('.modal-body')
-        .css('overflow', '')
-        .css(prop, '');
-
-      var modalOverflow = $(window).height() - 10 < this.$element.height();
+      .css('overflow', '')
+      .css(prop, '');
 
       if (value){
         this.$element.find('.modal-body')
-          .css('overflow', 'auto')
-          .css(prop, value);
+        .css('overflow', 'auto')
+        .css(prop, value);
       }
 
+      var modalOverflow = $(window).height() - 10 < this.$element.height();
+            
       if (modalOverflow || this.options.modalOverflow) {
         this.$element
-          .css('margin-top', 0)
-          .addClass('modal-overflow');
+        .css('margin-top', 0)
+        .addClass('modal-overflow');
       } else {
         this.$element
-          .css('margin-top', 0 - this.$element.height() / 2)
-          .removeClass('modal-overflow');
+        .css('margin-top', 0 - this.$element.height() / 2)
+        .removeClass('modal-overflow');
       }
     },
 
@@ -148,24 +148,24 @@
 
       if (this.isShown && this.options.consumeTab) {
         this.$element.on('keydown.tabindex.modal', '[data-tabindex]', function (e) {
-            if (e.keyCode && e.keyCode == 9){
+          if (e.keyCode && e.keyCode == 9){
             var $next = $(this),
-              $rollover = $(this);
+            $rollover = $(this);
 
             that.$element.find('[data-tabindex]:enabled:not([readonly])').each(function (e) {
               if (!e.shiftKey){
                 $next = $next.data('tabindex') < $(this).data('tabindex') ?
-                  $next = $(this) :
-                  $rollover = $(this);
+                $next = $(this) :
+                $rollover = $(this);
               } else {
                 $next = $next.data('tabindex') > $(this).data('tabindex') ?
-                  $next = $(this) :
-                  $rollover = $(this);
+                $next = $(this) :
+                $rollover = $(this);
               }
             });
 
             $next[0] !== $(this)[0] ?
-              $next.focus() : $rollover.focus();
+            $next.focus() : $rollover.focus();
 
             e.preventDefault();
           }
@@ -190,10 +190,10 @@
 
     hideWithTransition: function () {
       var that = this
-        , timeout = setTimeout(function () {
-          that.$element.off($.support.transition.end);
-          that.hideModal();
-        }, 500);
+      , timeout = setTimeout(function () {
+        that.$element.off($.support.transition.end);
+        that.hideModal();
+      }, 500);
 
       this.$element.one($.support.transition.end, function () {
         clearTimeout(timeout);
@@ -202,19 +202,18 @@
     },
 
     hideModal: function () {
-      this.$element
-        .hide()
-        .triggerHandler('hidden');
-
       var prop = this.options.height ? 'height' : 'max-height';
       var value = this.options.height || this.options.maxHeight;
 
       if (value){
         this.$element.find('.modal-body')
-          .css('overflow', '')
-          .css(prop, '');
+        .css('overflow', '')
+        .css(prop, '');
       }
 
+      this.$element
+      .hide()
+      .trigger('hidden');
     },
 
     removeLoading: function () {
@@ -232,8 +231,8 @@
         var doAnimate = $.support.transition && animate;
 
         this.$loading = $('<div class="loading-mask ' + animate + '">')
-          .append(this.options.spinner)
-          .appendTo(this.$element);
+        .append(this.options.spinner)
+        .appendTo(this.$element);
 
         if (doAnimate) this.$loading[0].offsetWidth; // force reflow
 
@@ -242,16 +241,16 @@
         this.isLoading = true;
 
         doAnimate ?
-          this.$loading.one($.support.transition.end, callback) :
-          callback();
+        this.$loading.one($.support.transition.end, callback) :
+        callback();
 
       } else if (this.isLoading && this.$loading) {
         this.$loading.removeClass('in');
 
         var that = this;
         $.support.transition && this.$element.hasClass('fade')?
-          this.$loading.one($.support.transition.end, function () { that.removeLoading() }) :
-          that.removeLoading();
+        this.$loading.one($.support.transition.end, function () { that.removeLoading() }) :
+        that.removeLoading();
 
       } else if (callback) {
         callback(this.isLoading);
@@ -271,15 +270,15 @@
 
       if (this.options.attentionAnimation){
         this.$element
-          .removeClass('animated')
-          .removeClass(this.options.attentionAnimation);
+        .removeClass('animated')
+        .removeClass(this.options.attentionAnimation);
 
         var that = this;
 
         setTimeout(function () {
           that.$element
-            .addClass('animated')
-            .addClass(that.options.attentionAnimation);
+          .addClass('animated')
+          .addClass(that.options.attentionAnimation);
         }, 0);
       }
 
@@ -290,7 +289,7 @@
 
     destroy: function () {
       var e = $.Event('destroy');
-      this.$element.triggerHandler(e);
+      this.$element.trigger(e);
       if (e.isDefaultPrevented()) return;
 
       this.teardown();
@@ -310,8 +309,8 @@
       this.$element.off('.modal');
       this.$element.removeData('modal');
       this.$element
-        .removeClass('in')
-        .attr('aria-hidden', true);
+      .removeClass('in')
+      .attr('aria-hidden', true);
     }
   };
 
@@ -322,8 +321,8 @@
   $.fn.modal = function (option, args) {
     return this.each(function () {
       var $this = $(this),
-        data = $this.data('modal'),
-        options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option);
+      data = $this.data('modal'),
+      options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option);
 
       if (!data) $this.data('modal', (data = new Modal(this, options)));
       if (typeof option == 'string') data[option].apply(data, [].concat(args));
@@ -356,18 +355,18 @@
   * ============== */
 
   $(function () {
-    $(document).off('.modal').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+    $(document).off('click.modal').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
       var $this = $(this),
-        href = $this.attr('href'),
-        $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))), //strip for ie7
-        option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data());
+      href = $this.attr('href'),
+      $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))), //strip for ie7
+      option = $target.data('modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data());
 
       e.preventDefault();
       $target
-        .modal(option)
-        .one('hide', function () {
-          $this.focus();
-        })
+      .modal(option)
+      .one('hide', function () {
+        $this.focus();
+      })
     });
   });
 

data/vendor/assets/javascripts/bootstrap_modal_rails/bootstrap-modalmanager.js

@@ -1,20 +1,20 @@
 /* ===========================================================
- * bootstrap-modalmanager.js v2.1
- * ===========================================================
- * Copyright 2012 Jordan Schroter.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
+* bootstrap-modalmanager.js v2.1
+* ===========================================================
+* Copyright 2012 Jordan Schroter.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+* ========================================================== */
 
 !function ($) {
 
@@ -39,7 +39,7 @@
 
       if (this.options.resize) {
         var resizeTimeout,
-          that = this;
+        that = this;
 
         $(window).on('resize.modal', function(){
           resizeTimeout && clearTimeout(resizeTimeout);
@@ -69,8 +69,8 @@
           var transition = $.support.transition && modal.$element.hasClass('fade');
 
           that.$element
-            .toggleClass('modal-open', that.hasOpenModal())
-            .toggleClass('page-overflow', $(window).height() < that.$element.height());
+          .toggleClass('modal-open', that.hasOpenModal())
+          .toggleClass('page-overflow', $(window).height() < that.$element.height());
 
           modal.$parent = modal.$element.parent();
 
@@ -82,26 +82,32 @@
 
             modal.$element.show();
 
+            if (transition) {       
+              //modal.$element[0].style.display = 'run-in';       
+              modal.$element[0].offsetWidth;
+              //modal.$element.one($.support.transition.end, function () { modal.$element[0].style.display = 'block' });  
+            }
+						
             modal.layout();
 
             modal.$element
-              .addClass('in')
-              .attr('aria-hidden', false);
+            .addClass('in')
+            .attr('aria-hidden', false);
 
             var complete = function () {
               that.setFocus();
-              modal.$element.triggerHandler('shown');
+              modal.$element.trigger('shown');
             };
 
             transition ?
-              modal.$element.one($.support.transition.end, complete) :
-              complete();
+            modal.$element.one($.support.transition.end, complete) :
+            complete();
           });
         };
 
         modal.options.replace ?
-          that.replace(showModal) :
-          showModal();
+        that.replace(showModal) :
+        showModal();
       }));
 
       modal.$element.on('hidden.modalmanager', targetIsSelf(function (e) {
@@ -110,8 +116,8 @@
 
         if (modal.$backdrop){
           $.support.transition && modal.$element.hasClass('fade') ?
-            modal.$backdrop.one($.support.transition.end, function () { that.destroyModal(modal) }) :
-            that.destroyModal(modal);
+          modal.$backdrop.one($.support.transition.end, function () { that.destroyModal(modal) }) :
+          that.destroyModal(modal);
         } else {
           that.destroyModal(modal);
         }
@@ -164,7 +170,7 @@
 
     removeModal: function (modal) {
       modal.$element.off('.modalmanager');
-      if (modal.$backdrop) this.removeBackdrop.call(modal);
+      if (modal.$backdrop) this.removeBackdrop(modal);
       this.stack.splice(this.getIndexOfModal(modal), 1);
     },
 
@@ -190,7 +196,7 @@
         topModal.$backdrop = null;
 
         callback && topModal.$element.one('hidden',
-          targetIsSelf( $.proxy(callback, this) ));
+        targetIsSelf( $.proxy(callback, this) ));
 
         topModal.hide();
       } else if (callback) {
@@ -208,7 +214,7 @@
 
       if (!this.$backdropHandle) {
         $backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-          .appendTo(this.$element);
+        .appendTo(this.$element);
       } else {
         $backdrop = this.$backdropHandle;
         $backdrop.off('.modalmanager');
@@ -216,7 +222,7 @@
         this.isLoading && this.removeSpinner();
       }
 
-      return $backdrop
+      return $backdrop;
     },
 
     removeContainer: function (modal) {
@@ -228,9 +234,9 @@
       var $container;
 
       $container = $('<div class="modal-scrollable">')
-        .css('z-index', getzIndex( 'modal',
-          modal ? this.getIndexOfModal(modal) : this.stack.length ))
-        .appendTo(this.$element);
+      .css('z-index', getzIndex( 'modal',
+      modal ? this.getIndexOfModal(modal) : this.stack.length ))
+      .appendTo(this.$element);
 
       if (modal && modal.options.backdrop != 'static') {
         $container.on('click.modal', targetIsSelf(function (e) {
@@ -248,8 +254,8 @@
 
     backdrop: function (modal, callback) {
       var animate = modal.$element.hasClass('fade') ? 'fade' : '',
-        showBackdrop = modal.options.backdrop &&
-          this.backdropCount < this.options.backdropLimit;
+      showBackdrop = modal.options.backdrop &&
+      this.backdropCount < this.options.backdropLimit;
 
       if (modal.isShown && showBackdrop) {
         var doAnimate = $.support.transition && animate && !this.$backdropHandle;
@@ -265,8 +271,8 @@
         this.backdropCount += 1;
 
         doAnimate ?
-          modal.$backdrop.one($.support.transition.end, callback) :
-          callback();
+        modal.$backdrop.one($.support.transition.end, callback) :
+        callback();
 
       } else if (!modal.isShown && modal.$backdrop) {
         modal.$backdrop.removeClass('in');
@@ -276,8 +282,8 @@
         var that = this;
 
         $.support.transition && modal.$element.hasClass('fade')?
-          modal.$backdrop.one($.support.transition.end, function () { that.removeBackdrop(modal) }) :
-          that.removeBackdrop(modal);
+        modal.$backdrop.one($.support.transition.end, function () { that.removeBackdrop(modal) }) :
+        that.removeBackdrop(modal);
 
       } else if (callback) {
         callback();
@@ -300,8 +306,8 @@
       callback = callback || function () { };
 
       this.$element
-        .toggleClass('modal-open', !this.isLoading || this.hasOpenModal())
-        .toggleClass('page-overflow', $(window).height() < this.$element.height());
+      .toggleClass('modal-open', !this.isLoading || this.hasOpenModal())
+      .toggleClass('page-overflow', $(window).height() < this.$element.height());
 
       if (!this.isLoading) {
 
@@ -310,31 +316,31 @@
         this.$backdropHandle[0].offsetWidth; // force reflow
 
         this.$backdropHandle
-          .css('z-index', getzIndex('backdrop', this.stack.length))
-          .addClass('in');
+        .css('z-index', getzIndex('backdrop', this.stack.length))
+        .addClass('in');
 
         var $spinner = $(this.options.spinner)
-          .css('z-index', getzIndex('modal', this.stack.length))
-          .appendTo(this.$element)
-          .addClass('in');
+        .css('z-index', getzIndex('modal', this.stack.length))
+        .appendTo(this.$element)
+        .addClass('in');
 
         this.$spinner = $(this.createContainer())
-          .append($spinner)
-          .on('click.modalmanager', $.proxy(this.loading, this));
+        .append($spinner)
+        .on('click.modalmanager', $.proxy(this.loading, this));
 
         this.isLoading = true;
 
         $.support.transition ?
-          this.$backdropHandle.one($.support.transition.end, callback) :
-          callback();
+        this.$backdropHandle.one($.support.transition.end, callback) :
+        callback();
 
       } else if (this.isLoading && this.$backdropHandle) {
         this.$backdropHandle.removeClass('in');
 
         var that = this;
         $.support.transition ?
-          this.$backdropHandle.one($.support.transition.end, function () { that.removeLoading() }) :
-          that.removeLoading();
+        this.$backdropHandle.one($.support.transition.end, function () { that.removeLoading() }) :
+        that.removeLoading();
 
       } else if (callback) {
         callback(this.isLoading);
@@ -348,13 +354,13 @@
   // computes and caches the zindexes
   var getzIndex = (function () {
     var zIndexFactor,
-      baseIndex = {};
+    baseIndex = {};
 
     return function (type, pos) {
 
       if (typeof zIndexFactor === 'undefined'){
         var $baseModal = $('<div class="modal hide" />').appendTo('body'),
-          $baseBackdrop = $('<div class="modal-backdrop hide" />').appendTo('body');
+        $baseBackdrop = $('<div class="modal-backdrop hide" />').appendTo('body');
 
         baseIndex['modal'] = +$baseModal.css('z-index');
         baseIndex['backdrop'] = +$baseBackdrop.css('z-index');
@@ -388,9 +394,9 @@
   $.fn.modalmanager = function (option, args) {
     return this.each(function () {
       var $this = $(this),
-        data = $this.data('modalmanager');
+      data = $this.data('modalmanager');
 
-      if (!data) $this.data('modalmanager', (data = new ModalManager(this, option)))
+      if (!data) $this.data('modalmanager', (data = new ModalManager(this, option)));
       if (typeof option === 'string') data[option].apply(data, [].concat(args))
     })
   };

data/vendor/assets/stylesheets/bootstrap_modal_rails/bootstrap-modal.css

@@ -1,11 +1,11 @@
 /*!
- * Bootstrap Modal
- *
- * Copyright Jordan Schroter
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- */
+* Bootstrap Modal
+*
+* Copyright Jordan Schroter
+* Licensed under the Apache License v2.0
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+*/
 
 .modal-open {
   overflow: hidden;
@@ -48,9 +48,9 @@
 .modal.fade {
   top: -100%;
   -webkit-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-     -moz-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-       -o-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
-          transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
+  -moz-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
+  -o-transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
+  transition: opacity 0.3s linear, top 0.3s ease-out, bottom 0.3s ease-out, margin-top 0.3s ease-out;
 }
 
 .modal.fade.in {
@@ -82,7 +82,7 @@
   z-index: 940;
 }
 
-.modal-backdrop, 
+.modal-backdrop,
 .modal-backdrop.fade.in {
   opacity: 0.7;
   filter: alpha(opacity=70);
@@ -134,14 +134,14 @@
     margin: 0 !important;
     padding: 0 !important;
   }
-  
-  .modal.fade.in, 
+
+  .modal.fade.in,
   .modal.container.fade.in,
   .modal.modal-overflow.fade.in {
     top: 1%;
     bottom: auto;
   }
-  
+
   .modal-body,
   .modal-overflow .modal-body {
     position: static;
@@ -150,7 +150,7 @@
     max-height: none !important;
     overflow: visible !important;
   }
-  
+
   .modal-footer,
   .modal-overflow .modal-footer {
     position: static;
@@ -172,13 +172,13 @@ Copyright (c) 2012 Dan Eden*/
 
 .animated {
   -webkit-animation-duration: 1s;
-     -moz-animation-duration: 1s;
-       -o-animation-duration: 1s;
-          animation-duration: 1s;
+  -moz-animation-duration: 1s;
+  -o-animation-duration: 1s;
+  animation-duration: 1s;
   -webkit-animation-fill-mode: both;
-     -moz-animation-fill-mode: both;
-       -o-animation-fill-mode: both;
-          animation-fill-mode: both;
+  -moz-animation-fill-mode: both;
+  -o-animation-fill-mode: both;
+  animation-fill-mode: both;
 }
 
 @-webkit-keyframes shake {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap_modal_rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2372622881791272487
+      hash: 1172664824914757023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2372622881791272487
+      hash: 1172664824914757023
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23