jquery_match_height_rails 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9649a3aa41e5d38f78a3a9f03fbeccc7ffc1fed1
-  data.tar.gz: d8eb10d480d4f2c5dd62676a191a352f73b07fc6
+  metadata.gz: dcb3c507574a291cedaaa772deef015a7189eacb
+  data.tar.gz: c93b422f036ec28568b57c7f89f9184723752962
 SHA512:
-  metadata.gz: b74e8ba00ec419b200fb408723a25994c7e3c443ab9287ff01d7bb028470948e1bb02c429225f4804b6767d4d26d36c3cae70acabab37c12dafaf0f26af9b97b
-  data.tar.gz: c8d96bed76dcbb05770762a8a9943297b81e7b51a9ceecc6e16a1ecf71da35b78a599ef134b591098bd6f7ba44cad5fa3da89ef0bb59ae7d1e5688ed42fe6362
+  metadata.gz: db32a7e2c8c86f03e101aec18b3b150edce45d4d89d6fa1b8afef65f66e91e07e96255c397cf4fad41be45fc094ae2c0e9c061d188cf7cad5bbddcdf0e54a3af
+  data.tar.gz: ca4d65be6c71a103cb940cdedcdd7c23f52bfec4f237885dd8945251a13c0601590d341c310b51062b99e29847cce2ee7d9fc431a6a7738e7596f20fbbf4b980

data/app/assets/javascripts/jquery_match_height.js

@@ -1,11 +1,23 @@
 /**
- * jquery.matchHeight.js master
+ * jquery-match-height master by @liabru
  * http://brm.io/jquery-match-height/
  * License: MIT
  */
 
 ;
-(function($) {
+(function(factory) { // eslint-disable-line no-extra-semi
+    'use strict';
+    if (typeof define === 'function' && define.amd) {
+        // AMD
+        define(['jquery'], factory);
+    } else if (typeof module !== 'undefined' && module.exports) {
+        // CommonJS
+        module.exports = factory(require('jquery'));
+    } else {
+        // Global
+        factory(jQuery);
+    }
+})(function($) {
     /*
      *  internal
      */
@@ -132,11 +144,15 @@
      *  plugin global options
      */
 
+    matchHeight.version = 'master';
     matchHeight._groups = [];
     matchHeight._throttle = 80;
     matchHeight._maintainScroll = false;
     matchHeight._beforeUpdate = null;
     matchHeight._afterUpdate = null;
+    matchHeight._rows = _rows;
+    matchHeight._parse = _parse;
+    matchHeight._parseOptions = _parseOptions;
 
     /*
      *  matchHeight._apply
@@ -170,7 +186,12 @@
             // must first force an arbitrary equal height so floating elements break evenly
             $elements.each(function() {
                 var $that = $(this),
-                    display = $that.css('display') === 'inline-block' ? 'inline-block' : 'block';
+                    display = $that.css('display');
+
+                // temporarily force a usable display value
+                if (display !== 'inline-block' && display !== 'flex' && display !== 'inline-flex') {
+                    display = 'block';
+                }
 
                 // cache the original inline style
                 $that.data('style-cache', $that.attr('style'));
@@ -183,7 +204,8 @@
                     'margin-bottom': '0',
                     'border-top-width': '0',
                     'border-bottom-width': '0',
-                    'height': '100px'
+                    'height': '100px',
+                    'overflow': 'hidden'
                 });
             });
 
@@ -211,7 +233,13 @@
                 // iterate the row and find the max height
                 $row.each(function() {
                     var $that = $(this),
-                        display = $that.css('display') === 'inline-block' ? 'inline-block' : 'block';
+                        style = $that.attr('style'),
+                        display = $that.css('display');
+
+                    // temporarily force a usable display value
+                    if (display !== 'inline-block' && display !== 'flex' && display !== 'inline-flex') {
+                        display = 'block';
+                    }
 
                     // ensure we get the correct actual height (and not a previously set height value)
                     var css = {
@@ -225,8 +253,12 @@
                         targetHeight = $that.outerHeight(false);
                     }
 
-                    // revert display block
-                    $that.css('display', '');
+                    // revert styles
+                    if (style) {
+                        $that.attr('style', style);
+                    } else {
+                        $that.css('display', '');
+                    }
                 });
             } else {
                 // if target set, use the height of the target element
@@ -250,7 +282,7 @@
                 }
 
                 // set the height (accounting for padding and border)
-                $that.css(opts.property, targetHeight - verticalPadding);
+                $that.css(opts.property, (targetHeight - verticalPadding) + 'px');
             });
         });
 
@@ -353,4 +385,4 @@
         matchHeight._update(true, event);
     });
 
-})(jQuery);
+});

data/lib/jquery_match_height_rails/version.rb

@@ -1,3 +1,3 @@
 module JqueryMatchHeightRails
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jquery_match_height_rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ziyan Junaideen