Changeset 5608

Timestamp:

05/15/08 14:41:12 (7 months ago)

Author:

scott.gonzalez

Message:

UI Dialog: Cleaned up JavaScript warnings.

Files:

• trunk/ui/ui.dialog.js (modified) (15 diffs)

trunk/ui/ui.dialog.js

@@ -44 +44 @@
                 .wrap(document.createElement('div'));
             var uiDialogContainer = uiDialogContent.parent().addClass('ui-dialog-container').css({position: 'relative'});
-            var uiDialog = this.uiDialog = uiDialogContainer.parent().hide()
+            var uiDialog = (this.uiDialog = uiDialogContainer.parent()).hide()
                 .addClass('ui-dialog')
                 .css({position: 'absolute', width: options.width, height: options.height, overflow: 'hidden'}); 
@@ -52 +52 @@
             // Add content classes to dialog, to inherit theme at top level of element
             $.each(classNames, function(i, className) {
-                if (className != 'ui-dialog-content')
-                    uiDialog.addClass(className);
+                ((className != 'ui-dialog-content')
+                    && uiDialog.addClass(className));
             });
     
@@ -73 +73 @@
                     resize: options.resize,
                     stop: function(e, ui) {
-                        options.resizeStop && options.resizeStop.apply(this, arguments);
+                        (options.resizeStop && options.resizeStop.apply(this, arguments));
                         $.ui.dialog.overlay.resize();
                     }
                 });
-                if (!options.resizable)
-                    uiDialog.resizable('disable');
+                (!options.resizable && uiDialog.resizable('disable'));
             }
     
@@ -104 +103 @@
                 if (options.closeOnEscape) {
                     var ESC = 27;
-                    ev.keyCode && ev.keyCode == ESC && self.close();
+                    (ev.keyCode && ev.keyCode == ESC && self.close());
                 }
             });
@@ -116 +115 @@
                     $(document.createElement('button'))
                         .text(name)
-                        .click(function() { fn.apply(self.element, arguments) })
+                        .click(function() { fn.apply(self.element, arguments); })
                         .appendTo(uiDialogButtonPane);
                 });
@@ -126 +125 @@
                     start: function(e, ui) {
                         self.activate();
-                        options.dragStart && options.dragStart.apply(this, arguments);
+                        (options.dragStart && options.dragStart.apply(this, arguments));
                     },
                     drag: options.drag,
                     stop: function(e, ui) {
-                        options.dragStop && options.dragStop.apply(this, arguments);
+                        (options.dragStop && options.dragStop.apply(this, arguments));
                         $.ui.dialog.overlay.resize();
                     }
                 });
-                if (!options.draggable)
-                    uiDialog.draggable('disable')
+                (!options.draggable && uiDialog.draggable('disable'));
             }
         
@@ -145 +143 @@
             });
             
-            options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe();
-            
-            if (options.autoOpen) {
-                this.open();
-            };
+            (options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe());
+            
+            (options.autoOpen && this.open());
         },
         
         setData: function(key, value){
-            setDataSwitch[key] && this.uiDialog.data(setDataSwitch[key], value);
+            (setDataSwitch[key] && this.uiDialog.data(setDataSwitch[key], value));
             switch (key) {
                 case "draggable":
@@ -189 +185 @@
             }
             if (pos.constructor != Array) {
-                pos == ['center', 'middle']
+                pos = ['center', 'middle'];
             }
             if (pos[0].constructor == Number) {
@@ -201 +197 @@
                         pLeft += (wnd.width()) - (this.uiDialog.width());
                         break;
+                    default:
                     case 'center':
-                    default:
                         pLeft += (wnd.width() / 2) - (this.uiDialog.width() / 2);
                 }
@@ -216 +212 @@
                         pTop += (wnd.height()) - (this.uiDialog.height());
                         break;
+                    default:
                     case 'middle':
-                    default:
                         pTop += (wnd.height() / 2) - (this.uiDialog.height() / 2);
                 }
@@ -252 +248 @@
             // would make any modeless dialogs that it spawned unusable until
             // the modal dialog is closed.
-            !this.options.modal && this.moveToTop();
+            (!this.options.modal && this.moveToTop());
         },
             
@@ -260 +256 @@
                 maxZ = Math.max(maxZ, parseInt($(this).css('z-index'), 10) || options.zIndex);
             });
-            this.overlay && this.overlay.$el.css('z-index', ++maxZ);
+            (this.overlay && this.overlay.$el.css('z-index', ++maxZ));
             this.uiDialog.css('z-index', ++maxZ);
         },
             
         close: function() {
-            this.overlay && this.overlay.destroy();
+            (this.overlay && this.overlay.destroy());
             this.uiDialog.hide();
 
@@ -278 +274 @@
         
         destroy: function() {
-            this.overlay && this.overlay.destroy();
+            (this.overlay && this.overlay.destroy());
             this.uiDialog.hide();
             this.element
@@ -347 +343 @@
                 $(document).bind('keydown.dialog-overlay', function(e) {
                     var ESC = 27;
-                    e.keyCode && e.keyCode == ESC && dialog.close(); 
+                    (e.keyCode && e.keyCode == ESC && dialog.close()); 
                 });
                 
@@ -362 +358 @@
                 }, dialog.options.overlay));
             
-            dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe();
+            (dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe());
             
             this.instances.push($el);