Changeset 5379

Timestamp:

05/02/08 14:28:31 (7 months ago)

Author:

rdworth

Message:

UI Dialog - Reimplemented [5327] with a minor fix, and added test cases.

Location:

trunk/ui

Files:

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

trunk/ui/tests/uiTest.dialog.js

@@ -60 +60 @@
                     "Array-300-80" : "$('#foo').dialog({\n\t position: [300, 80] \n});",
                     "Array-80-300" : "$('#foo').dialog({\n\t position: [80, 300] \n});",
+                    "Array-left-50" : "$('#foo').dialog({\n\t position: ['left', 50] \n});",
+                    "Array-right-bottom" : "$('#foo').dialog({\n\t position: ['right', 'bottom'] \n});",
+                    "Array-80-middle" : "$('#foo').dialog({\n\t position: [80, 'middle'] \n});",
+                    "Array-foo-top" : "$('#foo').dialog({\n\t position: ['foo', 'top'] \n});",
+                    "Array-100-foo" : "$('#foo').dialog({\n\t position: [100, 'foo'] \n});",
                     "foo" : "$('#foo').dialog({\n\t position: 'foo' \n});"
                 },

trunk/ui/ui.dialog.js

@@ -207 +207 @@
             if (pos.constructor == Array) {
                 // [x, y]
-                top += pos[1];
-                left += pos[0];
+                if (pos[0].constructor == Number) {
+                    left += pos[0];
+                } else {
+                    switch (pos[0]) {
+                        case 'center':
+                            left += (wnd.width() / 2) - (uiDialog.width() / 2);
+                            break;
+                        case 'left':
+                            left += 0;
+                            break;
+                        case 'right':
+                            left += (wnd.width()) - (uiDialog.width());
+                            break;
+                        default:
+                            //center
+                            left += (wnd.width() / 2) - (uiDialog.width() / 2);
+                    }
+                }
+                if (pos[1].constructor == Number) {
+                    top += pos[1];
+                } else {
+                    switch (pos[1]) {
+                        case 'middle':
+                            top += (wnd.height() / 2) - (uiDialog.height() / 2);
+                            break;
+                        case 'top':
+                            top += 0;
+                            break;
+                        case 'bottom':
+                            top += (wnd.height()) - (uiDialog.height());
+                            break;
+                        default:
+                            //middle
+                            top += (wnd.height() / 2) - (uiDialog.height() / 2);
+                    }
+                }
             } else {
                 switch (pos) {