Skip to content

Commit

Permalink
Resizable: Removed Opera relative/absolute positioning exception code…
Browse files Browse the repository at this point in the history
…. Fixed #6763 - ui.dialog & resizable & button & opera 11

(cherry picked from commit f5e5971)
  • Loading branch information
tjvantoll authored and scottgonzalez committed Feb 8, 2012
1 parent edd52ed commit 28fb436
Showing 1 changed file with 1 addition and 35 deletions.
36 changes: 1 addition & 35 deletions ui/jquery.ui.resizable.js
Expand Up @@ -50,10 +50,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({
Expand Down Expand Up @@ -247,10 +243,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'));
Expand Down Expand Up @@ -566,8 +558,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)
});
});
};
Expand Down Expand Up @@ -599,12 +590,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);
});
};
Expand All @@ -617,25 +602,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");
}
});
Expand Down

0 comments on commit 28fb436

Please sign in to comment.