Permalink
Browse files

Merge remote-tracking branch 'remotes/kiwiupover/master' into pull-re…

…quest

Conflicts:
	jquery.quicksand.js
  • Loading branch information...
2 parents e8e02c3 + f93aca1 commit df997e1da09b2a097b8ab60a68aab9c75b4939b1 @arlm arlm committed Oct 29, 2012
Showing with 8 additions and 5 deletions.
  1. +8 −5 jquery.quicksand.js
View
13 jquery.quicksand.js
@@ -62,7 +62,7 @@ Github site: http://github.com/razorjack/quicksand
var $source = $(this).find(options.selector); // source collection items
- var width = $($source).innerWidth(); // need for the responsive design
+ var width = $($source).innerWidth(); // need for the responsive design
// Replace the collection and quit if IE6
if ($.browser.msie && $.browser.version.substr(0,1)<7) {
@@ -189,11 +189,9 @@ Github site: http://github.com/razorjack/quicksand
if (!options.adjustWidth)
{
- rawObj.style.width = sourceWidth;
+ rawObj.style.width = (width + 'px'); // sets the width to the current element with even if it has been changed by a responsive design
}
- rawObj.style.width = (width + 'px'); // sets the width to the current element with even if it has been changed by a responsive design
-
rawObj.style.top = (offsets[i].top - parseFloat(rawObj.style.marginTop) - correctionOffset.top + dy) + 'px';
rawObj.style.left = (offsets[i].left - parseFloat(rawObj.style.marginLeft) - correctionOffset.left + dx) + 'px';
@@ -348,7 +346,12 @@ Github site: http://github.com/razorjack/quicksand
var rawDestElement = d.get(0);
rawDestElement.style.position = 'absolute';
rawDestElement.style.margin = '0';
- rawDestElement.style.width = width + 'px'; // sets the width to the current element with even if it has been changed by a responsive design
+
+ if (!options.adjustWidth)
+ {
+ rawDestElement.style.width = width + 'px'; // sets the width to the current element with even if it has been changed by a responsive design
+ }
+
rawDestElement.style.top = destElement.offset().top - correctionOffset.top + 'px';
rawDestElement.style.left = destElement.offset().left - correctionOffset.left + 'px';

0 comments on commit df997e1

Please sign in to comment.