diff options
| author | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2013-11-25 14:29:30 +0100 |
|---|---|---|
| committer | Jörn Zaefferer <joern.zaefferer@gmail.com> | 2013-11-25 14:29:30 +0100 |
| commit | 9a5f20bc7d5218f864fb65d5d20775596065280d (patch) | |
| tree | 82c176a82f64ca3c1a26648b9e3bf0d2f7282dd8 /demos | |
| parent | 1bc5d087467c913b92c927d05259eea72f96f4ed (diff) | |
| parent | 8eeb0e7d88a943e3860f8492661ac8090cb8d3ac (diff) | |
| download | jquery-ui-9a5f20bc7d5218f864fb65d5d20775596065280d.tar.gz jquery-ui-9a5f20bc7d5218f864fb65d5d20775596065280d.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/dialog/modal-confirmation.html | 1 | ||||
| -rw-r--r-- | demos/spinner/latlong.html | 2 | ||||
| -rw-r--r-- | demos/tabs/manipulation.html | 2 | ||||
| -rw-r--r-- | demos/tooltip/video-player.html | 2 | ||||
| -rw-r--r-- | demos/widget/default.html | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/demos/dialog/modal-confirmation.html b/demos/dialog/modal-confirmation.html index 7b6d4835d..4bcc234da 100644 --- a/demos/dialog/modal-confirmation.html +++ b/demos/dialog/modal-confirmation.html @@ -11,7 +11,6 @@ <script src="../../ui/jquery.ui.button.js"></script> <script src="../../ui/jquery.ui.draggable.js"></script> <script src="../../ui/jquery.ui.position.js"></script> - <script src="../../ui/jquery.ui.button.js"></script> <script src="../../ui/jquery.ui.dialog.js"></script> <link rel="stylesheet" href="../demos.css"> <script> diff --git a/demos/spinner/latlong.html b/demos/spinner/latlong.html index 56338205c..1c419ad6b 100644 --- a/demos/spinner/latlong.html +++ b/demos/spinner/latlong.html @@ -51,7 +51,7 @@ <div id="map"></div> <div class="demo-description"> -<p>Google Maps integration, using spinners to change latidude and longitude.</p> +<p>Google Maps integration, using spinners to change latitude and longitude.</p> </div> </body> </html> diff --git a/demos/tabs/manipulation.html b/demos/tabs/manipulation.html index 61a59271b..62239c4b7 100644 --- a/demos/tabs/manipulation.html +++ b/demos/tabs/manipulation.html @@ -29,7 +29,7 @@ var tabs = $( "#tabs" ).tabs(); - // modal dialog init: custom buttons and a "close" callback reseting the form inside + // modal dialog init: custom buttons and a "close" callback resetting the form inside var dialog = $( "#dialog" ).dialog({ autoOpen: false, modal: true, diff --git a/demos/tooltip/video-player.html b/demos/tooltip/video-player.html index f95e2de66..3a4bc777f 100644 --- a/demos/tooltip/video-player.html +++ b/demos/tooltip/video-player.html @@ -107,7 +107,7 @@ <button class="menu" data-icon="ui-icon-triangle-1-s">Add to favorites or playlist</button> </div> <button title="Share this video">Share</button> - <button data-icon="ui-icon-alert">Flag as inappropiate</button> + <button data-icon="ui-icon-alert">Flag as inappropriate</button> </div> <div class="demo-description"> diff --git a/demos/widget/default.html b/demos/widget/default.html index 444de83b6..0ffc67138 100644 --- a/demos/widget/default.html +++ b/demos/widget/default.html @@ -149,7 +149,7 @@ } }); - // click to set options after initalization + // click to set options after initialization $( "#black" ).click( function() { $( ":custom-colorize" ).colorize( "option", { red: 0, |