diff options
author | Scott González <scott.gonzalez@gmail.com> | 2010-01-14 18:09:07 +0000 |
---|---|---|
committer | Scott González <scott.gonzalez@gmail.com> | 2010-01-14 18:09:07 +0000 |
commit | 1c31a26b564ad554f5262a0b25c32a9a847688e6 (patch) | |
tree | 7cf8c0491096ce187365a7d78011294dad98b2bf | |
parent | 6024fdf2564b274af2f2d306f420e44a2c88d7b1 (diff) | |
download | jquery-ui-1c31a26b564ad554f5262a0b25c32a9a847688e6.tar.gz jquery-ui-1c31a26b564ad554f5262a0b25c32a9a847688e6.zip |
Replaced stackfix with bgiframe.
Fixes #5061 - Remove stackfix.
24 files changed, 39 insertions, 70 deletions
diff --git a/build/build.xml b/build/build.xml index 603916ed7..cf7d776a7 100644 --- a/build/build.xml +++ b/build/build.xml @@ -206,7 +206,6 @@ <get src="${url}Tabs" dest="${docs.dir}tabs.html" /> <get src="http://docs.jquery.com/action/render/UI/Utility/Position" dest="${docs.dir}position.html" /> - <get src="http://docs.jquery.com/action/render/UI/Utility/Stackfix" dest="${docs.dir}stackfix.html" /> <get src="http://docs.jquery.com/action/render/UI/Effects/animate" dest="${docs.dir}animate.html" /> <get src="http://docs.jquery.com/action/render/UI/Effects/addClass" dest="${docs.dir}addClass.html" /> diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html index dd84b25d4..43dfed061 100644 --- a/demos/dialog/animated.html +++ b/demos/dialog/animated.html @@ -4,20 +4,20 @@ <title>jQuery UI Dialog - Animation</title> <link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript" src="../../ui/jquery.effects.core.js"></script> <script type="text/javascript" src="../../ui/jquery.effects.blind.js"></script> <script type="text/javascript" src="../../ui/jquery.effects.explode.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> <script type="text/javascript"> - $.ui.dialog.prototype.options.stackfix = true; + $.ui.dialog.prototype.options.bgiframe = true; // increase the default animation speed to exaggerate the effect $.fx.speeds._default = 1000; $(function() { diff --git a/demos/dialog/default.html b/demos/dialog/default.html index 62638f399..2625bdd33 100644 --- a/demos/dialog/default.html +++ b/demos/dialog/default.html @@ -4,17 +4,17 @@ <title>jQuery UI Dialog - Default functionality</title> <link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> <script type="text/javascript"> - $.ui.dialog.prototype.options.stackfix = true; + $.ui.dialog.prototype.options.bgiframe = true; $(function() { $("#dialog").dialog(); }); diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html index 8c5c0ba89..8369dcefe 100644 --- a/demos/dialog/modal-confirmation.html +++ b/demos/dialog/modal-confirmation.html @@ -4,6 +4,7 @@ <title>jQuery UI Dialog - Modal confirmation</title> <link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> @@ -11,7 +12,6 @@ <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> <script type="text/javascript"> @@ -20,7 +20,7 @@ $("#dialog").dialog("destroy"); $("#dialog-confirm").dialog({ - stackfix: true, + bgiframe: true, resizable: false, height:140, modal: true, diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html index ffcdd70fc..36160b159 100644 --- a/demos/dialog/modal-form.html +++ b/demos/dialog/modal-form.html @@ -4,6 +4,7 @@ <title>jQuery UI Dialog - Modal form</title> <link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> @@ -11,7 +12,6 @@ <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript" src="../../ui/jquery.effects.core.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> @@ -73,7 +73,7 @@ } $("#dialog-form").dialog({ - stackfix: true, + bgiframe: true, autoOpen: false, height: 300, width: 350, diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html index 0fdae6a06..6478b84d9 100644 --- a/demos/dialog/modal-message.html +++ b/demos/dialog/modal-message.html @@ -4,6 +4,7 @@ <title>jQuery UI Dialog - Modal message</title> <link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> @@ -11,7 +12,6 @@ <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> <script type="text/javascript"> @@ -20,7 +20,7 @@ $("#dialog").dialog("destroy"); $("#dialog-message").dialog({ - stackfix: true, + bgiframe: true, modal: true, buttons: { Ok: function() { diff --git a/demos/dialog/modal.html b/demos/dialog/modal.html index c852b0551..276c49717 100644 --- a/demos/dialog/modal.html +++ b/demos/dialog/modal.html @@ -4,13 +4,13 @@ <title>jQuery UI Dialog - Basic modal</title> <link type="text/css" href="../../themes/base/ui.all.css" rel="stylesheet" /> <script type="text/javascript" src="../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../ui/jquery.ui.dialog.js"></script> <link type="text/css" href="../demos.css" rel="stylesheet" /> <script type="text/javascript"> @@ -19,7 +19,7 @@ $("#dialog").dialog("destroy"); $("#dialog-modal").dialog({ - stackfix: true, + bgiframe: true, height: 140, modal: true }); diff --git a/demos/index.html b/demos/index.html index f3505f993..fe7b6f71d 100644 --- a/demos/index.html +++ b/demos/index.html @@ -6,10 +6,10 @@ <link type="text/css" href="../themes/base/ui.all.css" rel="stylesheet" /> <link type="text/css" href="demos.css" rel="stylesheet" /> <script type="text/javascript" src="../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../ui/jquery.ui.mouse.js"></script> - <script type="text/javascript" src="../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../ui/jquery.ui.accordion.js"></script> <script type="text/javascript" src="../ui/jquery.ui.autocomplete.js"></script> <script type="text/javascript" src="../ui/jquery.ui.button.js"></script> diff --git a/external/jquery.bgiframe-2.1.1.js b/external/jquery.bgiframe-2.1.1.js new file mode 100644 index 000000000..ef8679d90 --- /dev/null +++ b/external/jquery.bgiframe-2.1.1.js @@ -0,0 +1,10 @@ +/* Copyright (c) 2006 Brandon Aaron (http://brandonaaron.net) + * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php) + * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses. + * + * $LastChangedDate: 2007-07-21 18:45:56 -0500 (Sat, 21 Jul 2007) $ + * $Rev: 2447 $ + * + * Version 2.1.1 + */ +(function($){$.fn.bgIframe=$.fn.bgiframe=function(s){if($.browser.msie&&/6.0/.test(navigator.userAgent)){s=$.extend({top:'auto',left:'auto',width:'auto',height:'auto',opacity:true,src:'javascript:false;'},s||{});var prop=function(n){return n&&n.constructor==Number?n+'px':n;},html='<iframe class="bgiframe"frameborder="0"tabindex="-1"src="'+s.src+'"'+'style="display:block;position:absolute;z-index:-1;'+(s.opacity!==false?'filter:Alpha(Opacity=\'0\');':'')+'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+'"/>';return this.each(function(){if($('> iframe.bgiframe',this).length==0)this.insertBefore(document.createElement(html),this.firstChild);});}return this;};})(jQuery);
\ No newline at end of file diff --git a/tests/unit/dialog/dialog.html b/tests/unit/dialog/dialog.html index 5b23bc885..5819a63d7 100644 --- a/tests/unit/dialog/dialog.html +++ b/tests/unit/dialog/dialog.html @@ -4,13 +4,13 @@ <title>jQuery UI Dialog Test Suite</title> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.mouse.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <link type="text/css" href="../testsuite.css" rel="stylesheet" /> diff --git a/tests/unit/dialog/dialog_defaults.js b/tests/unit/dialog/dialog_defaults.js index 33da934fd..9607bf194 100644 --- a/tests/unit/dialog/dialog_defaults.js +++ b/tests/unit/dialog/dialog_defaults.js @@ -4,6 +4,7 @@ var dialog_defaults = { autoOpen: true, + bgiframe: false, buttons: {}, closeOnEscape: true, closeText: 'close', @@ -21,7 +22,6 @@ var dialog_defaults = { resizable: true, show: null, stack: true, - stackfix: false, title: '', width: 300, zIndex: 1000 diff --git a/tests/visual/dialog/default.html b/tests/visual/dialog/default.html index d71e54d0c..d7cd8e839 100644 --- a/tests/visual/dialog/default.html +++ b/tests/visual/dialog/default.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog.html b/tests/visual/dialog/dialog.html index 551cb0e8c..09e8ce34c 100644 --- a/tests/visual/dialog/dialog.html +++ b/tests/visual/dialog/dialog.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../all.css" type="text/css"> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_on_page_with_large_dom.html b/tests/visual/dialog/dialog_on_page_with_large_dom.html index 08d667b0d..3bbb82041 100644 --- a/tests/visual/dialog/dialog_on_page_with_large_dom.html +++ b/tests/visual/dialog/dialog_on_page_with_large_dom.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_on_page_with_scrollbars.html b/tests/visual/dialog/dialog_on_page_with_scrollbars.html index be274e201..53ae95a7f 100644 --- a/tests/visual/dialog/dialog_on_page_with_scrollbars.html +++ b/tests/visual/dialog/dialog_on_page_with_scrollbars.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_option_buttons_OK_Cancel.html b/tests/visual/dialog/dialog_option_buttons_OK_Cancel.html index bdc63f0dd..637fccb6a 100644 --- a/tests/visual/dialog/dialog_option_buttons_OK_Cancel.html +++ b/tests/visual/dialog/dialog_option_buttons_OK_Cancel.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_option_closeOnEscape_false.html b/tests/visual/dialog/dialog_option_closeOnEscape_false.html index 95aaba4d8..14d6da5f4 100644 --- a/tests/visual/dialog/dialog_option_closeOnEscape_false.html +++ b/tests/visual/dialog/dialog_option_closeOnEscape_false.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_option_closeOnEscape_true.html b/tests/visual/dialog/dialog_option_closeOnEscape_true.html index 31f873f3b..a0bb89edd 100644 --- a/tests/visual/dialog/dialog_option_closeOnEscape_true.html +++ b/tests/visual/dialog/dialog_option_closeOnEscape_true.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_option_modal_false.html b/tests/visual/dialog/dialog_option_modal_false.html index 45dad2fc3..2c7b5fc19 100644 --- a/tests/visual/dialog/dialog_option_modal_false.html +++ b/tests/visual/dialog/dialog_option_modal_false.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_option_modal_true.html b/tests/visual/dialog/dialog_option_modal_true.html index b6e10e0d0..2218f132d 100644 --- a/tests/visual/dialog/dialog_option_modal_true.html +++ b/tests/visual/dialog/dialog_option_modal_true.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/tests/visual/dialog/dialog_ticket_4826.html b/tests/visual/dialog/dialog_ticket_4826.html index 10f7b05a3..2906a766c 100644 --- a/tests/visual/dialog/dialog_ticket_4826.html +++ b/tests/visual/dialog/dialog_ticket_4826.html @@ -5,12 +5,12 @@ <link rel="stylesheet" href="../visual.css" type="text/css" /> <link rel="stylesheet" href="../../../themes/base/ui.all.css" type="text/css"> <script type="text/javascript" src="../../../jquery-1.3.2.js"></script> + <script type="text/javascript" src="../../../external/jquery.bgiframe-2.1.1.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.draggable.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.resizable.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.stackfix.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.dialog.js"></script> <script type="text/javascript"> $(function() { diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js index be4842e8a..6635499ec 100644 --- a/ui/jquery.ui.dialog.js +++ b/ui/jquery.ui.dialog.js @@ -27,7 +27,7 @@ var uiDialogClasses = $.widget("ui.dialog", { options: { autoOpen: true, - stackfix: false, + bgiframe: false, buttons: {}, closeOnEscape: true, closeText: 'close', @@ -146,7 +146,7 @@ $.widget("ui.dialog", { self._createButtons(options.buttons); self._isOpen = false; - (options.stackfix && $.fn.stackfix && uiDialog.stackfix()); + (options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe()); (options.autoOpen && self.open()); }, @@ -599,7 +599,7 @@ $.extend($.ui.dialog.overlay, { height: this.height() }); - (dialog.options.stackfix && $.fn.stackfix && $el.stackfix()); + (dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe()); this.instances.push($el); return $el; diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js index eb632fcce..b9587387c 100644 --- a/ui/jquery.ui.position.js +++ b/ui/jquery.ui.position.js @@ -140,7 +140,7 @@ $.fn.position = function(options) { })); }); - (options.stackfix !== false && $.fn.stackfix && elem.stackfix()); + (options.bgiframe !== false && $.fn.bgiframe && elem.bgiframe()); elem.offset($.extend(position, { using: options.using })); }); }; diff --git a/ui/jquery.ui.stackfix.js b/ui/jquery.ui.stackfix.js deleted file mode 100644 index 5631dc536..000000000 --- a/ui/jquery.ui.stackfix.js +++ /dev/null @@ -1,40 +0,0 @@ -/* - * jQuery UI Stackfix @VERSION - * - * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * http://docs.jquery.com/UI/Stackfix - */ - -(function($){ - -// This is only for IE6 -$.fn.stackfix = $.browser.msie && /msie 6\.0/i.test(navigator.userAgent) ? function(s) { - s = $.extend({ - top : 'auto', // auto == .currentStyle.borderTopWidth - left : 'auto', // auto == .currentStyle.borderLeftWidth - width : 'auto', // auto == offsetWidth - height : 'auto', // auto == offsetHeight - opacity : true, - src : 'javascript:false;' - }, s || {}); - var prop = function(n){return n&&n.constructor==Number?n+'px':n;}, - html = '<iframe class="ui-stackfix" frameborder="0" tabindex="-1" src="'+s.src+'" '+ - 'style="display:block;position:absolute;z-index:-1;'+ - (s.opacity !== false?'filter:Alpha(Opacity=\'0\');':'')+ - 'top:'+(s.top=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderTopWidth)||0)*-1)+\'px\')':prop(s.top))+';'+ - 'left:'+(s.left=='auto'?'expression(((parseInt(this.parentNode.currentStyle.borderLeftWidth)||0)*-1)+\'px\')':prop(s.left))+';'+ - 'width:'+(s.width=='auto'?'expression(this.parentNode.offsetWidth+\'px\')':prop(s.width))+';'+ - 'height:'+(s.height=='auto'?'expression(this.parentNode.offsetHeight+\'px\')':prop(s.height))+';'+ - '"/>'; - return this.each(function() { - if ( $('> iframe.ui-stackfix', this).length == 0 ) - this.insertBefore( document.createElement(html), this.firstChild ); - }); -} : function() { - return this; -}; - -})(jQuery);
\ No newline at end of file |