flashgrid 3.2.1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b5bb59cfc4399618e852ba8c74e560c7ad2ea32
-  data.tar.gz: cd389cd460ed316e0fa55b0d2d8ecc998d442776
+  metadata.gz: 30927f439da1c0f4a5972e27e9260fc9d2a76f6c
+  data.tar.gz: f7c6d592f41e1c436fa89c2345708a0aa1761e9a
 SHA512:
-  metadata.gz: 16749ef4478940b5545a4a948822b0e7a5b8df1235dc575b3cd3bbd1beaaa634d2fe0de5f1647fdfc971cfe1d853a2c900238885a00c1566bbc21a06441d7bcf
-  data.tar.gz: aab9c0bbf80bf9aa97a66bd6dff3dc02d2e2ed252635615762af77f8259fb9a928da153f3eb44f2da1ef85b844eef157bf9b06f1c56ecd72dfbc0afe27e7ef6d
+  metadata.gz: bfb98838ed6930a4272e823ebaa71dede8ebf9640ab82b333373378bc096ae3bf0c921eaf7a96305e2eebb88860cf50d9f05432ddc5c3bdff07e399e738d5065
+  data.tar.gz: 19e4e88dd1f1286b59130fdb59955d94097a894e676ed12dece5656ca9252bb7c6112c1b3cfca49e3700e3dd6caf989d4f0bb683641ba934c19e6c1c069dede8

data/README.md

@@ -55,7 +55,7 @@ Add the CSS files you want to include:
 *= require progress.css
 *= require reset.css (place before any files)
 *= require spinner.css
-*= require switch.css
+*= require swoggle.css
 *= require table.css
 *= require timepicker.css
 *= require tooltip.css
@@ -81,7 +81,7 @@ Add the JS files you want to include:
 //= require modal.js
 //= require popover.js (place after tooltip)
 //= require scrollspy.js
-//= require switch.js
+//= require swoggle.js
 //= require tab.js
 //= require tablespy.js
 //= require time_picker.js

data/lib/flashgrid/version.rb

@@ -1,3 +1,3 @@
 module Flashgrid
-  VERSION = "3.2.1"
+  VERSION = "3.3.0"
 end

data/vendor/assets/javascripts/affix.js

@@ -19,7 +19,7 @@
     this.checkPosition()
   }
 
-  Affix.VERSION  = '3.2.0'
+  Affix.VERSION  = '3.3.0'
 
   Affix.RESET    = 'affix affix-top affix-bottom'
 

data/vendor/assets/javascripts/alert.js

@@ -9,7 +9,7 @@
     $(el).on('click', dismiss, this.close)
   }
 
-  Alert.VERSION = '3.2.0'
+  Alert.VERSION = '3.3.0'
 
   Alert.TRANSITION_DURATION = 150
 

data/vendor/assets/javascripts/animation.js

