flashgrid 2.1.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39c16aaf92cfa812fd8ba92dcd8b4092353d089f
-  data.tar.gz: 04f476567e986b2a09dacaf6d4e196185f673275
+  metadata.gz: 4f020b15cb62610660cd889ed7d332b4b246fc94
+  data.tar.gz: 494aaf1f28142d0534044d217d9731586743af71
 SHA512:
-  metadata.gz: 8f37eb5411b4bea5a455639345447608829c5dee738d563f5bbc52717122aeb47ca8ffda674747586d3a5c694553f8f8f874b8fbe008e8e81295cb20704ecbbc
-  data.tar.gz: 1e3bc2414717709fcd58a6fe044d3a3a4c05bd55355da713dac6c20501eb418ce8dc09c5c3b9ef25f1574de411f8f52b7bbdd9aad7da513fa67afdb667dd349b
+  metadata.gz: 1281ea481aacd8425721f69ee0650da7b4653566a37ad542ae0990f63672690db64b3904713604c0d6ab80b5e7527d0d57a0bed683e159698b8d6de0c07ccd8f
+  data.tar.gz: 0bdc9a57d1735079889c122bc47a733721316aa37b83356e5462584effeb6e911168688d84e9c4ad7002dd747a40bce410a8ce6f06eb9e3787af68c4ebc7a8b7

data/lib/flashgrid/version.rb

@@ -1,3 +1,3 @@
 module Flashgrid
-  VERSION = "2.1.2"
+  VERSION = "2.2.0"
 end

data/vendor/assets/javascripts/button.js

@@ -88,14 +88,30 @@
   }
 
 
+  // FOCUS SHIM (FOR BUTTON GROUPS)
+  // ==============================
+
+  function getBtnTarget(target) {
+    var $target = $(target)
+    return $target.hasClass('btn') ? $target : $target.parent('.btn')
+  }
+
+
   // BUTTON DATA-API
   // ===============
 
-  $(document).on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
-    var $btn = $(e.target)
-    if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    Plugin.call($btn, 'toggle')
-    e.preventDefault()
-  })
+  $(document)
+    .on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
+      var $btn = $(e.target)
+      if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
+      Plugin.call($btn, 'toggle')
+      e.preventDefault()
+    })
+    .on('focus.bs.button.data-api', '[data-toggle^="button"]', function (e) {
+      getBtnTarget(e.target).addClass('focus')
+    })
+    .on('blur.bs.button.data-api', '[data-toggle^="button"]', function (e) {
+      getBtnTarget(e.target).removeClass('focus')
+    })
 
 }(jQuery);

data/vendor/assets/javascripts/collapse.js

@@ -79,8 +79,7 @@
 
     this.$element
       .addClass('collapsing')
-      .removeClass('collapse')
-      .removeClass('in')
+      .removeClass('collapse in')
 
     this.transitioning = 1
 
@@ -152,7 +151,7 @@
 
     if (!data || !data.transitioning) {
       if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed')
-      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+      $this.toggleClass('collapsed', $target.hasClass('in'))
     }
 
     Plugin.call($target, option)

data/vendor/assets/javascripts/hoverdown.js

@@ -34,12 +34,13 @@
 
             $parent.hover(function (event) {
                 // so a neighbor can't open the dropdown
-                if(!$parent.hasClass('open') && !$this.is(event.target)) {
+                if($parent.hasClass('open') && !$this.is(event.target)) {
                     // stop this event, stop executing any code
                     // in this callback but continue to propagate
                     return true;
                 }
 
+                window.clearTimeout(timeout);
                 openDropdown(event);
             }, function () {
                 timeout = window.setTimeout(function () {
@@ -48,11 +49,21 @@
                 }, settings.delay);
             });
 
+            // clear timeout if hovering submenu
+            $allDropdowns.find('.dropdown-menu').hover(function(){
+                window.clearTimeout(timeout);
+            }, function(){
+                timeout = window.setTimeout(function () {
+                    $parent.removeClass('open');
+                    $this.trigger(hideEvent);
+                }, settings.delay);
+            });
+
             // this helps with button groups!
             $this.hover(function (event) {
                 // this helps prevent a double event from firing.
                 // see https://github.com/CWSpear/bootstrap-hover-dropdown/issues/55
-                if(!$parent.hasClass('open') && !$parent.is(event.target)) {
+                if($parent.hasClass('open') && !$parent.is(event.target)) {
                     // stop this event, stop executing any code
                     // in this callback but continue to propagate
                     return true;

data/vendor/assets/javascripts/modal.js

@@ -126,11 +126,11 @@
 
   Modal.prototype.escape = function () {
     if (this.isShown && this.options.keyboard) {
-      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
+      this.$element.on('keydown.dismiss.bs.modal', $.proxy(function (e) {
         e.which == 27 && this.hide()
       }, this))
     } else if (!this.isShown) {
-      this.$element.off('keyup.dismiss.bs.modal')
+      this.$element.off('keydown.dismiss.bs.modal')
     }
   }
 
@@ -157,7 +157,7 @@
       this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
         .appendTo(this.$body)
 
-      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+      this.$element.on('mousedown.dismiss.bs.modal', $.proxy(function (e) {
         if (e.target !== e.currentTarget) return
         this.options.backdrop == 'static'
           ? this.$element[0].focus.call(this.$element[0])

data/vendor/assets/javascripts/tab.js

@@ -46,7 +46,7 @@
     var $active    = container.find('> .active')
     var transition = callback
       && $.support.transition
-      && $active.hasClass('fade')
+      && (($active.length && $active.hasClass('fade')) || !!container.find('> .fade').length)
 
     function next() {
       $active
@@ -70,7 +70,7 @@
       callback && callback()
     }
 
-    transition ?
+    $active.length && transition ?
       $active
         .one('bsTransitionEnd', next)
         .emulateTransitionEnd(150) :

data/vendor/assets/javascripts/tooltip.js

@@ -306,13 +306,20 @@
 
   Tooltip.prototype.getPosition = function ($element) {
     $element   = $element || this.$element
+
     var el     = $element[0]
     var isBody = el.tagName == 'BODY'
-    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : null, {
-      scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop(),
+    var isSvg  = window.SVGElement && el instanceof window.SVGElement
+
+    var elRect    = el.getBoundingClientRect ? el.getBoundingClientRect() : null
+    var elOffset  = isBody ? { top: 0, left: 0 } : $element.offset()
+    var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
+    var outerDims = isSvg ? {} : {
       width:  isBody ? $(window).width()  : $element.outerWidth(),
       height: isBody ? $(window).height() : $element.outerHeight()
-    }, isBody ? { top: 0, left: 0 } : $element.offset())
+    }
+
+    return $.extend({}, elRect, scroll, outerDims, elOffset)
   }
 
   Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {

data/vendor/assets/stylesheets/button.css.scss

@@ -36,6 +36,7 @@
   -webkit-transition: all 0.3s linear;
           transition: all 0.3s linear;
   vertical-align: middle;
+  white-space: nowrap;
 }
 .btn:active,
 .btn.active,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flashgrid
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler