mdbootstrap/mdb-ui-kit
1
1
Fork 0
mirror of https://github.com/mdbootstrap/mdb-ui-kit.git synced 2024-11-27 03:54:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #331 from grvcoelho/patch-2

Browse Source 
Fix ripples.js to allow multiple elements using ripples
This commit is contained in:
Fez Vrasta 2014-12-29 13:43:33 +01:00
commit c03c4ddf56
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scripts/ripples.js
View File

@ -67,14 +67,14 @@
/** /**
* Find the ripple wrapper * Find the ripple wrapper
*/ */
var $wrapper = $element.find(".ripple-wrapper"); var $wrapper = $element.children(".ripple-wrapper");
/** /**
* Get relY and relX positions * Get relY and relX positions
*/ */
var relY = self.getRelY(event); var relY = self.getRelY($wrapper, event);
var relX = self.getRelX(event); var relX = self.getRelX($wrapper, event);
/** /**
@ -88,7 +88,7 @@
/** /**
* Get the ripple color * Get the ripple color
*/ */
var rippleColor = self.getRippleColor(); var rippleColor = self.getRipplesColor();
/** /**
@ -159,9 +159,8 @@
/** /**
* Get the relX * Get the relX
*/ */
Ripples.prototype.getRelX = function(event) { Ripples.prototype.getRelX = function($wrapper, event) {
var $element = this.element; var wrapperOffset = $wrapper.offset();
var wrapperOffset = $element.find(".ripple-wrapper").offset();
if(!self.isTouch()) { if(!self.isTouch()) {
/** /**
@ -187,9 +186,8 @@
/** /**
* Get the relY * Get the relY
*/ */
Ripples.prototype.getRelY = function(event) { Ripples.prototype.getRelY = function($wrapper, event) {
var $element = this.element; var wrapperOffset = $wrapper.offset();
var wrapperOffset = $element.find(".ripple-wrapper").offset();
if(!self.isTouch()) { if(!self.isTouch()) {
/** /**
@ -215,7 +213,7 @@
/** /**
* Get the ripple color * Get the ripple color
*/ */
Ripples.prototype.getRippleColor = function() { Ripples.prototype.getRipplesColor = function() {
var $element = this.element; var $element = this.element;
var color = $element.data("ripple-color") ? $element.data("ripple-color") : window.getComputedStyle($element[0]).color; var color = $element.data("ripple-color") ? $element.data("ripple-color") : window.getComputedStyle($element[0]).color;