Skip to content

Commit d6385b0

Browse files
scottgonzalezscottgonzalez
committed
Dialog: Support hash, array, string for cursorAt option. Use position plugin. Partial fix for #2525 - Standardised way to pass coordinates to plugins.
1 parent 52ca525 commit d6385b0

File tree

7 files changed

+46
-45
lines changed

7 files changed

+46
-45
lines changed

‎demos/dialog/animated.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
77
<script type="text/javascript" src="../../ui/ui.core.js"></script>
88
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.position.js"></script>
910
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
1011
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
1112
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>

‎demos/dialog/default.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
77
<script type="text/javascript" src="../../ui/ui.core.js"></script>
88
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.position.js"></script>
910
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
1011
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
1112
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>

‎demos/dialog/modal-confirmation.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
77
<script type="text/javascript" src="../../ui/ui.core.js"></script>
88
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.position.js"></script>
910
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
1011
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
1112
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>

‎demos/dialog/modal-form.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
77
<script type="text/javascript" src="../../ui/ui.core.js"></script>
88
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.position.js"></script>
910
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
1011
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
1112
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>

‎demos/dialog/modal-message.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
77
<script type="text/javascript" src="../../ui/ui.core.js"></script>
88
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.position.js"></script>
910
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
1011
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
1112
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>

‎demos/dialog/modal.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<script type="text/javascript" src="../../jquery-1.3.2.js"></script>
77
<script type="text/javascript" src="../../ui/ui.core.js"></script>
88
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
9+
<script type="text/javascript" src="../../ui/ui.position.js"></script>
910
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
1011
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
1112
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>

‎ui/ui.dialog.js‎

Lines changed: 40 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
* Depends:
1111
* ui.core.js
1212
* ui.draggable.js
13+
* ui.position.js
1314
* ui.resizable.js
1415
*/
1516
(function($) {
@@ -376,56 +377,50 @@ $.widget("ui.dialog", {
376377
: Math.min(options.minHeight, options.height));
377378
},
378379

379-
_position: function(pos) {
380-
var wnd = $(window), doc = $(document),
381-
pTop = doc.scrollTop(), pLeft = doc.scrollLeft(),
382-
minTop = pTop,
383-
uiDialog = this.uiDialog;
384-
385-
if ($.inArray(pos, ['center','top','right','bottom','left']) >= 0) {
386-
pos = [
387-
pos == 'right' || pos == 'left' ? pos : 'center',
388-
pos == 'top' || pos == 'bottom' ? pos : 'middle'
389-
];
390-
}
391-
if (pos.constructor != Array) {
392-
pos = ['center', 'middle'];
393-
}
394-
if (pos[0].constructor == Number) {
395-
pLeft += pos[0];
396-
} else {
397-
switch (pos[0]) {
398-
case 'left':
399-
pLeft += 0;
400-
break;
401-
case 'right':
402-
pLeft += wnd.width() - uiDialog.outerWidth();
403-
break;
404-
default:
405-
case 'center':
406-
pLeft += (wnd.width() - uiDialog.outerWidth()) / 2;
380+
_position: function(position) {
381+
var myAt = [],
382+
offset = [0, 0];
383+
384+
// deep extending converts arrays to objects in jQuery <= 1.3.2 :-(
385+
// if (typeof position == 'string' || $.isArray(position)) {
386+
// myAt = $.isArray(position) ? position : position.split(' ');
387+
if (typeof position == 'string' || '0' in position) {
388+
myAt = position.split ? position.split(' ') : [position[0], position[1]];
389+
if (myAt.length == 1) {
390+
myAt[1] = myAt[0];
407391
}
408-
}
409-
if (pos[1].constructor == Number) {
410-
pTop += pos[1];
392+
393+
$.each(['left', 'top'], function(i, offsetPosition) {
394+
if (+myAt[i] == myAt[i]) {
395+
offset[i] = myAt[i];
396+
myAt[i] = offsetPosition;
397+
}
398+
});
411399
} else {
412-
switch (pos[1]) {
413-
case 'top':
414-
pTop += 0;
415-
break;
416-
case 'bottom':
417-
pTop += wnd.height() - uiDialog.outerHeight();
418-
break;
419-
default:
420-
case 'middle':
421-
pTop += (wnd.height() - uiDialog.outerHeight()) / 2;
400+
if ('left' in position) {
401+
myAt[0] = 'left';
402+
offset[0] = position.left;
403+
} else if ('right' in position) {
404+
myAt[0] = 'right';
405+
offset[0] = -position.right;
406+
}
407+
408+
if ('top' in position) {
409+
myAt[1] = 'top';
410+
offset[1] = position.top;
411+
} else if ('bottom' in position) {
412+
myAt[1] = 'bottom';
413+
offset[1] = -position.bottom;
422414
}
423415
}
424416

425-
// prevent the dialog from being too high (make sure the titlebar
426-
// is accessible)
427-
pTop = Math.max(pTop, minTop);
428-
uiDialog.css({top: pTop, left: pLeft});
417+
this.uiDialog.position({
418+
my: myAt.join(' '),
419+
at: myAt.join(' '),
420+
offset: offset.join(' '),
421+
of: window,
422+
collision: 'fit'
423+
});
429424
},
430425

431426
_setData: function(key, value){

0 commit comments

Comments
 (0)