@@ -1,82 +1,42 @@
 (function ($, window, document, undefined) {
-
-    // Function-level strict mode syntax
   'use strict';
 
-    $.fn.animateCSS = function (effect, delay, callback) {
-
-        // Return this to maintain chainability
-        return this.each(function () {
-
-            // Cache $(this) for speed and compression
-            var $this = $(this),
-                transitionEnd = "webkitAnimationEnd oanimationend msAnimationEnd animationend",
-                animated = "animated",
-                visibility = "visibility",
-                visible = "visible",
-                hidden = "hidden";
-
-            // Create a function we can call later
-            function run() {
-
-                // Add the animation effect with classes
-                $this.addClass( animated + " " + effect);
-
-                // Check if the elemenr has been hidden to start with
-                if ($this.css( visibility ) === hidden) {
-
-                    // If it has, show it (after the class has been added)
-                    $this.css( visibility, visible);
-
-                }
-
-                // If the element is hidden
-                if ($this.is(":" + hidden)) {
-
-                    // Show it
-                    $this.show();
-
-                }
-
-                // Event triggered when the animation has finished
-                $this.bind( transitionEnd, function () {
-
-                    // Remove the classes so they can be added again later
-                    $this.removeClass(animated + " " + effect);
-
-                    // Add a callback event
-                    if (typeof callback === "function") {
-
-                        // Execute the callback
-                        callback.call(this);
-
-                        // Unbind the event handlers
-                        $this.unbind( transitionEnd );
-
-                    }
-
-                });
-
-            }
-
-            // Check if delay exists or if it"s a callback
-            if (!delay || typeof delay === "function") {
-
-                // If it"s a callback, move it to callback so we can call it later
-                callback = delay;
-
-                // Run the animation (without delay)
-                run();
-
-            } else {
-
-                // Start a counter so we can delay the animation if required
-                setTimeout( run, delay );
-
-            }
-
+  $.fn.animateCSS = function (effect, delay, callback) {
+    return this.each(function () {
+      var $this = $(this),
+        transitionEnd = "webkitAnimationEnd oanimationend msAnimationEnd animationend",
+        animated = "animated",
+        visibility = "visibility",
+        visible = "visible",
+        hidden = "hidden";
+
+      function run() {
+        $this.addClass( animated + " " + effect);
+
+        if ($this.css( visibility ) === hidden) {
+          $this.css( visibility, visible);
+        };
+
+        if ($this.is(":" + hidden)) {
+          $this.show();
+        };
+
+        $this.bind( transitionEnd, function () {
+          $this.removeClass(animated + " " + effect);
+
+          if (typeof callback === "function") {
+            callback.call(this);
+            $this.unbind( transitionEnd );
+          };
         });
-
-    };
-
+      };
+
+      if (!delay || typeof delay === "function") {
+        callback = delay;
+        run();
+      } else {
+        setTimeout( run, delay );
+      };
+    });
+  };
 })(jQuery, window, document);

data/vendor/assets/javascripts/button.js

@@ -10,7 +10,7 @@
     this.isLoading = false
   }
 
-  Button.VERSION  = '3.2.0'
+  Button.VERSION  = '3.3.0'
 
   Button.DEFAULTS = {
     loadingText: 'loading...'
@@ -26,10 +26,10 @@
 
     if (data.resetText == null) $el.data('resetText', $el[val]())
 
-    $el[val](data[state] == null ? this.options[state] : data[state])
-
     // push to event loop to allow forms to submit
     setTimeout($.proxy(function () {
+      $el[val](data[state] == null ? this.options[state] : data[state])
+
       if (state == 'loadingText') {
         this.isLoading = true
         $el.addClass(d).attr(d, d)
@@ -51,6 +51,8 @@
         else $parent.find('.active').removeClass('active')
       }
       if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
+    } else {
+      this.$element.attr('aria-pressed', !this.$element.hasClass('active'))
     }
 
     if (changed) this.$element.toggleClass('active')
@@ -99,7 +101,7 @@
       e.preventDefault()
     })
     .on('focus.bs.button.data-api blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-      $(e.target).closest('.btn').toggleClass('focus', e.type == 'focus')
+      $(e.target).closest('.btn').toggleClass('focus', /^focus(in)?$/.test(e.type))
     })
 
 }(jQuery);

data/vendor/assets/javascripts/carousel.js

@@ -21,7 +21,7 @@
       .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
 
-  Carousel.VERSION  = '3.2.0'
+  Carousel.VERSION  = '3.3.0'
 
   Carousel.TRANSITION_DURATION = 600
 
