Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Resizable: fix whitespace on containment plugin
- Loading branch information
1 parent
c03cb80
commit bae1a25
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
|
|
@@ -713,129 +713,159 @@ $.ui.plugin.add("resizable", "animate", { | ||
|
|
|
||
| }); | }); | ||
|
|
|
||
| $.ui.plugin.add( "resizable", "containment", { | |||
|
|
|
||
| start: function() { | start: function() { | ||
| var element, p, co, ch, cw, width, height, | var element, p, co, ch, cw, width, height, | ||
| that = $( this ).resizable( "instance" ), | |||
| o = that.options, | o = that.options, | ||
| el = that.element, | el = that.element, | ||
| oc = o.containment, | oc = o.containment, | ||
| ce = ( oc instanceof $ ) ? oc.get( 0 ) : ( /parent/.test( oc ) ) ? el.parent().get( 0 ) : oc; | |||
|
|
|
||
| if ( !ce ) { | |||
| return; | return; | ||
| } | } | ||
|
|
|
||
| that.containerElement = $( ce ); | |||
|
|
|
||
| if ( / document/.test( oc ) || oc === document ) { | |||
This comment has been minimized.
Sorry, something went wrong. |
|||
| that.containerOffset = { | |||
| left: 0, | |||
| top: 0 | |||
| }; | |||
| that.containerPosition = { | |||
| left: 0, | |||
| top: 0 | |||
| }; | |||
|
|
|
||
| that.parentData = { | that.parentData = { | ||
| element: $( document ), | |||
| left: 0, | |||
| top: 0, | |||
| width: $( document ).width(), | |||
| height: $( document ).height() || document.body.parentNode.scrollHeight | |||
| }; | }; | ||
This comment has been minimized.
Sorry, something went wrong. 
dekajp
Author
Contributor
|
|||
| } | } | ||
|
|
|
||
| // i'm a node, so compute top, left, right, bottom | // i'm a node, so compute top, left, right, bottom | ||
| else { | else { | ||
| element = $( ce ); | |||
| p = []; | p = []; | ||
| $([ "Top", "Right", "Left", "Bottom" ]).each(function( i, name ) { | |||
| p[ i ] = that._num( element.css( "padding" + name ) ); | |||
| }); | |||
|
|
|
||
| that.containerOffset = element.offset(); | that.containerOffset = element.offset(); | ||
| that.containerPosition = element.position(); | that.containerPosition = element.position(); | ||
| that.containerSize = { | |||
| height: ( element.innerHeight() - p[ 3 ] ), | |||
| width: ( element.innerWidth() - p[ 1 ] ) | |||
| }; | |||
|
|
|
||
| co = that.containerOffset; | co = that.containerOffset; | ||
| ch = that.containerSize.height; | ch = that.containerSize.height; | ||
| cw = that.containerSize.width; | cw = that.containerSize.width; | ||
| width = ( that._hasScroll ( ce, "left" ) ? ce.scrollWidth : cw ); | |||
| height = ( that._hasScroll ( ce ) ? ce.scrollHeight : ch ) ; | |||
|
|
|
||
| that.parentData = { | that.parentData = { | ||
| element: ce, | |||
| left: co.left, | |||
| top: co.top, | |||
| width: width, | |||
| height: height | |||
| }; | }; | ||
| } | } | ||
| }, | }, | ||
|
|
|
||
| resize: function( event ) { | resize: function( event ) { | ||
| var woset, hoset, isParent, isOffsetRelative, | var woset, hoset, isParent, isOffsetRelative, | ||
| that = $( this ).resizable( "instance" ), | |||
| o = that.options, | o = that.options, | ||
| co = that.containerOffset, | |||
| cp = that.position, | |||
| pRatio = that._aspectRatio || event.shiftKey, | pRatio = that._aspectRatio || event.shiftKey, | ||
| cop = { | |||
| top: 0, | |||
| left: 0 | |||
| }, | |||
| ce = that.containerElement; | |||
|
|
|
||
| if ( ce[ 0 ] !== document && ( /static/ ).test( ce.css( "position" ) ) ) { | |||
| cop = co; | cop = co; | ||
| } | } | ||
|
|
|
||
| if ( cp.left < ( that._helper ? co.left : 0 ) ) { | |||
| that.size.width = that.size.width + ( that._helper ? ( that.position.left - co.left ) : ( that.position.left - cop.left ) ); | |||
| if ( pRatio ) { | |||
| that.size.height = that.size.width / that.aspectRatio; | that.size.height = that.size.width / that.aspectRatio; | ||
| } | } | ||
| that.position.left = o.helper ? co.left : 0; | that.position.left = o.helper ? co.left : 0; | ||
| } | } | ||
|
|
|
||
| if ( cp.top < ( that._helper ? co.top : 0 ) ) { | |||
| that.size.height = that.size.height + ( that._helper ? ( that.position.top - co.top ) : that.position.top ); | |||
| if ( pRatio ) { | |||
| that.size.width = that.size.height * that.aspectRatio; | that.size.width = that.size.height * that.aspectRatio; | ||
| } | } | ||
| that.position.top = that._helper ? co.top : 0; | that.position.top = that._helper ? co.top : 0; | ||
| } | } | ||
|
|
|
||
| that.offset.left = that.parentData.left + that.position.left; | |||
| that.offset.top = that.parentData.top + that.position.top; | |||
|
|
|
||
| woset = Math.abs( ( that._helper ? that.offset.left - cop.left : ( that.offset.left - co.left ) ) + that.sizeDiff.width ); | woset = Math.abs( ( that._helper ? that.offset.left - cop.left : ( that.offset.left - co.left ) ) + that.sizeDiff.width ); | ||
| hoset = Math.abs( ( that._helper ? that.offset.top - cop.top : ( that.offset.top - co.top ) ) + that.sizeDiff.height ); | hoset = Math.abs( ( that._helper ? that.offset.top - cop.top : ( that.offset.top - co.top ) ) + that.sizeDiff.height ); | ||
|
|
|
||
| isParent = that.containerElement.get( 0 ) === that.element.parent().get( 0 ); | |||
| isOffsetRelative = /relative|absolute/.test( that.containerElement.css( "position" ) ); | |||
|
|
|
||
| if ( isParent && isOffsetRelative ) { | if ( isParent && isOffsetRelative ) { | ||
| woset -= Math.abs( that.parentData.left ); | woset -= Math.abs( that.parentData.left ); | ||
| } | } | ||
|
|
|
||
| if ( woset + that.size.width >= that.parentData.width ) { | |||
| that.size.width = that.parentData.width - woset; | that.size.width = that.parentData.width - woset; | ||
| if ( pRatio ) { | |||
| that.size.height = that.size.width / that.aspectRatio; | that.size.height = that.size.width / that.aspectRatio; | ||
| } | } | ||
| } | } | ||
|
|
|
||
| if ( hoset + that.size.height >= that.parentData.height ) { | |||
| that.size.height = that.parentData.height - hoset; | that.size.height = that.parentData.height - hoset; | ||
| if ( pRatio ) { | |||
| that.size.width = that.size.height * that.aspectRatio; | that.size.width = that.size.height * that.aspectRatio; | ||
| } | } | ||
| } | } | ||
| }, | }, | ||
|
|
|
||
| stop: function(){ | stop: function(){ | ||
| var that = $( this ).resizable( "instance" ), | |||
| o = that.options, | o = that.options, | ||
| co = that.containerOffset, | co = that.containerOffset, | ||
| cop = that.containerPosition, | cop = that.containerPosition, | ||
| ce = that.containerElement, | ce = that.containerElement, | ||
| helper = $( that.helper ), | |||
| ho = helper.offset(), | ho = helper.offset(), | ||
| w = helper.outerWidth() - that.sizeDiff.width, | w = helper.outerWidth() - that.sizeDiff.width, | ||
| h = helper.outerHeight() - that.sizeDiff.height; | h = helper.outerHeight() - that.sizeDiff.height; | ||
|
|
|
||
| if ( that._helper && !o.animate && ( /relative/ ).test( ce.css( "position" ) ) ) { | |||
| $( this ).css({ | |||
| left: ho.left - cop.left - co.left, | |||
| width: w, | |||
| height: h | |||
| }); | |||
| } | } | ||
|
|
|
||
| if ( that._helper && !o.animate && ( /static/ ).test( ce.css( "position" ) ) ) { | |||
| $( this ).css({ | |||
| left: ho.left - cop.left - co.left, | |||
| width: w, | |||
| height: h | |||
| }); | |||
| } | } | ||
| } | } | ||
| }); | }); | ||
|
|
|
||
|
|
|||
@mikesherov @jzaefferer - one little whiltespace and 78 failures :)