Changeset 5266

Timestamp:

04/18/08 00:53:40 (8 months ago)

Author:

scott.gonzalez

Message:

UI Dialog: Fixed #2687: Removed "helpful element detection" and changed context of button clicks to the dialog element.

Files:

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

trunk/ui/ui.dialog.js

@@ -18 +18 @@
     
     $.fn.extend({
-        dialog: function(options) {
-            var args = Array.prototype.slice.call(arguments, 1);
-
+        dialog: function(options, data) {
             return this.each(function() {
-                if (typeof options == "string") {
-                    var elem = $(this).is('.ui-dialog')
-                        ? this
-                        : $(this).parents(".ui-dialog:first").find(".ui-dialog-content")[0];
-                    var dialog = elem ? $.data(elem, "dialog") : {};
-                    if (dialog[options])
-                        dialog[options].apply(dialog, args);
-                // INIT with optional options
-                } else if (!$(this).is(".ui-dialog-content"))
-                    new $.ui.dialog(this, options);
+                var isMethodCall = (typeof options == "string");
+                var instance = $.data(this, "dialog");
+                
+                if (!instance && !isMethodCall) {
+                    $.data(this, "dialog", new $.ui.dialog(this, options));
+                } else if (isMethodCall) {
+                    instance[options](data);
+                }
             });
         }
     });
-
+    
     $.ui.dialog = function(el, options) {
         
@@ -162 +158 @@
                 ev.keyCode && ev.keyCode == ESC && self.close(); 
             });
-
-        var l = 0;
-        $.each(options.buttons, function() { l = 1; return false; });
-        if (l == 1) {
-            uiDialog.append('<div class="ui-dialog-buttonpane"></div>');
-            var uiDialogButtonPane = $('.ui-dialog-buttonpane', uiDialog);
-            $.each(options.buttons, function(name, value) {
-                var btn = $(document.createElement('button')).text(name).click(value);
-                uiDialogButtonPane.append(btn);
-            });
-        }
-
+        
+        var hasButtons = false;
+        $.each(options.buttons, function() { return !(hasButtons = true); });
+        if (hasButtons) {
+            var uiDialogButtonPane = $('<div class="ui-dialog-buttonpane"/>')
+                .appendTo(uiDialog);
+            $.each(options.buttons, function(name, fn) {
+                $(document.createElement('button'))
+                    .text(name)
+                    .click(function() { fn.apply(el, arguments) })
+                    .appendTo(uiDialogButtonPane);
+            });
+        }
+        
         if ($.fn.draggable) {
             uiDialog.draggable({
@@ -304 +302 @@
             autoOpen: true,
             bgiframe: false,
-            buttons: [],
+            buttons: {},
             draggable: true,
             height: 200,