diff options
author | Alexander Schmitz <arschmitz@gmail.com> | 2015-06-30 17:18:16 -0400 |
---|---|---|
committer | Alexander Schmitz <arschmitz@gmail.com> | 2015-07-21 11:00:41 -0400 |
commit | 6acdd4a44447d4a4a002284b82c9e4e3e9df009b (patch) | |
tree | b48e49689ab882544355ff1c1d8394004db1cd5f | |
parent | 41b5b2d7a9def3298a205150d0a8428c86798dcd (diff) | |
download | jquery-ui-6acdd4a44447d4a4a002284b82c9e4e3e9df009b.tar.gz jquery-ui-6acdd4a44447d4a4a002284b82c9e4e3e9df009b.zip |
Droppable: Update demos to use AMD
Ref #10119
-rw-r--r-- | demos/droppable/accepted-elements.html | 11 | ||||
-rw-r--r-- | demos/droppable/default.html | 11 | ||||
-rw-r--r-- | demos/droppable/photo-manager.html | 16 | ||||
-rw-r--r-- | demos/droppable/propagation.html | 11 | ||||
-rw-r--r-- | demos/droppable/revert.html | 11 | ||||
-rw-r--r-- | demos/droppable/visual-feedback.html | 11 |
6 files changed, 13 insertions, 58 deletions
diff --git a/demos/droppable/accepted-elements.html b/demos/droppable/accepted-elements.html index 2a5029526..b073087e2 100644 --- a/demos/droppable/accepted-elements.html +++ b/demos/droppable/accepted-elements.html @@ -4,19 +4,13 @@ <meta charset="utf-8"> <title>jQuery UI Droppable - Accept</title> <link rel="stylesheet" href="../../themes/base/all.css"> - <script src="../../external/jquery/jquery.js"></script> - <script src="../../ui/core.js"></script> - <script src="../../ui/widget.js"></script> - <script src="../../ui/mouse.js"></script> - <script src="../../ui/draggable.js"></script> - <script src="../../ui/droppable.js"></script> <link rel="stylesheet" href="../demos.css"> <style> #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } #draggable, #draggable-nonvalid { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; } </style> - <script> - $(function() { + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js"> $( "#draggable, #draggable-nonvalid" ).draggable(); $( "#droppable" ).droppable({ accept: "#draggable", @@ -31,7 +25,6 @@ .html( "Dropped!" ); } }); - }); </script> </head> <body> diff --git a/demos/droppable/default.html b/demos/droppable/default.html index a097e7183..0ed58cae3 100644 --- a/demos/droppable/default.html +++ b/demos/droppable/default.html @@ -4,19 +4,13 @@ <meta charset="utf-8"> <title>jQuery UI Droppable - Default functionality</title> <link rel="stylesheet" href="../../themes/base/all.css"> - <script src="../../external/jquery/jquery.js"></script> - <script src="../../ui/core.js"></script> - <script src="../../ui/widget.js"></script> - <script src="../../ui/mouse.js"></script> - <script src="../../ui/draggable.js"></script> - <script src="../../ui/droppable.js"></script> <link rel="stylesheet" href="../demos.css"> <style> #draggable { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; } #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> - <script> - $(function() { + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js"> $( "#draggable" ).draggable(); $( "#droppable" ).droppable({ drop: function( event, ui ) { @@ -26,7 +20,6 @@ .html( "Dropped!" ); } }); - }); </script> </head> <body> diff --git a/demos/droppable/photo-manager.html b/demos/droppable/photo-manager.html index 39afa9c32..2b324c1e9 100644 --- a/demos/droppable/photo-manager.html +++ b/demos/droppable/photo-manager.html @@ -4,16 +4,6 @@ <meta charset="utf-8"> <title>jQuery UI Droppable - Simple photo manager</title> <link rel="stylesheet" href="../../themes/base/all.css"> - <script src="../../external/jquery/jquery.js"></script> - <script src="../../ui/position.js"></script> - <script src="../../ui/core.js"></script> - <script src="../../ui/widget.js"></script> - <script src="../../ui/mouse.js"></script> - <script src="../../ui/draggable.js"></script> - <script src="../../ui/droppable.js"></script> - <script src="../../ui/resizable.js"></script> - <script src="../../ui/button.js"></script> - <script src="../../ui/dialog.js"></script> <link rel="stylesheet" href="../demos.css"> <style> #gallery { float: left; width: 65%; min-height: 12em; } @@ -29,8 +19,9 @@ #trash h4 .ui-icon { float: left; } #trash .gallery h5 { display: none; } </style> - <script> - $(function() { + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js" data-modules="dialog"> + // there's the gallery and the trash var $gallery = $( "#gallery" ), $trash = $( "#trash" ); @@ -138,7 +129,6 @@ return false; }); - }); </script> </head> <body> diff --git a/demos/droppable/propagation.html b/demos/droppable/propagation.html index 99fb21711..048c847f3 100644 --- a/demos/droppable/propagation.html +++ b/demos/droppable/propagation.html @@ -4,20 +4,14 @@ <meta charset="utf-8"> <title>jQuery UI Droppable - Prevent propagation</title> <link rel="stylesheet" href="../../themes/base/all.css"> - <script src="../../external/jquery/jquery.js"></script> - <script src="../../ui/core.js"></script> - <script src="../../ui/widget.js"></script> - <script src="../../ui/mouse.js"></script> - <script src="../../ui/draggable.js"></script> - <script src="../../ui/droppable.js"></script> <link rel="stylesheet" href="../demos.css"> <style> #draggable { width: 100px; height: 40px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; } #droppable, #droppable2 { width: 230px; height: 120px; padding: 0.5em; float: left; margin: 10px; } #droppable-inner, #droppable2-inner { width: 170px; height: 60px; padding: 0.5em; float: left; margin: 10px; } </style> - <script> - $(function() { + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js"> $( "#draggable" ).draggable(); $( "#droppable, #droppable-inner" ).droppable({ @@ -47,7 +41,6 @@ .html( "Dropped!" ); } }); - }); </script> </head> <body> diff --git a/demos/droppable/revert.html b/demos/droppable/revert.html index f34801e90..2a05f0169 100644 --- a/demos/droppable/revert.html +++ b/demos/droppable/revert.html @@ -4,19 +4,13 @@ <meta charset="utf-8"> <title>jQuery UI Droppable - Revert draggable position</title> <link rel="stylesheet" href="../../themes/base/all.css"> - <script src="../../external/jquery/jquery.js"></script> - <script src="../../ui/core.js"></script> - <script src="../../ui/widget.js"></script> - <script src="../../ui/mouse.js"></script> - <script src="../../ui/draggable.js"></script> - <script src="../../ui/droppable.js"></script> <link rel="stylesheet" href="../demos.css"> <style> #draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; } #droppable { width: 150px; height: 150px; padding: 0.5em; float: left; margin: 10px; } </style> - <script> - $(function() { + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js"> $( "#draggable" ).draggable({ revert: "valid" }); $( "#draggable2" ).draggable({ revert: "invalid" }); @@ -32,7 +26,6 @@ .html( "Dropped!" ); } }); - }); </script> </head> <body> diff --git a/demos/droppable/visual-feedback.html b/demos/droppable/visual-feedback.html index 9852f371b..3ef5cd1e2 100644 --- a/demos/droppable/visual-feedback.html +++ b/demos/droppable/visual-feedback.html @@ -4,20 +4,14 @@ <meta charset="utf-8"> <title>jQuery UI Droppable - Visual feedback</title> <link rel="stylesheet" href="../../themes/base/all.css"> - <script src="../../external/jquery/jquery.js"></script> - <script src="../../ui/core.js"></script> - <script src="../../ui/widget.js"></script> - <script src="../../ui/mouse.js"></script> - <script src="../../ui/draggable.js"></script> - <script src="../../ui/droppable.js"></script> <link rel="stylesheet" href="../demos.css"> <style> #draggable, #draggable2 { width: 90px; height: 90px; padding: 0.5em; float: left; margin: 10px 10px 10px 0; } #droppable, #droppable2 { width: 120px; height: 120px; padding: 0.5em; float: left; margin: 10px; } h3 { clear: left; } </style> - <script> - $(function() { + <script src="../../external/requirejs/require.js"></script> + <script src="../bootstrap.js"> $( "#draggable" ).draggable(); $( "#droppable" ).droppable({ classes: { @@ -44,7 +38,6 @@ .html( "Dropped!" ); } }); - }); </script> </head> <body> |