aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Schmitz <arschmitz@gmail.com>2015-06-30 17:12:39 -0400
committerAlexander Schmitz <arschmitz@gmail.com>2015-07-21 11:00:41 -0400
commit41b5b2d7a9def3298a205150d0a8428c86798dcd (patch)
treeedbbfcfb9b6fcbc3d97e1e73ea926a62d37ebe32
parentf18ec88ea8dab42c884004ab36a02874f716afe2 (diff)
downloadjquery-ui-41b5b2d7a9def3298a205150d0a8428c86798dcd.tar.gz
jquery-ui-41b5b2d7a9def3298a205150d0a8428c86798dcd.zip
Draggable: Update to demos to use AMD
Ref #10119
-rw-r--r--demos/draggable/constrain-movement.html10
-rw-r--r--demos/draggable/cursor-style.html10
-rw-r--r--demos/draggable/default.html10
-rw-r--r--demos/draggable/events.html10
-rw-r--r--demos/draggable/handle.html10
-rw-r--r--demos/draggable/revert.html10
-rw-r--r--demos/draggable/scroll.html10
-rw-r--r--demos/draggable/snap-to.html10
-rw-r--r--demos/draggable/sortable.html11
-rw-r--r--demos/draggable/visual-feedback.html10
10 files changed, 20 insertions, 81 deletions
diff --git a/demos/draggable/constrain-movement.html b/demos/draggable/constrain-movement.html
index cca74be21..adb2f745f 100644
--- a/demos/draggable/constrain-movement.html
+++ b/demos/draggable/constrain-movement.html
@@ -4,11 +4,6 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Constrain movement</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>
<link rel="stylesheet" href="../demos.css">
<style>
.draggable { width: 90px; height: 90px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
@@ -18,14 +13,13 @@
#containment-wrapper { width: 95%; height:150px; border:2px solid #ccc; padding: 10px; }
h3 { clear: left; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ axis: "y" });
$( "#draggable2" ).draggable({ axis: "x" });
$( "#draggable3" ).draggable({ containment: "#containment-wrapper", scroll: false });
$( "#draggable5" ).draggable({ containment: "parent" });
- });
</script>
</head>
<body>
diff --git a/demos/draggable/cursor-style.html b/demos/draggable/cursor-style.html
index 7f3b0fda4..56dd4bb3a 100644
--- a/demos/draggable/cursor-style.html
+++ b/demos/draggable/cursor-style.html
@@ -4,21 +4,15 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Cursor style</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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable, #draggable2, #draggable3 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ cursor: "move", cursorAt: { top: 56, left: 56 } });
$( "#draggable2" ).draggable({ cursor: "crosshair", cursorAt: { top: -5, left: -5 } });
$( "#draggable3" ).draggable({ cursorAt: { bottom: 0 } });
- });
</script>
</head>
<body>
diff --git a/demos/draggable/default.html b/demos/draggable/default.html
index df6bf9da9..d164139af 100644
--- a/demos/draggable/default.html
+++ b/demos/draggable/default.html
@@ -4,19 +4,13 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - 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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable { width: 150px; height: 150px; padding: 0.5em; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable();
- });
</script>
</head>
<body>
diff --git a/demos/draggable/events.html b/demos/draggable/events.html
index ad8a98aaf..5496a9486 100644
--- a/demos/draggable/events.html
+++ b/demos/draggable/events.html
@@ -4,11 +4,6 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Events</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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable { width: 16em; padding: 0 1em; }
@@ -16,8 +11,8 @@
#draggable ul li span.ui-icon { float: left; }
#draggable ul li span.count { font-weight: bold; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
var $start_counter = $( "#event-start" ),
$drag_counter = $( "#event-drag" ),
$stop_counter = $( "#event-stop" ),
@@ -47,7 +42,6 @@
// ...then update the numbers
$( "span.count", $event_counter ).text( new_count );
}
- });
</script>
</head>
<body>
diff --git a/demos/draggable/handle.html b/demos/draggable/handle.html
index 2e7fd2295..ae8983b85 100644
--- a/demos/draggable/handle.html
+++ b/demos/draggable/handle.html
@@ -4,22 +4,16 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Handles</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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
#draggable p { cursor: move; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ handle: "p" });
$( "#draggable2" ).draggable({ cancel: "p.ui-widget-header" });
$( "div, p" ).disableSelection();
- });
</script>
</head>
<body>
diff --git a/demos/draggable/revert.html b/demos/draggable/revert.html
index 4371b7f2b..5720dbe88 100644
--- a/demos/draggable/revert.html
+++ b/demos/draggable/revert.html
@@ -4,20 +4,14 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Revert 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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable, #draggable2 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ revert: true });
$( "#draggable2" ).draggable({ revert: true, helper: "clone" });
- });
</script>
</head>
<body>
diff --git a/demos/draggable/scroll.html b/demos/draggable/scroll.html
index d3e97f326..2704842bc 100644
--- a/demos/draggable/scroll.html
+++ b/demos/draggable/scroll.html
@@ -4,21 +4,15 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Auto-scroll</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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable, #draggable2, #draggable3 { width: 100px; height: 100px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ scroll: true });
$( "#draggable2" ).draggable({ scroll: true, scrollSensitivity: 100 });
$( "#draggable3" ).draggable({ scroll: true, scrollSpeed: 100 });
- });
</script>
</head>
<body>
diff --git a/demos/draggable/snap-to.html b/demos/draggable/snap-to.html
index 726a51384..28cb9d5a7 100644
--- a/demos/draggable/snap-to.html
+++ b/demos/draggable/snap-to.html
@@ -4,25 +4,19 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - Snap to element or grid</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>
<link rel="stylesheet" href="../demos.css">
<style>
.draggable { width: 90px; height: 80px; padding: 5px; float: left; margin: 0 10px 10px 0; font-size: .9em; }
.ui-widget-header p, .ui-widget-content p { margin: 0; }
#snaptarget { height: 140px; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ snap: true });
$( "#draggable2" ).draggable({ snap: ".ui-widget-header" });
$( "#draggable3" ).draggable({ snap: ".ui-widget-header", snapMode: "outer" });
$( "#draggable4" ).draggable({ grid: [ 20, 20 ] });
$( "#draggable5" ).draggable({ grid: [ 80, 80 ] });
- });
</script>
</head>
<body>
diff --git a/demos/draggable/sortable.html b/demos/draggable/sortable.html
index 1251f0e29..9f07c4752 100644
--- a/demos/draggable/sortable.html
+++ b/demos/draggable/sortable.html
@@ -4,19 +4,13 @@
<meta charset="utf-8">
<title>jQuery UI Draggable + Sortable</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/sortable.js"></script>
<link rel="stylesheet" href="../demos.css">
<style>
ul { list-style-type: none; margin: 0; padding: 0; margin-bottom: 10px; }
li { margin: 5px; padding: 5px; width: 150px; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js" data-modules="sortable">
$( "#sortable" ).sortable({
revert: true
});
@@ -26,7 +20,6 @@
revert: "invalid"
});
$( "ul, li" ).disableSelection();
- });
</script>
</head>
<body>
diff --git a/demos/draggable/visual-feedback.html b/demos/draggable/visual-feedback.html
index 135d86c2a..65f28bb9e 100644
--- a/demos/draggable/visual-feedback.html
+++ b/demos/draggable/visual-feedback.html
@@ -4,11 +4,6 @@
<meta charset="utf-8">
<title>jQuery UI Draggable - 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>
<link rel="stylesheet" href="../demos.css">
<style>
#draggable, #draggable2, #draggable3, #set div { width: 90px; height: 90px; padding: 0.5em; float: left; margin: 0 10px 10px 0; }
@@ -16,8 +11,8 @@
#set { clear:both; float:left; width: 368px; height: 120px; }
p { clear:both; margin:0; padding:1em 0; }
</style>
- <script>
- $(function() {
+ <script src="../../external/requirejs/require.js"></script>
+ <script src="../bootstrap.js">
$( "#draggable" ).draggable({ helper: "original" });
$( "#draggable2" ).draggable({ opacity: 0.7, helper: "clone" });
$( "#draggable3" ).draggable({
@@ -28,7 +23,6 @@
}
});
$( "#set div" ).draggable({ stack: "#set div" });
- });
</script>
</head>
<body>