]> source.dussan.org Git - jquery-ui.git/commitdiff
resizable:
authorPaul Bakaus <paul.bakaus@googlemail.com>
Thu, 22 Jan 2009 14:53:53 +0000 (14:53 +0000)
committerPaul Bakaus <paul.bakaus@googlemail.com>
Thu, 22 Jan 2009 14:53:53 +0000 (14:53 +0000)
- knobHandles and default themes + theme detection removed (fixes #3906)
- partial refactor

ui/ui.resizable.js

index 410d9f7ca0752e6e2841a651feca01d2ef187d9b..4e574fe405ede30f8d0f6dfa79e1b4b9ef159631 100644 (file)
@@ -16,158 +16,100 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
        _init: function() {
 
-               var self = this, o = this.options;
-
-               var elpos = this.element.css('position');
-
-               this.originalElement = this.element;
-
-               // simulate .ui-resizable { position: relative; }
-               this.element.addClass("ui-resizable").css({ position: /static/.test(elpos) ? 'relative' : elpos });
-
-               $.extend(o, {
+               var self = this, o = this.options;      
+               this.element.addClass("ui-resizable");
+                       
+               $.extend(this, {
                        _aspectRatio: !!(o.aspectRatio),
-                       helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null,
-                       knobHandles: o.knobHandles === true ? 'ui-resizable-knob-handle' : o.knobHandles
+                       aspectRatio: o.aspectRatio,
+                       originalElement: this.element,
+                       proportionallyResize: o.proportionallyResize  ? [o.proportionallyResize] : [],
+                       _helper: o.helper || o.ghost || o.animate ? o.helper || 'ui-resizable-helper' : null
                });
 
-               //Default Theme
-               var aBorder = '1px solid #DEDEDE';
-
-               o.defaultTheme = {
-                       'ui-resizable': { display: 'block' },
-                       'ui-resizable-handle': { position: 'absolute', background: '#F2F2F2', fontSize: '0.1px' },
-                       'ui-resizable-n': { cursor: 'n-resize', height: '4px', left: '0px', right: '0px', borderTop: aBorder },
-                       'ui-resizable-s': { cursor: 's-resize', height: '4px', left: '0px', right: '0px', borderBottom: aBorder },
-                       'ui-resizable-e': { cursor: 'e-resize', width: '4px', top: '0px', bottom: '0px', borderRight: aBorder },
-                       'ui-resizable-w': { cursor: 'w-resize', width: '4px', top: '0px', bottom: '0px', borderLeft: aBorder },
-                       'ui-resizable-se': { cursor: 'se-resize', width: '4px', height: '4px', borderRight: aBorder, borderBottom: aBorder },
-                       'ui-resizable-sw': { cursor: 'sw-resize', width: '4px', height: '4px', borderBottom: aBorder, borderLeft: aBorder },
-                       'ui-resizable-ne': { cursor: 'ne-resize', width: '4px', height: '4px', borderRight: aBorder, borderTop: aBorder },
-                       'ui-resizable-nw': { cursor: 'nw-resize', width: '4px', height: '4px', borderLeft: aBorder, borderTop: aBorder }
-               };
-
-               o.knobTheme = {
-                       'ui-resizable-handle': { background: '#F2F2F2', border: '1px solid #808080', height: '8px', width: '8px' },
-                       'ui-resizable-n': { cursor: 'n-resize', top: '0px', left: '45%' },
-                       'ui-resizable-s': { cursor: 's-resize', bottom: '0px', left: '45%' },
-                       'ui-resizable-e': { cursor: 'e-resize', right: '0px', top: '45%' },
-                       'ui-resizable-w': { cursor: 'w-resize', left: '0px', top: '45%' },
-                       'ui-resizable-se': { cursor: 'se-resize', right: '0px', bottom: '0px' },
-                       'ui-resizable-sw': { cursor: 'sw-resize', left: '0px', bottom: '0px' },
-                       'ui-resizable-nw': { cursor: 'nw-resize', left: '0px', top: '0px' },
-                       'ui-resizable-ne': { cursor: 'ne-resize', right: '0px', top: '0px' }
-               };
-
-               o._nodeName = this.element[0].nodeName;
-
                //Wrap the element if it cannot hold child nodes
-               if(o._nodeName.match(/canvas|textarea|input|select|button|img/i)) {
-                       var el = this.element;
+               if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)) {
 
-                       //Opera fixing relative position
-                       if (/relative/.test(el.css('position')) && $.browser.opera)
-                               el.css({ position: 'relative', top: 'auto', left: 'auto' });
+                       //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
-                       el.wrap(
-                               $('<div class="ui-wrapper"      style="overflow: hidden;"></div>').css( {
-                                       position: el.css('position'),
-                                       width: el.outerWidth(),
-                                       height: el.outerHeight(),
-                                       top: el.css('top'),
-                                       left: el.css('left')
+                       this.element.wrap(
+                               $('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({
+                                       position: this.element.css('position'),
+                                       width: this.element.outerWidth(),
+                                       height: this.element.outerHeight(),
+                                       top: this.element.css('top'),
+                                       left: this.element.css('left')
                                })
                        );
 
-                       var oel = this.element; this.element = this.element.parent();
-
-                       // store instance on wrapper
-                       this.element.data('resizable', this);
+                       //Overwrite the original this.element
+                       this.element = this.element.parent();
+                       this.elementIsWrapper = true;
 
                        //Move margins to the wrapper
-                       this.element.css({ marginLeft: oel.css("marginLeft"), marginTop: oel.css("marginTop"),
-                               marginRight: oel.css("marginRight"), marginBottom: oel.css("marginBottom")
-                       });
-
-                       oel.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
+                       this.element.css({ marginLeft: this.originalElement.css("marginLeft"), marginTop: this.originalElement.css("marginTop"), marginRight: this.originalElement.css("marginRight"), marginBottom: this.originalElement.css("marginBottom") });
+                       this.originalElement.css({ marginLeft: 0, marginTop: 0, marginRight: 0, marginBottom: 0});
 
                        //Prevent Safari textarea resize
-                       if ($.browser.safari && o.preventDefault) oel.css('resize', 'none');
+                       if ($.browser.safari && o.preventDefault) this.originalElement.css('resize', 'none');
 
-                       o.proportionallyResize = oel.css({ position: 'static', zoom: 1, display: 'block' });
+                       //Push the actual element to our proportionallyResize internal array
+                       this.proportionallyResize.push(this.originalElement.css({ position: 'static', zoom: 1, display: 'block' }));
 
-                       // avoid IE jump
-                       this.element.css({ margin: oel.css('margin') });
+                       // avoid IE jump (hard set the margin)
+                       this.originalElement.css({ margin: this.originalElement.css('margin') });
 
                        // fix handlers offset
                        this._proportionallyResize();
+                       
                }
 
-               if(!o.handles) o.handles = !$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' };
-               if(o.handles.constructor == String) {
-
-                       o.zIndex = o.zIndex || 1000;
-
-                       if(o.handles == 'all') o.handles = 'n,e,s,w,se,sw,ne,nw';
+               this.handles = o.handles || (!$('.ui-resizable-handle', this.element).length ? "e,s,se" : { n: '.ui-resizable-n', e: '.ui-resizable-e', s: '.ui-resizable-s', w: '.ui-resizable-w', se: '.ui-resizable-se', sw: '.ui-resizable-sw', ne: '.ui-resizable-ne', nw: '.ui-resizable-nw' });
+               if(this.handles.constructor == String) {
 
-                       var n = o.handles.split(","); o.handles = {};
-
-                       // insertions are applied when don't have theme loaded
-                       var insertionsDefault = {
-                               handle: 'position: absolute; display: none; overflow:hidden;',
-                               n: 'top: 0pt; width:100%;',
-                               e: 'right: 0pt; height:100%;',
-                               s: 'bottom: 0pt; width:100%;',
-                               w: 'left: 0pt; height:100%;',
-                               se: 'bottom: 0pt; right: 0px;',
-                               sw: 'bottom: 0pt; left: 0px;',
-                               ne: 'top: 0pt; right: 0px;',
-                               nw: 'top: 0pt; left: 0px;'
-                       };
+                       if(this.handles == 'all') this.handles = 'n,e,s,w,se,sw,ne,nw';
+                       var n = this.handles.split(","); this.handles = {};
 
                        for(var i = 0; i < n.length; i++) {
-                               var handle = $.trim(n[i]), dt = o.defaultTheme, hname = 'ui-resizable-'+handle, loadDefault = !$.ui.css(hname) && !o.knobHandles, userKnobClass = $.ui.css('ui-resizable-knob-handle'),
-                                                       allDefTheme = $.extend(dt[hname], dt['ui-resizable-handle']), allKnobTheme = $.extend(o.knobTheme[hname], !userKnobClass ? o.knobTheme['ui-resizable-handle'] : {});
-
+                               
+                               var handle = $.trim(n[i]), hname = 'ui-resizable-'+handle;
+                               var axis = $('<div class="ui-resizable-handle ' + hname + '"></div>');
+                               
                                // increase zIndex of sw, se, ne, nw axis
-                               var applyZIndex = /sw|se|ne|nw/.test(handle) ? { zIndex: ++o.zIndex } : {};
-
-                               var defCss = (loadDefault ? insertionsDefault[handle] : ''),
-                                       axis = $(['<div class="ui-resizable-handle ', hname, '" style="', defCss, insertionsDefault.handle, '"></div>'].join('')).css( applyZIndex );
+                               //TODO : this modifies original option
+                               if(/sw|se|ne|nw/.test(handle)) axis.css({ zIndex: ++o.zIndex });
 
+                               //TODO : What's going on here?
                                if ('se' == handle) {
                                        axis.addClass('ui-icon ui-icon-gripsmall-diagonal-se');
                                };
 
-                               o.handles[handle] = '.ui-resizable-'+handle;
-
-                               this.element.append(
-                                       //Theme detection, if not loaded, load o.defaultTheme
-                                       axis.css( loadDefault ? allDefTheme : {} )
-                                               // Load the knobHandle css, fix width, height, top, left...
-                                               .css( o.knobHandles ? allKnobTheme : {} ).addClass(o.knobHandles ? 'ui-resizable-knob-handle' : '').addClass(o.knobHandles)
-                               );
+                               //Insert into internal handles object and append to element
+                               this.handles[handle] = '.ui-resizable-'+handle;
+                               this.element.append(axis);
                        }
 
-                       if (o.knobHandles) this.element.addClass('ui-resizable-knob').css( !$.ui.css('ui-resizable-knob') ? { /*border: '1px #fff dashed'*/ } : {} );
                }
 
                this._renderAxis = function(target) {
+                       
                        target = target || this.element;
 
-                       for(var i in o.handles) {
-                               if(o.handles[i].constructor == String)
-                                       o.handles[i] = $(o.handles[i], this.element).show();
+                       for(var i in this.handles) {
+                               
+                               if(this.handles[i].constructor == String)
+                                       this.handles[i] = $(this.handles[i], this.element).show();
 
                                if (o.transparent)
-                                       o.handles[i].css({opacity:0});
+                                       this.handles[i].css({ opacity: 0 });
 
                                //Apply pad to wrapper element, needed to fix axis position (textarea, inputs, scrolls)
-                               if (this.element.is('.ui-wrapper') &&
-                                       o._nodeName.match(/textarea|input|select|button/i)) {
+                               if (this.elementIsWrapper && this.originalElement[0].nodeName.match(/textarea|input|select|button/i)) {
 
-                                       var axis = $(o.handles[i], this.element), padWrapper = 0;
+                                       var axis = $(this.handles[i], this.element), padWrapper = 0;
 
                                        //Checking the correct pad and border
                                        padWrapper = /sw|ne|nw|se|n|s/.test(i) ? axis.outerHeight() : axis.outerWidth();
@@ -182,48 +124,58 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                                                target.css(padPos, padWrapper);
 
                                        this._proportionallyResize();
+                                       
                                }
-                               if(!$(o.handles[i]).length) continue;
+                               
+                               //TODO: What's that good for? There's not anything to be executed left
+                               if(!$(this.handles[i]).length)
+                                       continue;
+                               
                        }
                };
 
+               //TODO: make renderAxis a prototype function
                this._renderAxis(this.element);
-               o._handles = $('.ui-resizable-handle', self.element);
+               
+               this._handles = $('.ui-resizable-handle', this.element);
 
                if (o.disableSelection)
-                       o._handles.disableSelection();
+                       this._handles.disableSelection();
 
                //Matching axis name
-               o._handles.mouseover(function() {
-                       if (!o.resizing) {
+               this._handles.mouseover(function() {
+                       if (!self.resizing) {
                                if (this.className)
                                        var axis = this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);
                                //Axis, default = se
-                               self.axis = o.axis = axis && axis[1] ? axis[1] : 'se';
+                               self.axis = axis && axis[1] ? axis[1] : 'se';
                        }
                });
 
                //If we want to auto hide the elements
                if (o.autoHide) {
-                       o._handles.hide();
-                       $(self.element).addClass("ui-resizable-autohide").hover(function() {
-                               $(this).removeClass("ui-resizable-autohide");
-                               o._handles.show();
-                       },
-                       function(){
-                               if (!o.resizing) {
-                                       $(this).addClass("ui-resizable-autohide");
-                                       o._handles.hide();
-                               }
-                       });
+                       this._handles.hide();
+                       $(this.element)
+                               .addClass("ui-resizable-autohide")
+                               .hover(function() {
+                                       $(this).removeClass("ui-resizable-autohide");
+                                       self._handles.show();
+                               },
+                               function(){
+                                       if (!self.resizing) {
+                                               $(this).addClass("ui-resizable-autohide");
+                                               self._handles.hide();
+                                       }
+                               });
                }
 
+               //Initialize the mouse interaction
                this._mouseInit();
+               
        },
 
        destroy: function() {
-               var el = this.element, wrapped = el.children(".ui-resizable").get(0);
-
+               
                this._mouseDestroy();
 
                var _destroy = function(exp) {
@@ -231,34 +183,32 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                                .removeData("resizable").unbind(".resizable").find('.ui-resizable-handle').remove();
                };
 
-               _destroy(el);
-
-               if (el.is('.ui-wrapper') && wrapped) {
-                       el.parent().append(
-                               $(wrapped).css({
-                                       position: el.css('position'),
-                                       width: el.outerWidth(),
-                                       height: el.outerHeight(),
-                                       top: el.css('top'),
-                                       left: el.css('left')
+               //TODO: Unwrap at same DOM position
+               if (this.elementIsWrapper) {
+                       _destroy(this.element);
+                       this.wrapper.parent().append(
+                               this.originalElement.css({
+                                       position: this.wrapper.css('position'),
+                                       width: this.wrapper.outerWidth(),
+                                       height: this.wrapper.outerHeight(),
+                                       top: this.wrapper.css('top'),
+                                       left: this.wrapper.css('left')
                                })
                        ).end().remove();
-
-                       _destroy(wrapped);
                }
+               
+               _destroy(this.originalElement);
+               
        },
 
        _mouseCapture: function(event) {
 
-               if(this.options.disabled) return false;
-
                var handle = false;
-               for(var i in this.options.handles) {
-                       if($(this.options.handles[i])[0] == event.target) handle = true;
+               for(var i in this.handles) {
+                       if($(this.handles[i])[0] == event.target) handle = true;
                }
-               if (!handle) return false;
 
-               return true;
+               return this.options.disabled || !!handle;
 
        },
 
@@ -266,12 +216,12 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
                var o = this.options, iniPos = this.element.position(), el = this.element,
                        num = function(v) { return parseInt(v, 10) || 0; }, ie6 = $.browser.msie && $.browser.version < 7;
-               o.resizing = true;
-               o.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
+                       
+               this.resizing = true;
+               this.documentScroll = { top: $(document).scrollTop(), left: $(document).scrollLeft() };
 
                // bugfix #1749
                if (el.is('.ui-draggable') || (/absolute/).test(el.css('position'))) {
-
                        // sOffset decides if document scrollOffset will be added to the top/left of the resizable element
                        var sOffset = $.browser.msie && !o.containment && (/absolute/).test(el.css('position')) && !(/relative/).test(el.parent().css('position'));
                        var dscrollt = sOffset ? o.documentScroll.top : 0, dscrolll = sOffset ? o.documentScroll.left : 0;
@@ -288,21 +238,21 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                var curleft = num(this.helper.css('left')), curtop = num(this.helper.css('top'));
 
                if (o.containment) {
-                       curleft += $(o.containment).scrollLeft()||0;
-                       curtop += $(o.containment).scrollTop()||0;
+                       curleft += $(o.containment).scrollLeft() || 0;
+                       curtop += $(o.containment).scrollTop() || 0;
                }
 
                //Store needed variables
                this.offset = this.helper.offset();
                this.position = { left: curleft, top: curtop };
-               this.size = o.helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
-               this.originalSize = o.helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+               this.size = this._helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+               this.originalSize = this._helper || ie6 ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
                this.originalPosition = { left: curleft, top: curtop };
                this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
                this.originalMousePosition = { left: event.pageX, top: event.pageY };
 
                //Aspect Ratio
-               o.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height)||1);
+               this.aspectRatio = (typeof o.aspectRatio == 'number') ? o.aspectRatio : ((this.originalSize.width / this.originalSize.height) || 1);
 
                if (o.preserveCursor) {
                    var cursor = $('.ui-resizable-' + this.axis).css('cursor');
@@ -326,7 +276,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                // Calculate the attrs that will be change
                var data = trigger.apply(this, [event, dx, dy]), ie6 = $.browser.msie && $.browser.version < 7, csdif = this.sizeDiff;
 
-               if (o._aspectRatio || event.shiftKey)
+               if (this._aspectRatio || event.shiftKey)
                        data = this._updateRatio(data, event);
 
                data = this._respectSize(data, event);
@@ -339,7 +289,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                        width: this.size.width + "px", height: this.size.height + "px"
                });
 
-               if (!o.helper && o.proportionallyResize)
+               if (!this._helper && this.proportionallyResize.length)
                        this._proportionallyResize();
 
                this._updateCache(data);
@@ -352,12 +302,12 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
        _mouseStop: function(event) {
 
-               this.options.resizing = false;
+               this.resizing = false;
                var o = this.options, num = function(v) { return parseInt(v, 10) || 0; }, self = this;
 
-               if(o.helper) {
-                       var pr = o.proportionallyResize, ista = pr && (/textarea/i).test(pr.get(0).nodeName),
-                                               soffseth = ista && $.ui.hasScroll(pr.get(0), 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
+               if(this._helper) {
+                       var pr = this.proportionallyResize, ista = pr.length && (/textarea/i).test(pr[0].nodeName),
+                                               soffseth = ista && $.ui.hasScroll(pr[0], 'left') /* TODO - jump height */ ? 0 : self.sizeDiff.height,
                                                        soffsetw = ista ? 0 : self.sizeDiff.width;
 
                        var s = { width: (self.size.width - soffsetw), height: (self.size.height - soffseth) },
@@ -367,7 +317,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                        if (!o.animate)
                                this.element.css($.extend(s, { top: top, left: left }));
 
-                       if (o.helper && !o.animate) this._proportionallyResize();
+                       if (this._helper && !o.animate) this._proportionallyResize();
                }
 
                if (o.preserveCursor)
@@ -375,9 +325,9 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
                this._propagate("stop", event);
 
-               if (o.helper) this.helper.remove();
-
+               if (this._helper) this.helper.remove();
                return false;
+               
        },
 
        _updateCache: function(data) {
@@ -393,8 +343,8 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
                var o = this.options, cpos = this.position, csize = this.size, a = this.axis;
 
-               if (data.height) data.width = (csize.height * o.aspectRatio);
-               else if (data.width) data.height = (csize.width / o.aspectRatio);
+               if (data.height) data.width = (csize.height * this.aspectRatio);
+               else if (data.width) data.height = (csize.width / this.aspectRatio);
 
                if (a == 'sw') {
                        data.left = cpos.left + (csize.width - data.width);
@@ -410,7 +360,7 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
        _respectSize: function(data, event) {
 
-               var el = this.helper, o = this.options, pRatio = o._aspectRatio || event.shiftKey, a = this.axis,
+               var el = this.helper, o = this.options, pRatio = this._aspectRatio || event.shiftKey, a = this.axis,
                                ismaxw = data.width && o.maxWidth && o.maxWidth < data.width, ismaxh = data.height && o.maxHeight && o.maxHeight < data.height,
                                        isminw = data.width && o.minWidth && o.minWidth > data.width, isminh = data.height && o.minHeight && o.minHeight > data.height;
 
@@ -436,47 +386,57 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
        },
 
        _proportionallyResize: function() {
+               
                var o = this.options;
-               if (!o.proportionallyResize) return;
-               var prel = o.proportionallyResize, el = this.helper || this.element;
-
-               if (!o.borderDif) {
-                       var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
-                               p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
-
-                       o.borderDif = $.map(b, function(v, i) {
-                               var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
-                               return border + padding;
+               if (!this.proportionallyResize.length) return;
+               var element = this.helper || this.element;
+               
+               for (var i=0; i < this.proportionallyResize.length; i++) {
+                       
+                       var prel = this.proportionallyResize[i];
+                       
+                       if (!this.borderDif) {
+                               var b = [prel.css('borderTopWidth'), prel.css('borderRightWidth'), prel.css('borderBottomWidth'), prel.css('borderLeftWidth')],
+                                       p = [prel.css('paddingTop'), prel.css('paddingRight'), prel.css('paddingBottom'), prel.css('paddingLeft')];
+       
+                               this.borderDif = $.map(b, function(v, i) {
+                                       var border = parseInt(v,10)||0, padding = parseInt(p[i],10)||0;
+                                       return border + padding;
+                               });
+                       }
+       
+                       if ($.browser.msie && !(!($(element).is(':hidden') || $(element).parents(':hidden').length)))
+                               continue;
+       
+                       prel.css({
+                               height: (element.height() - this.borderDif[0] - this.borderDif[2]) || 0,
+                               width: (element.width() - this.borderDif[1] - this.borderDif[3]) || 0
                        });
-               }
-
-               if ($.browser.msie && !isVisible(el))
-                       return;
+                       
+               };
 
-               prel.css({
-                       height: (el.height() - o.borderDif[0] - o.borderDif[2]) || 0,
-                       width: (el.width() - o.borderDif[1] - o.borderDif[3]) || 0
-               });
        },
 
        _renderProxy: function() {
+               
                var el = this.element, o = this.options;
                this.elementOffset = el.offset();
 
-               if(o.helper) {
+               if(this._helper) {
+                       
                        this.helper = this.helper || $('<div style="overflow:hidden;"></div>');
 
-                       // fix ie6 offset
+                       // fix ie6 offset TODO: This seems broken
                        var ie6 = $.browser.msie && $.browser.version < 7, ie6offset = (ie6 ? 1 : 0),
                        pxyoffset = ( ie6 ? 2 : -1 );
 
-                       this.helper.addClass(o.helper).css({
-                               width: el.outerWidth() + pxyoffset,
-                               height: el.outerHeight() + pxyoffset,
+                       this.helper.addClass(this._helper).css({
+                               width: this.element.outerWidth() + pxyoffset,
+                               height: this.element.outerHeight() + pxyoffset,
                                position: 'absolute',
                                left: this.elementOffset.left - ie6offset +'px',
                                top: this.elementOffset.top - ie6offset +'px',
-                               zIndex: ++o.zIndex
+                               zIndex: ++o.zIndex //TODO: Don't modify option
                        });
 
                        this.helper.appendTo("body");
@@ -485,8 +445,9 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
                                this.helper.disableSelection();
 
                } else {
-                       this.helper = el;
+                       this.helper = this.element;
                }
+               
        },
 
        _change: {
@@ -520,7 +481,6 @@ $.widget("ui.resizable", $.extend({}, $.ui.mouse, {
 
        _propagate: function(n, event) {
                $.ui.plugin.call(this, n, [event, this.ui()]);
-
                (n != "resize" && this._trigger(n, event, this.ui()));
        },
 
@@ -558,7 +518,7 @@ $.extend($.ui.resizable, {
                distance: 1,
                ghost: false,
                grid: false,
-               knobHandles: false,
+               helper: false,
                maxHeight: null,
                maxWidth: null,
                minHeight: 10,
@@ -566,7 +526,8 @@ $.extend($.ui.resizable, {
                preserveCursor: true,
                preventDefault: true,
                proportionallyResize: false,
-               transparent: false
+               transparent: false,
+               zIndex: 1000
        }
 });
 
@@ -577,6 +538,7 @@ $.extend($.ui.resizable, {
 $.ui.plugin.add("resizable", "alsoResize", {
 
        start: function(event, ui) {
+       
                var o = ui.options, self = $(this).data("resizable"),
 
                _store = function(exp) {
@@ -724,20 +686,20 @@ $.ui.plugin.add("resizable", "containment", {
 
                if (ce[0] != document && (/static/).test(ce.css('position'))) cop = co;
 
-               if (cp.left < (o.helper ? co.left : 0)) {
-                       self.size.width = self.size.width + (o.helper ? (self.position.left - co.left) : (self.position.left - cop.left));
+               if (cp.left < (self._helper ? co.left : 0)) {
+                       self.size.width = self.size.width + (self._helper ? (self.position.left - co.left) : (self.position.left - cop.left));
                        if (pRatio) self.size.height = self.size.width / o.aspectRatio;
                        self.position.left = o.helper ? co.left : 0;
                }
 
-               if (cp.top < (o.helper ? co.top : 0)) {
-                       self.size.height = self.size.height + (o.helper ? (self.position.top - co.top) : self.position.top);
+               if (cp.top < (self._helper ? co.top : 0)) {
+                       self.size.height = self.size.height + (self._helper ? (self.position.top - co.top) : self.position.top);
                        if (pRatio) self.size.width = self.size.height * o.aspectRatio;
-                       self.position.top = o.helper ? co.top : 0;
+                       self.position.top = self._helper ? co.top : 0;
                }
 
-               var woset = Math.abs( (o.helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
-                                       hoset = Math.abs( (o.helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
+               var woset = Math.abs( (self._helper ? self.offset.left - cop.left : (self.offset.left - cop.left)) + self.sizeDiff.width ),
+                                       hoset = Math.abs( (self._helper ? self.offset.top - cop.top : (self.offset.top - co.top)) + self.sizeDiff.height );
 
                if (woset + self.size.width >= self.parentData.width) {
                        self.size.width = self.parentData.width - woset;
@@ -756,10 +718,10 @@ $.ui.plugin.add("resizable", "containment", {
 
                var helper = $(self.helper), ho = helper.offset(), w = helper.outerWidth() - self.sizeDiff.width, h = helper.outerHeight() - self.sizeDiff.height;
 
-               if (o.helper && !o.animate && (/relative/).test(ce.css('position')))
+               if (self._helper && !o.animate && (/relative/).test(ce.css('position')))
                        $(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
 
-               if (o.helper && !o.animate && (/static/).test(ce.css('position')))
+               if (self._helper && !o.animate && (/static/).test(ce.css('position')))
                        $(this).css({ left: ho.left - cop.left - co.left, width: w, height: h });
 
        }
@@ -768,29 +730,26 @@ $.ui.plugin.add("resizable", "containment", {
 $.ui.plugin.add("resizable", "ghost", {
 
        start: function(event, ui) {
+               
                var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize, cs = self.size;
 
-               if (!pr) self.ghost = self.element.clone();
-               else self.ghost = pr.clone();
-
-               self.ghost.css(
-                       { opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 }
-               )
-               .addClass('ui-resizable-ghost').addClass(typeof o.ghost == 'string' ? o.ghost : '');
+               self.ghost = self.originalElement.clone();
+               self.ghost
+                       .css({ opacity: .25, display: 'block', position: 'relative', height: cs.height, width: cs.width, margin: 0, left: 0, top: 0 })
+                       .addClass('ui-resizable-ghost')
+                       .addClass(typeof o.ghost == 'string' ? o.ghost : '');
 
                self.ghost.appendTo(self.helper);
 
        },
 
        resize: function(event, ui){
-               var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
-
+               var o = ui.options, self = $(this).data("resizable");
                if (self.ghost) self.ghost.css({ position: 'relative', height: self.size.height, width: self.size.width });
-
        },
 
        stop: function(event, ui){
-               var o = ui.options, self = $(this).data("resizable"), pr = o.proportionallyResize;
+               var o = ui.options, self = $(this).data("resizable");
                if (self.ghost && self.helper) self.helper.get(0).removeChild(self.ghost.get(0));
        }