r3337 committed - Dialog: Fixed position parsing.
Revision: 3337
Author: scott.gonzalez
Date: Tue Sep 29 19:48:09 2009
Log: Dialog: Fixed position parsing.
http://code.google.com/p/jquery-ui/source/detail?r=3337
Modified:
/trunk/ui/jquery.ui.dialog.js
=======================================
--- /trunk/ui/jquery.ui.dialog.js Sun Sep 27 09:01:44 2009
+++ /trunk/ui/jquery.ui.dialog.js Tue Sep 29 19:48:09 2009
@@ -379,39 +379,39 @@
var myAt = [],
offset = [0, 0];
+ position = position || $.ui.dialog.defaults.position;
+
// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
// if (typeof position == 'string' || $.isArray(position)) {
// myAt = $.isArray(position) ? position : position.split(' ');
- if (position && (typeof positon == "string" || typeof position
== "object")) {
- if (typeof position == 'string' || '0' in position) {
- myAt = position.split ? position.split(' ') : [position[0],
position[1]];
- if (myAt.length == 1) {
- myAt[1] = myAt[0];
- }
-
- $.each(['left', 'top'], function(i, offsetPosition) {
- if (+myAt[i] == myAt[i]) {
- offset[i] = myAt[i];
- myAt[i] = offsetPosition;
- }
- });
- } else {
- if ('left' in position) {
- myAt[0] = 'left';
- offset[0] = position.left;
- } else if ('right' in position) {
- myAt[0] = 'right';
- offset[0] = -position.right;
- }
-
- if ('top' in position) {
- myAt[1] = 'top';
- offset[1] = position.top;
- } else if ('bottom' in position) {
- myAt[1] = 'bottom';
- offset[1] = -position.bottom;
- }
+ if (typeof position == 'string' || (typeof position == 'object' && '0'
in position)) {
+ myAt = position.split ? position.split(' ') : [position[0],
position[1]];
+ if (myAt.length == 1) {
+ myAt[1] = myAt[0];
+ }
+
+ $.each(['left', 'top'], function(i, offsetPosition) {
+ if (+myAt[i] == myAt[i]) {
+ offset[i] = myAt[i];
+ myAt[i] = offsetPosition;
+ }
+ });
+ } else if (typeof position == 'object') {
+ if ('left' in position) {
+ myAt[0] = 'left';
+ offset[0] = position.left;
+ } else if ('right' in position) {
+ myAt[0] = 'right';
+ offset[0] = -position.right;
+ }
+
+ if ('top' in position) {
+ myAt[1] = 'top';
+ offset[1] = position.top;
+ } else if ('bottom' in position) {
+ myAt[1] = 'bottom';
+ offset[1] = -position.bottom;
}
}