Skip to content
Permalink
Browse files

Resizable: Patched the alsoResize plugin to fix 2 critical bugs. Fixe…

…s #5694 - Invalid reference in UI Resizable hack for Opera. Fixes #5662/5695/3842 - When resizing from top or left edge, Dialog adds top/left CSS values to content element. Enhances Dialog - Allows dialog-content to have position:relative to 'contain' floated and positioned elements. Bug Demo for #5662 - http://layout.jquery-dev.net/samples/ui_dialog_bug.html
  • Loading branch information
allpro authored and scottgonzalez committed Jun 10, 2010
1 parent a8311f9 commit a78d5ee4c8c21b2da2631d51a74779e958793c9d
Showing with 33 additions and 20 deletions.
  1. +33 −20 ui/jquery.ui.resizable.js
@@ -528,47 +528,49 @@ $.extend($.ui.resizable, {

$.ui.plugin.add("resizable", "alsoResize", {

start: function(event, ui) {

start: function (event, ui) {
var self = $(this).data("resizable"), o = self.options;

var _store = function(exp) {
var _store = function (exp) {
$(exp).each(function() {
$(this).data("resizable-alsoresize", {
width: parseInt($(this).width(), 10), height: parseInt($(this).height(), 10),
left: parseInt($(this).css('left'), 10), top: parseInt($(this).css('top'), 10)
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()
});
});
};

if (typeof(o.alsoResize) == 'object' && !o.alsoResize.parentNode) {
if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
else { $.each(o.alsoResize, function(exp, c) { _store(exp); }); }
if (o.alsoResize.length) { o.alsoResize = o.alsoResize[0]; _store(o.alsoResize); }
else { $.each(o.alsoResize, function (exp) { _store(exp); }); }
}else{
_store(o.alsoResize);
}
},

resize: function(event, ui){
resize: function (event, ui) {
var self = $(this).data("resizable"), o = self.options, os = self.originalSize, op = self.originalPosition;

var delta = {
height: (self.size.height - os.height) || 0, width: (self.size.width - os.width) || 0,
top: (self.position.top - op.top) || 0, left: (self.position.left - op.left) || 0
},

_alsoResize = function(exp, c) {
_alsoResize = function (exp, c) {
$(exp).each(function() {
var el = $(this), start = $(this).data("resizable-alsoresize"), style = {}, css = c && c.length ? c : ['width', 'height', 'top', 'left'];
var el = $(this), start = $(this).data("resizable-alsoresize"), style = {},
css = c && c.length ? c : el.parents(ui.originalElement[0]).length ? ['width', 'height'] : ['width', 'height', 'top', 'left'];

$.each(css || ['width', 'height', 'top', 'left'], function(i, prop) {
$.each(css, function (i, prop) {
var sum = (start[prop]||0) + (delta[prop]||0);
if (sum && sum >= 0)
style[prop] = sum || null;
});

//Opera fixing relative position
if (/relative/.test(el.css('position')) && $.browser.opera) {
// Opera fixing relative position
if ($.browser.opera && /relative/.test(el.css('position'))) {
self._revertToRelativePosition = true;
el.css({ position: 'absolute', top: 'auto', left: 'auto' });
}
@@ -578,22 +580,33 @@ $.ui.plugin.add("resizable", "alsoResize", {
};

if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
$.each(o.alsoResize, function(exp, c) { _alsoResize(exp, c); });
$.each(o.alsoResize, function (exp, c) { _alsoResize(exp, c); });
}else{
_alsoResize(o.alsoResize);
}
},

stop: function(event, ui){
stop: function (event, ui) {
var self = $(this).data("resizable");

//Opera fixing relative position
if (self._revertToRelativePosition && $.browser.opera) {
_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;
el.css({ position: 'relative' });
if (typeof(o.alsoResize) == 'object' && !o.alsoResize.nodeType) {
$.each(o.alsoResize, function (exp) { _reset(exp); });
}else{
_reset(o.alsoResize);
}
}

$(this).removeData("resizable-alsoresize-start");
$(this).removeData("resizable-alsoresize");
}
});

0 comments on commit a78d5ee

Please sign in to comment.
You can’t perform that action at this time.