mirror of
https://github.com/jquery/jquery-ui.git
synced 2025-01-07 20:34:24 +00:00
replacing bgiframe with ui.stackfix, updated dialog and its demos accordingly
This commit is contained in:
parent
f51cdf206c
commit
a2899b145f
@ -7,14 +7,14 @@
|
|||||||
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
||||||
|
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/effects.core.js"></script>
|
<script type="text/javascript" src="../../ui/effects.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/effects.blind.js"></script>
|
<script type="text/javascript" src="../../ui/effects.blind.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/effects.explode.js"></script>
|
<script type="text/javascript" src="../../ui/effects.explode.js"></script>
|
||||||
<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
|
|
||||||
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$.ui.dialog.defaults.bgiframe = true;
|
$.ui.dialog.defaults.stackfix = true;
|
||||||
// increase the default animation speed to exaggerate the effect
|
// increase the default animation speed to exaggerate the effect
|
||||||
$.fx.speeds._default = 1000;
|
$.fx.speeds._default = 1000;
|
||||||
$(function() {
|
$(function() {
|
||||||
|
@ -8,10 +8,9 @@
|
|||||||
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
||||||
<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
|
|
||||||
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$.ui.dialog.defaults.bgiframe = true;
|
$.ui.dialog.defaults.stackfix = true;
|
||||||
$(function() {
|
$(function() {
|
||||||
$("#dialog").dialog();
|
$("#dialog").dialog();
|
||||||
});
|
});
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
||||||
|
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
||||||
<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
|
|
||||||
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
$("#dialog").dialog({
|
$("#dialog").dialog({
|
||||||
bgiframe: true,
|
stackfix: true,
|
||||||
resizable: false,
|
resizable: false,
|
||||||
height:140,
|
height:140,
|
||||||
modal: true,
|
modal: true,
|
||||||
|
@ -7,10 +7,10 @@
|
|||||||
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
||||||
|
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/effects.core.js"></script>
|
<script type="text/javascript" src="../../ui/effects.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
|
<script type="text/javascript" src="../../ui/effects.highlight.js"></script>
|
||||||
<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
|
|
||||||
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
||||||
<style type="text/css">
|
<style type="text/css">
|
||||||
body { font-size: 62.5%; }
|
body { font-size: 62.5%; }
|
||||||
@ -64,7 +64,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
$("#dialog").dialog({
|
$("#dialog").dialog({
|
||||||
bgiframe: true,
|
stackfix: true,
|
||||||
autoOpen: false,
|
autoOpen: false,
|
||||||
height: 300,
|
height: 300,
|
||||||
modal: true,
|
modal: true,
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
||||||
|
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
||||||
<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
|
|
||||||
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
$("#dialog").dialog({
|
$("#dialog").dialog({
|
||||||
bgiframe: true,
|
stackfix: true,
|
||||||
modal: true,
|
modal: true,
|
||||||
buttons: {
|
buttons: {
|
||||||
Ok: function() {
|
Ok: function() {
|
||||||
|
@ -7,13 +7,13 @@
|
|||||||
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
<script type="text/javascript" src="../../ui/ui.core.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.draggable.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
<script type="text/javascript" src="../../ui/ui.resizable.js"></script>
|
||||||
|
<script type="text/javascript" src="../../ui/ui.stackfix.js"></script>
|
||||||
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../../ui/ui.dialog.js"></script>
|
||||||
<script type="text/javascript" src="../../external/jquery.bgiframe-2.1.1.js"></script>
|
|
||||||
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
<link type="text/css" href="../demos.css" rel="stylesheet" />
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
$(function() {
|
$(function() {
|
||||||
$("#dialog").dialog({
|
$("#dialog").dialog({
|
||||||
bgiframe: true,
|
stackfix: true,
|
||||||
height: 140,
|
height: 140,
|
||||||
modal: true
|
modal: true
|
||||||
});
|
});
|
||||||
|
@ -6,8 +6,8 @@
|
|||||||
<link type="text/css" href="../themes/base/ui.all.css" rel="stylesheet" />
|
<link type="text/css" href="../themes/base/ui.all.css" rel="stylesheet" />
|
||||||
<link type="text/css" href="demos.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="../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/ui.core.js"></script>
|
<script type="text/javascript" src="../ui/ui.core.js"></script>
|
||||||
|
<script type="text/javascript" src="../ui/ui.stackfix.js"></script>
|
||||||
<script type="text/javascript" src="../ui/ui.accordion.js"></script>
|
<script type="text/javascript" src="../ui/ui.accordion.js"></script>
|
||||||
<script type="text/javascript" src="../ui/ui.datepicker.js"></script>
|
<script type="text/javascript" src="../ui/ui.datepicker.js"></script>
|
||||||
<script type="text/javascript" src="../ui/ui.dialog.js"></script>
|
<script type="text/javascript" src="../ui/ui.dialog.js"></script>
|
||||||
|
100
external/jquery.bgiframe-2.1.1.js
vendored
100
external/jquery.bgiframe-2.1.1.js
vendored
@ -1,100 +0,0 @@
|
|||||||
/* 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:44:59 -0500 (Sat, 21 Jul 2007) $
|
|
||||||
* $Rev: 2446 $
|
|
||||||
*
|
|
||||||
* Version 2.1.1
|
|
||||||
*/
|
|
||||||
|
|
||||||
(function($){
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The bgiframe is chainable and applies the iframe hack to get
|
|
||||||
* around zIndex issues in IE6. It will only apply itself in IE6
|
|
||||||
* and adds a class to the iframe called 'bgiframe'. The iframe
|
|
||||||
* is appeneded as the first child of the matched element(s)
|
|
||||||
* with a tabIndex and zIndex of -1.
|
|
||||||
*
|
|
||||||
* By default the plugin will take borders, sized with pixel units,
|
|
||||||
* into account. If a different unit is used for the border's width,
|
|
||||||
* then you will need to use the top and left settings as explained below.
|
|
||||||
*
|
|
||||||
* NOTICE: This plugin has been reported to cause perfromance problems
|
|
||||||
* when used on elements that change properties (like width, height and
|
|
||||||
* opacity) a lot in IE6. Most of these problems have been caused by
|
|
||||||
* the expressions used to calculate the elements width, height and
|
|
||||||
* borders. Some have reported it is due to the opacity filter. All
|
|
||||||
* these settings can be changed if needed as explained below.
|
|
||||||
*
|
|
||||||
* @example $('div').bgiframe();
|
|
||||||
* @before <div><p>Paragraph</p></div>
|
|
||||||
* @result <div><iframe class="bgiframe".../><p>Paragraph</p></div>
|
|
||||||
*
|
|
||||||
* @param Map settings Optional settings to configure the iframe.
|
|
||||||
* @option String|Number top The iframe must be offset to the top
|
|
||||||
* by the width of the top border. This should be a negative
|
|
||||||
* number representing the border-top-width. If a number is
|
|
||||||
* is used here, pixels will be assumed. Otherwise, be sure
|
|
||||||
* to specify a unit. An expression could also be used.
|
|
||||||
* By default the value is "auto" which will use an expression
|
|
||||||
* to get the border-top-width if it is in pixels.
|
|
||||||
* @option String|Number left The iframe must be offset to the left
|
|
||||||
* by the width of the left border. This should be a negative
|
|
||||||
* number representing the border-left-width. If a number is
|
|
||||||
* is used here, pixels will be assumed. Otherwise, be sure
|
|
||||||
* to specify a unit. An expression could also be used.
|
|
||||||
* By default the value is "auto" which will use an expression
|
|
||||||
* to get the border-left-width if it is in pixels.
|
|
||||||
* @option String|Number width This is the width of the iframe. If
|
|
||||||
* a number is used here, pixels will be assume. Otherwise, be sure
|
|
||||||
* to specify a unit. An experssion could also be used.
|
|
||||||
* By default the value is "auto" which will use an experssion
|
|
||||||
* to get the offsetWidth.
|
|
||||||
* @option String|Number height This is the height of the iframe. If
|
|
||||||
* a number is used here, pixels will be assume. Otherwise, be sure
|
|
||||||
* to specify a unit. An experssion could also be used.
|
|
||||||
* By default the value is "auto" which will use an experssion
|
|
||||||
* to get the offsetHeight.
|
|
||||||
* @option Boolean opacity This is a boolean representing whether or not
|
|
||||||
* to use opacity. If set to true, the opacity of 0 is applied. If
|
|
||||||
* set to false, the opacity filter is not applied. Default: true.
|
|
||||||
* @option String src This setting is provided so that one could change
|
|
||||||
* the src of the iframe to whatever they need.
|
|
||||||
* Default: "javascript:false;"
|
|
||||||
*
|
|
||||||
* @name bgiframe
|
|
||||||
* @type jQuery
|
|
||||||
* @cat Plugins/bgiframe
|
|
||||||
* @author Brandon Aaron (brandon.aaron@gmail.com || http://brandonaaron.net)
|
|
||||||
*/
|
|
||||||
$.fn.bgIframe = $.fn.bgiframe = function(s) {
|
|
||||||
// This is only for IE6
|
|
||||||
if ( $.browser.msie && /6.0/.test(navigator.userAgent) ) {
|
|
||||||
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="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);
|
|
@ -134,7 +134,7 @@ $.widget("ui.dialog", {
|
|||||||
self._createButtons(options.buttons);
|
self._createButtons(options.buttons);
|
||||||
self._isOpen = false;
|
self._isOpen = false;
|
||||||
|
|
||||||
(options.bgiframe && $.fn.bgiframe && uiDialog.bgiframe());
|
(options.stackfix && $.fn.stackfix && uiDialog.stackfix());
|
||||||
(options.autoOpen && self.open());
|
(options.autoOpen && self.open());
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -526,7 +526,7 @@ $.extend($.ui.dialog, {
|
|||||||
version: "@VERSION",
|
version: "@VERSION",
|
||||||
defaults: {
|
defaults: {
|
||||||
autoOpen: true,
|
autoOpen: true,
|
||||||
bgiframe: false,
|
stackfix: false,
|
||||||
buttons: {},
|
buttons: {},
|
||||||
closeOnEscape: true,
|
closeOnEscape: true,
|
||||||
closeText: 'close',
|
closeText: 'close',
|
||||||
@ -596,7 +596,7 @@ $.extend($.ui.dialog.overlay, {
|
|||||||
height: this.height()
|
height: this.height()
|
||||||
});
|
});
|
||||||
|
|
||||||
(dialog.options.bgiframe && $.fn.bgiframe && $el.bgiframe());
|
(dialog.options.stackfix && $.fn.stackfix && $el.stackfix());
|
||||||
|
|
||||||
this.instances.push($el);
|
this.instances.push($el);
|
||||||
return $el;
|
return $el;
|
||||||
|
46
ui/ui.stackfix.js
Normal file
46
ui/ui.stackfix.js
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* jQuery UI Stackfix @VERSION
|
||||||
|
*
|
||||||
|
* Copyright (c) 2008 Brandon Aaron (http://brandonaaron.net)
|
||||||
|
* to be replaced with...?
|
||||||
|
* 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/Plugins/bgiframe
|
||||||
|
* to be moved to...?
|
||||||
|
* http://docs.jquery.com/UI/Stackfix
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
(function($){
|
||||||
|
|
||||||
|
// This is only for IE6
|
||||||
|
$.fn.stackfix = $.browser.msie && /6.0/.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);
|
Loading…
Reference in New Issue
Block a user