@@ -33,6 +33,7 @@
   }
 
   Carousel.prototype.keydown = function (e) {
+    if (/input|textarea/i.test(e.target.tagName)) return
     switch (e.which) {
       case 37: this.prev(); break
       case 39: this.next(); break
@@ -198,7 +199,7 @@
   // CAROUSEL DATA-API
   // =================
 
-  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+  var clickHandler = function (e) {
     var href
     var $this   = $(this)
     var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
@@ -214,7 +215,11 @@
     }
 
     e.preventDefault()
-  })
+  }
+
+  $(document)
+    .on('click.bs.carousel.data-api', '[data-slide]', clickHandler)
+    .on('click.bs.carousel.data-api', '[data-slide-to]', clickHandler)
 
   $(window).on('load', function () {
     $('[data-ride="carousel"]').each(function () {

data/vendor/assets/javascripts/collapse.js

@@ -7,18 +7,25 @@
   var Collapse = function (element, options) {
     this.$element      = $(element)
     this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.$trigger      = $(this.options.trigger).filter('[href="#' + element.id + '"], [data-target="#' + element.id + '"]')
     this.transitioning = null
 
-    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.parent) {
+      this.$parent = this.getParent()
+    } else {
+      this.addAriaAndCollapsedClass(this.$element, this.$trigger)
+    }
+
     if (this.options.toggle) this.toggle()
   }
 
-  Collapse.VERSION  = '3.2.0'
+  Collapse.VERSION  = '3.3.0'
 
   Collapse.TRANSITION_DURATION = 350
 
   Collapse.DEFAULTS = {
-    toggle: true
+    toggle: true,
+    trigger: '[data-toggle="collapse"]'
   }
 
   Collapse.prototype.dimension = function () {
@@ -53,6 +60,10 @@
       .addClass('collapsing')[dimension](0)
       .attr('aria-expanded', true)
 
+    this.$trigger
+      .removeClass('collapsed')
+      .attr('aria-expanded', true)
+
     this.transitioning = 1
 
     var complete = function () {
@@ -89,6 +100,10 @@
       .removeClass('collapse in')
       .attr('aria-expanded', false)
 
+    this.$trigger
+      .addClass('collapsed')
+      .attr('aria-expanded', false)
+
     this.transitioning = 1
 
     var complete = function () {
@@ -111,6 +126,33 @@
     this[this.$element.hasClass('in') ? 'hide' : 'show']()
   }
 
+  Collapse.prototype.getParent = function () {
+    return $(this.options.parent)
+      .find('[data-toggle="collapse"][data-parent="' + this.options.parent + '"]')
+      .each($.proxy(function (i, element) {
+        var $element = $(element)
+        this.addAriaAndCollapsedClass(getTargetFromTrigger($element), $element)
+      }, this))
+      .end()
+  }
+
+  Collapse.prototype.addAriaAndCollapsedClass = function ($element, $trigger) {
+    var isOpen = $element.hasClass('in')
+
+    $element.attr('aria-expanded', isOpen)
+    $trigger
+      .toggleClass('collapsed', !isOpen)
+      .attr('aria-expanded', isOpen)
+  }
+
+  function getTargetFromTrigger($trigger) {
+    var href
+    var target = $trigger.attr('data-target')
+      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+
+    return $(target)
+  }
+
 
   // COLLAPSE PLUGIN DEFINITION
   // ==========================
@@ -146,22 +188,13 @@
   // =================
 
   $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
-    var href
     var $this   = $(this)
-    var target  = $this.attr('data-target')
-        || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
-    var $target = $(target)
+
+    if (!$this.attr('data-target')) e.preventDefault()
+
+    var $target = getTargetFromTrigger($this)
     var data    = $target.data('bs.collapse')
-    var option  = data ? 'toggle' : $this.data()
-    var parent  = $this.attr('data-parent')
-    var $parent = parent && $(parent)
-
-    if (!data || !data.transitioning) {
-      if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed').attr('aria-expanded', false)
-      var isCollapsed = $target.hasClass('in')
-      $this.toggleClass('collapsed', isCollapsed).attr('aria-expanded', !isCollapsed)
-    }
+    var option  = data ? 'toggle' : $.extend({}, $this.data(), { trigger: this })
 
     Plugin.call($target, option)
   })

data/vendor/assets/javascripts/dropdown.js

@@ -10,7 +10,7 @@
     $(element).on('click.bs.dropdown', this.toggle)
   }
 
-  Dropdown.VERSION = '3.2.0'
+  Dropdown.VERSION = '3.3.0'
 
   Dropdown.prototype.toggle = function (e) {
     var $this = $(this)
@@ -68,7 +68,7 @@
 
     if (!$items.length) return
 
-    var index = $items.index($items.filter(':focus'))
+    var index = $items.index(e.target)
 
     if (e.which == 38 && index > 0)                 index--                        // up
     if (e.which == 40 && index < $items.length - 1) index++                        // down
@@ -145,6 +145,8 @@
     .on('click.bs.dropdown.data-api', clearMenus)
     .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
     .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', '[role="menu"]', Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', '[role="listbox"]', Dropdown.prototype.keydown)
 
 }(jQuery);

data/vendor/assets/javascripts/modal.js

@@ -21,10 +21,7 @@
     }
   }
 
