Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge ed9e9e9 into 4bdbab9

  • Loading branch information...
commit 11710d0de67c2df6828d08e10f140af9cca78c3a 2 parents 4bdbab9 + ed9e9e9
authored June 16, 2011

Showing 1 changed file with 17 additions and 4 deletions. Show diff stats Hide diff stats

  1. 21  ui/jquery.ui.resizable.js
21  ui/jquery.ui.resizable.js
@@ -39,6 +39,12 @@ $.widget("ui.resizable", $.ui.mouse, {
39 39
 
40 40
 		var self = this, o = this.options;
41 41
 		this.element.addClass("ui-resizable");
  42
+		
  43
+		//If position is set to fixed but the browser doesn't support it (IE6), clear position to fix handle placement(see ticket #3628)
  44
+		$.offset.initialize();
  45
+		if( this.element.css( "position" ) === "fixed" && !$.offset.supportsFixedPosition ) {
  46
+			this.element.css( "position", "" );
  47
+		}
42 48
 
43 49
 		$.extend(this, {
44 50
 			_aspectRatio: !!(o.aspectRatio),
@@ -304,10 +310,17 @@ $.widget("ui.resizable", $.ui.mouse, {
304 310
 		// plugins callbacks need to be called first
305 311
 		this._propagate("resize", event);
306 312
 
307  
-		el.css({
308  
-			top: this.position.top + "px", left: this.position.left + "px",
309  
-			width: this.size.width + "px", height: this.size.height + "px"
310  
-		});
  313
+		//If position is fixed, do not adjust the position, just the size (see #3628)
  314
+		if( el.css( "position" ) === "fixed" ) {
  315
+			el.css({
  316
+				width: this.size.width + "px", height: this.size.height + "px"
  317
+			});
  318
+		} else {
  319
+			el.css({
  320
+				top: this.position.top + "px", left: this.position.left + "px",
  321
+				width: this.size.width + "px", height: this.size.height + "px"
  322
+			});
  323
+		}
311 324
 
312 325
 		if (!this._helper && this._proportionallyResizeElements.length)
313 326
 			this._proportionallyResize();

0 notes on commit 11710d0

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