Skip to content
Permalink
Browse files

Fixed #3954

  • Loading branch information
eduardolundgren committed Jan 28, 2009
1 parent 1ad50e2 commit a853e4fd17c61bf74a87c30f75401ec6fb8879ec
Showing with 13 additions and 7 deletions.
  1. +13 −7 ui/ui.resizable.js
@@ -214,8 +214,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {

_mouseStart: function(event) {

var o = this.options, iniPos = this.element.position(), el = this.element,
num = function(v) { return parseInt(v, 10) || 0; };
var o = this.options, iniPos = this.element.position(), el = this.element;

this.resizing = true;
this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
@@ -299,7 +298,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
_mouseStop: function(event) {

this.resizing = false;
var o = this.options, num = function(v) { return parseInt(v, 10) || 0; }, self = this;
var o = this.options, self = this;

if(this._helper) {
var pr = this.proportionallyResize, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
@@ -665,10 +664,13 @@ $.ui.plugin.add("resizable", "containment", {
}

// i'm a node, so compute top, left, right, bottom
else{
self.containerOffset = $(ce).offset();
self.containerPosition = $(ce).position();
self.containerSize = { height: $(ce).innerHeight(), width: $(ce).innerWidth() };
else {
var element = $(ce), p = [];
$([ "Top", "Right", "Left", "Bottom" ]).each(function(i, name) { p[i] = num(element.css("padding" + name)); });

self.containerOffset = element.offset();
self.containerPosition = element.position();
self.containerSize = { height: (element.innerHeight() - p[3]), width: (element.innerWidth() - p[1]) };

var co = self.containerOffset, ch = self.containerSize.height, cw = self.containerSize.width,
width = ($.ui.hasScroll(ce, "left") ? ce.scrollWidth : cw ), height = ($.ui.hasScroll(ce) ? ce.scrollHeight : ch);
@@ -786,4 +788,8 @@ $.ui.plugin.add("resizable", "grid", {

});

var num = function(v) {
return parseInt(v, 10) || 0;
};

})(jQuery);

0 comments on commit a853e4f

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