-  Modal.VERSION  = '3.2.0'
-
-  Modal.TRANSITION_DURATION = 300
-  Modal.BACKDROP_TRANSITION_DURATION = 150
+  Modal.VERSION  = '3.3.0'
 
   Modal.DEFAULTS = {
     backdrop: true,
@@ -82,7 +79,7 @@
           .one('bsTransitionEnd', function () {
             that.$element.trigger('focus').trigger(e)
           })
-          .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+          .emulateTransitionEnd(300) :
         that.$element.trigger('focus').trigger(e)
     })
   }
@@ -98,6 +95,9 @@
 
     this.isShown = false
 
+    this.$body.removeClass('modal-open')
+
+    this.resetScrollbar()
     this.escape()
 
     $(document).off('focusin.bs.modal')
@@ -110,7 +110,7 @@
     $.support.transition && this.$element.hasClass('fade') ?
       this.$element
         .one('bsTransitionEnd', $.proxy(this.hideModal, this))
-        .emulateTransitionEnd(Modal.TRANSITION_DURATION) :
+        .emulateTransitionEnd(300) :
       this.hideModal()
   }
 
@@ -126,11 +126,11 @@
 
   Modal.prototype.escape = function () {
     if (this.isShown && this.options.keyboard) {
-      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
         e.which == 27 && this.hide()
       }, this))
     } else if (!this.isShown) {
-      this.$element.off('keydown.dismiss.bs.modal')
+      this.$element.off('keyup.dismiss.bs.modal')
     }
   }
 
@@ -138,8 +138,6 @@
     var that = this
     this.$element.hide()
     this.backdrop(function () {
-      that.$body.removeClass('modal-open')
-      that.resetScrollbar()
       that.$element.trigger('hidden.bs.modal')
     })
   }
@@ -157,13 +155,14 @@
       var doAnimate = $.support.transition && animate
 
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-        .prependTo(this.$element)
-        .on('click.dismiss.bs.modal', $.proxy(function (e) {
-          if (e.target !== e.currentTarget) return
-          this.options.backdrop == 'static'
-            ? this.$element[0].focus.call(this.$element[0])
-            : this.hide.call(this)
-        }, this))
+        .appendTo(this.$body)
+
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus.call(this.$element[0])
+          : this.hide.call(this)
+      }, this))
 
       if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 
@@ -174,7 +173,7 @@
       doAnimate ?
         this.$backdrop
           .one('bsTransitionEnd', callback)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+          .emulateTransitionEnd(150) :
         callback()
 
     } else if (!this.isShown && this.$backdrop) {
@@ -187,7 +186,7 @@
       $.support.transition && this.$element.hasClass('fade') ?
         this.$backdrop
           .one('bsTransitionEnd', callbackRemove)
-          .emulateTransitionEnd(Modal.BACKDROP_TRANSITION_DURATION) :
+          .emulateTransitionEnd(150) :
         callbackRemove()
 
     } else if (callback) {
@@ -196,7 +195,8 @@
   }
 
   Modal.prototype.checkScrollbar = function () {
-    this.scrollbarWidth = this.measureScrollbar()
+    if (document.body.clientWidth >= window.innerWidth) return
+    this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
   }
 
   Modal.prototype.setScrollbar = function () {
@@ -209,7 +209,6 @@
   }
 
   Modal.prototype.measureScrollbar = function () { // thx walsh
-    if (document.body.clientWidth >= window.innerWidth) return 0
     var scrollDiv = document.createElement('div')
     scrollDiv.className = 'modal-scrollbar-measure'
     this.$body.append(scrollDiv)