Skip to content
This repository
Browse code

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

…quest

Conflicts:
	jquery.quicksand.js
  • Loading branch information...
commit df997e1da09b2a097b8ab60a68aab9c75b4939b1 2 parents e8e02c3 + f93aca1
Alexandre Rocha Lima e Marcondes authored October 29, 2012

Showing 1 changed file with 8 additions and 5 deletions. Show diff stats Hide diff stats

  1. 13  jquery.quicksand.js
13  jquery.quicksand.js
@@ -62,7 +62,7 @@ Github site: http://github.com/razorjack/quicksand
62 62
             
63 63
             var $source = $(this).find(options.selector); // source collection items
64 64
             
65  
-            var width = $($source).innerWidth();  // need for the responsive design   
  65
+            var width = $($source).innerWidth();  // need for the responsive design
66 66
 
67 67
             // Replace the collection and quit if IE6
68 68
             if ($.browser.msie && $.browser.version.substr(0,1)<7) {
@@ -189,11 +189,9 @@ Github site: http://github.com/razorjack/quicksand
189 189
 
190 190
 				if (!options.adjustWidth)
191 191
 				{
192  
-                	rawObj.style.width = sourceWidth;
  192
+                	rawObj.style.width = (width + 'px'); // sets the width to the current element with even if it has been changed by a responsive design
193 193
 				}
194 194
 
195  
-                rawObj.style.width = (width + 'px'); // sets the width to the current element with even if it has been changed by a responsive design
196  
-
197 195
                 rawObj.style.top = (offsets[i].top - parseFloat(rawObj.style.marginTop) - correctionOffset.top + dy) + 'px';
198 196
                 rawObj.style.left = (offsets[i].left - parseFloat(rawObj.style.marginLeft) - correctionOffset.left + dx) + 'px';
199 197
 
@@ -348,7 +346,12 @@ Github site: http://github.com/razorjack/quicksand
348 346
                     var rawDestElement = d.get(0);
349 347
                     rawDestElement.style.position = 'absolute';
350 348
                     rawDestElement.style.margin = '0';
351  
-                    rawDestElement.style.width = width + 'px'; // sets the width to the current element with even if it has been changed by a responsive design  
  349
+
  350
+					if (!options.adjustWidth)
  351
+					{
  352
+						rawDestElement.style.width = width + 'px'; // sets the width to the current element with even if it has been changed by a responsive design  
  353
+					}
  354
+
352 355
                     rawDestElement.style.top = destElement.offset().top - correctionOffset.top + 'px';
353 356
                     rawDestElement.style.left = destElement.offset().left - correctionOffset.left + 'px';
354 357
 

0 notes on commit df997e1

Please sign in to comment.
Something went wrong with that request. Please try again.