Changeset 4076

Timestamp:

12/08/07 14:17:25 (9 months ago)

Author:

rdworth

Message:

Fixed #2028 - [x, y] positioning of dialog

Location:

trunk/ui/current

Files:

• tests/uiTest.dialog.js (modified) (1 diff)
• ui.dialog.js (modified) (1 diff)

trunk/ui/current/tests/uiTest.dialog.js

@@ -45 +45 @@
                     "right" : "$('#foo').dialog({\n\t position: 'right' \n});",
                     "bottom" : "$('#foo').dialog({\n\t position: 'bottom' \n});",
-                    "left" : "$('#foo').dialog({\n\t position: 'left' \n});"
+                    "left" : "$('#foo').dialog({\n\t position: 'left' \n});",
+                    "[x, y]" : "$('#foo').dialog({\n\t position: [10, 20] \n});",
+                    "[300, 80]" : "$('#foo').dialog({\n\t position: [300, 80] \n});",
+                    "[80, 300]" : "$('#foo').dialog({\n\t position: [80, 300] \n});",
+                    "foo" : "$('#foo').dialog({\n\t position: 'foo' \n});"
                 },
                 "resizable" : {

trunk/ui/current/ui.dialog.js

@@ -119 +119 @@
             uiDialog.appendTo('body');
             var wnd = $(window), doc = $(document), top = doc.scrollTop(), left = doc.scrollLeft();
-            switch (options.position) {
-                case 'center':
-                    top += (wnd.height() / 2) - (uiDialog.height() / 2);
-                    left += (wnd.width() / 2) - (uiDialog.width() / 2);
-                    break;
-                case 'top':
-                    top += 0;
-                    left += (wnd.width() / 2) - (uiDialog.width() / 2);
-                    break;
-                case 'right':
-                    top += (wnd.height() / 2) - (uiDialog.height() / 2);
-                    left += (wnd.width()) - (uiDialog.width());
-                    break;
-                case 'bottom':
-                    top += (wnd.height()) - (uiDialog.height());
-                    left += (wnd.width() / 2) - (uiDialog.width() / 2);
-                    break;
-                case 'left':
-                    top += (wnd.height() / 2) - (uiDialog.height() / 2);
-                    left += 0;
-                    break;
+            if (options.position.constructor == Array) {
+                // [x, y]
+                top += options.position[1];
+                left += options.position[0];
+            } else {
+                switch (options.position) {
+                    case 'center':
+                        top += (wnd.height() / 2) - (uiDialog.height() / 2);
+                        left += (wnd.width() / 2) - (uiDialog.width() / 2);
+                        break;
+                    case 'top':
+                        top += 0;
+                        left += (wnd.width() / 2) - (uiDialog.width() / 2);
+                        break;
+                    case 'right':
+                        top += (wnd.height() / 2) - (uiDialog.height() / 2);
+                        left += (wnd.width()) - (uiDialog.width());
+                        break;
+                    case 'bottom':
+                        top += (wnd.height()) - (uiDialog.height());
+                        left += (wnd.width() / 2) - (uiDialog.width() / 2);
+                        break;
+                    case 'left':
+                        top += (wnd.height() / 2) - (uiDialog.height() / 2);
+                        left += 0;
+                        break;
+                    default:
+                        //center
+                        top += (wnd.height() / 2) - (uiDialog.height() / 2);
+                        left += (wnd.width() / 2) - (uiDialog.width() / 2);
+                }
             }
             top = top < doc.scrollTop() ? doc.scrollTop() : top;