From 8fcf7ea82889f6a5df20ef62523bd688e780143a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Scott=20Gonz=C3=A1lez?= Date: Wed, 9 May 2012 16:00:21 -0400 Subject: [PATCH] Dialog: Remove uses of self var; use that var. --- ui/jquery.ui.dialog.js | 185 ++++++++++++++++++++--------------------- 1 file changed, 91 insertions(+), 94 deletions(-) diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index 7eaf89cbd..f60a1f78d 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -83,13 +83,13 @@ $.widget("ui.dialog", { index: this.element.parent().children().index( this.element ) }; this.options.title = this.options.title || this.originalTitle; - var self = this, - options = self.options, + var that = this, + options = this.options, title = options.title || " ", - titleId = $.ui.dialog.getTitleId( self.element ), + titleId = $.ui.dialog.getTitleId( this.element ), - uiDialog = ( self.uiDialog = $( "
" ) ) + uiDialog = ( this.uiDialog = $( "
" ) ) .addClass( uiDialogClasses + options.dialogClass ) .css({ display: "none", @@ -101,7 +101,7 @@ $.widget("ui.dialog", { .keydown(function( event ) { if ( options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode && event.keyCode === $.ui.keyCode.ESCAPE ) { - self.close( event ); + that.close( event ); event.preventDefault(); } }) @@ -110,17 +110,17 @@ $.widget("ui.dialog", { "aria-labelledby": titleId }) .mousedown(function( event ) { - self.moveToTop( false, event ); + that.moveToTop( false, event ); }) .appendTo( "body" ), - uiDialogContent = self.element + uiDialogContent = this.element .show() .removeAttr( "title" ) .addClass( "ui-dialog-content ui-widget-content" ) .appendTo( uiDialog ), - uiDialogTitlebar = ( self.uiDialogTitlebar = $( "
" ) ) + uiDialogTitlebar = ( this.uiDialogTitlebar = $( "
" ) ) .addClass( "ui-dialog-titlebar ui-widget-header " + "ui-corner-all ui-helper-clearfix" ) .prependTo( uiDialog ), @@ -130,11 +130,11 @@ $.widget("ui.dialog", { .attr( "role", "button" ) .click(function( event ) { event.preventDefault(); - self.close( event ); + that.close( event ); }) .appendTo( uiDialogTitlebar ), - uiDialogTitlebarCloseText = ( self.uiDialogTitlebarCloseText = $( "" ) ) + uiDialogTitlebarCloseText = ( this.uiDialogTitlebarCloseText = $( "" ) ) .addClass( "ui-icon ui-icon-closethick" ) .text( options.closeText ) .appendTo( uiDialogTitlebarClose ), @@ -150,14 +150,14 @@ $.widget("ui.dialog", { this._focusable( uiDialogTitlebarClose ); if ( options.draggable && $.fn.draggable ) { - self._makeDraggable(); + this._makeDraggable(); } if ( options.resizable && $.fn.resizable ) { - self._makeResizable(); + this._makeResizable(); } - self._createButtons( options.buttons ); - self._isOpen = false; + this._createButtons( options.buttons ); + this._isOpen = false; if ( $.fn.bgiframe ) { uiDialog.bgiframe(); @@ -171,28 +171,28 @@ $.widget("ui.dialog", { }, _destroy: function() { - var self = this, next, + var next, oldPosition = this.oldPosition; - if ( self.overlay ) { - self.overlay.destroy(); + if ( this.overlay ) { + this.overlay.destroy(); } - self.uiDialog.hide(); - self.element + this.uiDialog.hide(); + this.element .removeClass( "ui-dialog-content ui-widget-content" ) .hide() .appendTo( "body" ); - self.uiDialog.remove(); + this.uiDialog.remove(); - if ( self.originalTitle ) { - self.element.attr( "title", self.originalTitle ); + if ( this.originalTitle ) { + this.element.attr( "title", this.originalTitle ); } next = oldPosition.parent.children().eq( oldPosition.index ); if ( next.length ) { - next.before( self.element ); + next.before( this.element ); } else { - oldPosition.parent.append( self.element ); + oldPosition.parent.append( this.element ); } }, @@ -201,40 +201,40 @@ $.widget("ui.dialog", { }, close: function( event ) { - var self = this, + var that = this, maxZ, thisZ; if ( !this._isOpen ) { return; } - if ( false === self._trigger( "beforeClose", event ) ) { + if ( false === this._trigger( "beforeClose", event ) ) { return; } - self._isOpen = false; + this._isOpen = false; - if ( self.overlay ) { - self.overlay.destroy(); + if ( this.overlay ) { + this.overlay.destroy(); } - self.uiDialog.unbind( "keypress.ui-dialog" ); + this.uiDialog.unbind( "keypress.ui-dialog" ); - if ( self.options.hide ) { - self.uiDialog.hide( self.options.hide, function() { - self._trigger( "close", event ); + if ( this.options.hide ) { + this.uiDialog.hide( this.options.hide, function() { + that._trigger( "close", event ); }); } else { - self.uiDialog.hide(); - self._trigger( "close", event ); + this.uiDialog.hide(); + this._trigger( "close", event ); } $.ui.dialog.overlay.resize(); // adjust the maxZ to allow other modal dialogs to continue to work (see #4309) - if ( self.options.modal ) { + if ( this.options.modal ) { maxZ = 0; $( ".ui-dialog" ).each(function() { - if ( this !== self.uiDialog[0] ) { + if ( this !== that.uiDialog[0] ) { thisZ = $( this ).css( "z-index" ); if ( !isNaN( thisZ ) ) { maxZ = Math.max( maxZ, thisZ ); @@ -244,7 +244,7 @@ $.widget("ui.dialog", { $.ui.dialog.maxZ = maxZ; } - return self; + return this; }, isOpen: function() { @@ -254,37 +254,36 @@ $.widget("ui.dialog", { // the force parameter allows us to move modal dialogs to their correct // position on open moveToTop: function( force, event ) { - var self = this, - options = self.options, + var options = this.options, saveScroll; if ( ( options.modal && !force ) || ( !options.stack && !options.modal ) ) { - return self._trigger( "focus", event ); + return this._trigger( "focus", event ); } if ( options.zIndex > $.ui.dialog.maxZ ) { $.ui.dialog.maxZ = options.zIndex; } - if ( self.overlay ) { + if ( this.overlay ) { $.ui.dialog.maxZ += 1; $.ui.dialog.overlay.maxZ = $.ui.dialog.maxZ; - self.overlay.$el.css( "z-index", $.ui.dialog.overlay.maxZ ); + this.overlay.$el.css( "z-index", $.ui.dialog.overlay.maxZ ); } // Save and then restore scroll // Opera 9.5+ resets when parent z-index is changed. // http://bugs.jqueryui.com/ticket/3193 saveScroll = { - scrollTop: self.element.scrollTop(), - scrollLeft: self.element.scrollLeft() + scrollTop: this.element.scrollTop(), + scrollLeft: this.element.scrollLeft() }; $.ui.dialog.maxZ += 1; - self.uiDialog.css( "z-index", $.ui.dialog.maxZ ); - self.element.attr( saveScroll ); - self._trigger( "focus", event ); + this.uiDialog.css( "z-index", $.ui.dialog.maxZ ); + this.element.attr( saveScroll ); + this._trigger( "focus", event ); - return self; + return this; }, open: function() { @@ -293,15 +292,14 @@ $.widget("ui.dialog", { } var hasFocus, - self = this, - options = self.options, - uiDialog = self.uiDialog; + options = this.options, + uiDialog = this.uiDialog; - self._size(); - self._position( options.position ); + this._size(); + this._position( options.position ); uiDialog.show( options.show ); - self.overlay = options.modal ? new $.ui.dialog.overlay( self ) : null; - self.moveToTop( true ); + this.overlay = options.modal ? new $.ui.dialog.overlay( this ) : null; + this.moveToTop( true ); // prevent tabbing out of modal dialogs if ( options.modal ) { @@ -326,7 +324,7 @@ $.widget("ui.dialog", { // set focus to the first tabbable element in the content area or the first button // if there are no tabbable elements, set focus on the dialog itself - hasFocus = self.element.find( ":tabbable" ); + hasFocus = this.element.find( ":tabbable" ); if ( !hasFocus.length ) { hasFocus = uiDialog.find( ".ui-dialog-buttonpane :tabbable" ); if ( !hasFocus.length ) { @@ -335,19 +333,19 @@ $.widget("ui.dialog", { } hasFocus.eq( 0 ).focus(); - self._isOpen = true; - self._trigger( "open" ); + this._isOpen = true; + this._trigger( "open" ); - return self; + return this; }, _createButtons: function( buttons ) { var uiDialogButtonPane, uiButtonSet, - self = this, + that = this, hasButtons = false; // if we already have a button pane, remove it - self.uiDialog.find( ".ui-dialog-buttonpane" ).remove(); + this.uiDialog.find( ".ui-dialog-buttonpane" ).remove(); if ( typeof buttons === "object" && buttons !== null ) { $.each( buttons, function() { @@ -369,23 +367,23 @@ $.widget("ui.dialog", { .attr( props, true ) .unbind( "click" ) .click(function() { - props.click.apply( self.element[0], arguments ); + props.click.apply( that.element[0], arguments ); }) .appendTo( uiButtonSet ); if ( $.fn.button ) { button.button(); } }); - self.uiDialog.addClass( "ui-dialog-buttons" ); - uiDialogButtonPane.appendTo( self.uiDialog ); + this.uiDialog.addClass( "ui-dialog-buttons" ); + uiDialogButtonPane.appendTo( this.uiDialog ); } else { - self.uiDialog.removeClass( "ui-dialog-buttons" ); + this.uiDialog.removeClass( "ui-dialog-buttons" ); } }, _makeDraggable: function() { - var self = this, - options = self.options; + var that = this, + options = this.options; function filteredUi( ui ) { return { @@ -394,26 +392,26 @@ $.widget("ui.dialog", { }; } - self.uiDialog.draggable({ + this.uiDialog.draggable({ cancel: ".ui-dialog-content, .ui-dialog-titlebar-close", handle: ".ui-dialog-titlebar", containment: "document", start: function( event, ui ) { $( this ) .addClass( "ui-dialog-dragging" ); - self._trigger( "dragStart", event, filteredUi( ui ) ); + that._trigger( "dragStart", event, filteredUi( ui ) ); }, drag: function( event, ui ) { - self._trigger( "drag", event, filteredUi( ui ) ); + that._trigger( "drag", event, filteredUi( ui ) ); }, stop: function( event, ui ) { options.position = [ - ui.position.left - self.document.scrollLeft(), - ui.position.top - self.document.scrollTop() + ui.position.left - that.document.scrollLeft(), + ui.position.top - that.document.scrollTop() ]; $( this ) .removeClass( "ui-dialog-dragging" ); - self._trigger( "dragStop", event, filteredUi( ui ) ); + that._trigger( "dragStop", event, filteredUi( ui ) ); $.ui.dialog.overlay.resize(); } }); @@ -421,11 +419,11 @@ $.widget("ui.dialog", { _makeResizable: function( handles ) { handles = (handles === undefined ? this.options.resizable : handles); - var self = this, - options = self.options, + var that = this, + options = this.options, // .ui-resizable has position: relative defined in the stylesheet // but dialogs have to use absolute or fixed positioning - position = self.uiDialog.css( "position" ), + position = this.uiDialog.css( "position" ), resizeHandles = typeof handles === 'string' ? handles : "n,e,s,w,se,sw,ne,nw"; @@ -439,27 +437,27 @@ $.widget("ui.dialog", { }; } - self.uiDialog.resizable({ + this.uiDialog.resizable({ cancel: ".ui-dialog-content", containment: "document", - alsoResize: self.element, + alsoResize: this.element, maxWidth: options.maxWidth, maxHeight: options.maxHeight, minWidth: options.minWidth, - minHeight: self._minHeight(), + minHeight: this._minHeight(), handles: resizeHandles, start: function( event, ui ) { $( this ).addClass( "ui-dialog-resizing" ); - self._trigger( "resizeStart", event, filteredUi( ui ) ); + that._trigger( "resizeStart", event, filteredUi( ui ) ); }, resize: function( event, ui ) { - self._trigger( "resize", event, filteredUi( ui ) ); + that._trigger( "resize", event, filteredUi( ui ) ); }, stop: function( event, ui ) { $( this ).removeClass( "ui-dialog-resizing" ); options.height = $( this ).height(); options.width = $( this ).width(); - self._trigger( "resizeStop", event, filteredUi( ui ) ); + that._trigger( "resizeStop", event, filteredUi( ui ) ); $.ui.dialog.overlay.resize(); } }) @@ -525,12 +523,12 @@ $.widget("ui.dialog", { }, _setOptions: function( options ) { - var self = this, + var that = this, resizableOptions = {}, resize = false; $.each( options, function( key, value ) { - self._setOption( key, value ); + that._setOption( key, value ); if ( key in sizeRelatedOptions ) { resize = true; @@ -550,20 +548,19 @@ $.widget("ui.dialog", { _setOption: function( key, value ) { var isDraggable, isResizable, - self = this, - uiDialog = self.uiDialog; + uiDialog = this.uiDialog; switch ( key ) { case "buttons": - self._createButtons( value ); + this._createButtons( value ); break; case "closeText": // ensure that we always pass a string - self.uiDialogTitlebarCloseText.text( "" + value ); + this.uiDialogTitlebarCloseText.text( "" + value ); break; case "dialogClass": uiDialog - .removeClass( self.options.dialogClass ) + .removeClass( this.options.dialogClass ) .addClass( uiDialogClasses + value ); break; case "disabled": @@ -580,11 +577,11 @@ $.widget("ui.dialog", { } if ( !isDraggable && value ) { - self._makeDraggable(); + this._makeDraggable(); } break; case "position": - self._position( value ); + this._position( value ); break; case "resizable": // currently resizable, becoming non-resizable @@ -600,12 +597,12 @@ $.widget("ui.dialog", { // currently non-resizable, becoming resizable if ( !isResizable && value !== false ) { - self._makeResizable( value ); + this._makeResizable( value ); } break; case "title": // convert whatever was passed in o a string, for html() to not throw up - $( ".ui-dialog-title", self.uiDialogTitlebar ) + $( ".ui-dialog-title", this.uiDialogTitlebar ) .html( "" + ( value || " " ) ); break; }