diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-11-10 01:40:05 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-11-10 01:40:05 +0100 |
| commit | 7ce8e0515ea7cc513c3c065946c85cf2d1aa5652 (patch) | |
| tree | a0337f9f7d8d0d27a7cdb78a63ee152d8357b32f /demos/dialog | |
| parent | 94b3a65c66e338fc6f697d13fc77d7f19b8666ae (diff) | |
| parent | d6c6b7dc3381432f50212b4f458931b2521ecb56 (diff) | |
| download | jquery-ui-7ce8e0515ea7cc513c3c065946c85cf2d1aa5652.tar.gz jquery-ui-7ce8e0515ea7cc513c3c065946c85cf2d1aa5652.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos/dialog')
| -rw-r--r-- | demos/dialog/animated.html | 14 | ||||
| -rw-r--r-- | demos/dialog/default.html | 1 | ||||
| -rw-r--r-- | demos/dialog/modal-confirmation.html | 1 | ||||
| -rw-r--r-- | demos/dialog/modal-form.html | 1 | ||||
| -rw-r--r-- | demos/dialog/modal-message.html | 1 | ||||
| -rw-r--r-- | demos/dialog/modal.html | 1 |
6 files changed, 8 insertions, 11 deletions
diff --git a/demos/dialog/animated.html b/demos/dialog/animated.html index 8a27150de..92d7b642d 100644 --- a/demos/dialog/animated.html +++ b/demos/dialog/animated.html @@ -5,7 +5,6 @@ <title>jQuery UI Dialog - Animation</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.8.2.js"></script> - <script src="../../external/jquery.bgiframe-2.1.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> @@ -18,18 +17,21 @@ <script src="../../ui/jquery.ui.effect-explode.js"></script> <link rel="stylesheet" href="../demos.css"> <script> - // increase the default animation speed to exaggerate the effect - $.fx.speeds._default = 1000; $(function() { $( "#dialog" ).dialog({ autoOpen: false, - show: "blind", - hide: "explode" + show: { + effect: "blind", + duration: 1000 + }, + hide: { + effect: "explode", + duration: 1000 + } }); $( "#opener" ).click(function() { $( "#dialog" ).dialog( "open" ); - return false; }); }); </script> diff --git a/demos/dialog/default.html b/demos/dialog/default.html index 5dcb1a05c..19cf912e2 100644 --- a/demos/dialog/default.html +++ b/demos/dialog/default.html @@ -5,7 +5,6 @@ <title>jQuery UI Dialog - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.8.2.js"></script> - <script src="../../external/jquery.bgiframe-2.1.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html index cca3b296d..b9bf6396f 100644 --- a/demos/dialog/modal-confirmation.html +++ b/demos/dialog/modal-confirmation.html @@ -5,7 +5,6 @@ <title>jQuery UI Dialog - Modal confirmation</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.8.2.js"></script> - <script src="../../external/jquery.bgiframe-2.1.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> diff --git a/demos/dialog/modal-form.html b/demos/dialog/modal-form.html index 48452f862..1c0cd6fc3 100644 --- a/demos/dialog/modal-form.html +++ b/demos/dialog/modal-form.html @@ -5,7 +5,6 @@ <title>jQuery UI Dialog - Modal form</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.8.2.js"></script> - <script src="../../external/jquery.bgiframe-2.1.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> diff --git a/demos/dialog/modal-message.html b/demos/dialog/modal-message.html index d44331017..3c877b26e 100644 --- a/demos/dialog/modal-message.html +++ b/demos/dialog/modal-message.html @@ -5,7 +5,6 @@ <title>jQuery UI Dialog - Modal message</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.8.2.js"></script> - <script src="../../external/jquery.bgiframe-2.1.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> diff --git a/demos/dialog/modal.html b/demos/dialog/modal.html index 2b1ac2574..9bb6d95b2 100644 --- a/demos/dialog/modal.html +++ b/demos/dialog/modal.html @@ -5,7 +5,6 @@ <title>jQuery UI Dialog - Basic modal</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.8.2.js"></script> - <script src="../../external/jquery.bgiframe-2.1.2.js"></script> <script src="../../ui/jquery.ui.core.js"></script> <script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.mouse.js"></script> |