Merge pull request #593 from tjvantoll/bug_6763

Resizable: Removed Opera relative/absolute positioning exception code.
This commit is contained in:
Scott González 2012-02-08 08:43:16 -08:00
commit a3abb3b5f5

View File

@ -51,10 +51,6 @@ $.widget("ui.resizable", $.ui.mouse, {
//Wrap the element if it cannot hold child nodes
if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
//Opera fix for relative positioning
if (/relative/.test(this.element.css('position')) && $.browser.opera)
this.element.css({ position: 'relative', top: 'auto', left: 'auto' });
//Create a wrapper element and set the wrapper to the new current internal element
this.element.wrap(
$('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({
@ -248,10 +244,6 @@ $.widget("ui.resizable", $.ui.mouse, {
el.css({ position: 'absolute', top: iniPos.top, left: iniPos.left });
}
//Opera fixing relative position
if ($.browser.opera && (/relative/).test(el.css('position')))
el.css({ position: 'relative', top: 'auto', left: 'auto' });
this._renderProxy();
var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
@ -563,8 +555,7 @@ $.ui.plugin.add("resizable", "alsoResize", {
var el = $(this);
el.data("resizable-alsoresize", {
width: parseInt(el.width(), 10), height: parseInt(el.height(), 10),
left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10),
position: el.css('position') // to reset Opera on stop()
left: parseInt(el.css('left'), 10), top: parseInt(el.css('top'), 10)
});
});
};
@ -596,12 +587,6 @@ $.ui.plugin.add("resizable", "alsoResize", {
style[prop] = sum || null;
});
// Opera fixing relative position
if ($.browser.opera && /relative/.test(el.css('position'))) {
self._revertToRelativePosition = true;
el.css({ position: 'absolute', top: 'auto', left: 'auto' });
}
el.css(style);
});
};
@ -614,25 +599,6 @@ $.ui.plugin.add("resizable", "alsoResize", {
},
stop: function (event, ui) {
var self = $(this).data("resizable"), o = self.options;
var _reset = function (exp) {
$(exp).each(function() {
var el = $(this);
// reset position for Opera - no need to verify it was changed
el.css({ position: el.data("resizable-alsoresize").position });
});
};
if (self._revertToRelativePosition) {
self._revertToRelativePosition = false;
if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
$.each(o.alsoResize, function (exp) { _reset(exp); });
}else{
_reset(o.alsoResize);
}
}
$(this).removeData("resizable-alsoresize");
}
});