diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-11-26 00:18:25 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-11-26 00:18:25 +0100 |
| commit | 5bc7fc2b1a248063b4d52086dfc32fae8601680e (patch) | |
| tree | 82c176a82f64ca3c1a26648b9e3bf0d2f7282dd8 /demos | |
| parent | c20f1f8457802f90f8f06bcd2a33c340c2226b7c (diff) | |
| parent | 9a5f20bc7d5218f864fb65d5d20775596065280d (diff) | |
| download | jquery-ui-5bc7fc2b1a248063b4d52086dfc32fae8601680e.tar.gz jquery-ui-5bc7fc2b1a248063b4d52086dfc32fae8601680e.zip | |
Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/autocomplete/categories.html | 2 | ||||
| -rw-r--r-- | demos/dialog/modal-confirmation.html | 1 | ||||
| -rw-r--r-- | demos/selectmenu/custom_render.html | 1 | ||||
| -rw-r--r-- | demos/selectmenu/default.html | 3 | ||||
| -rw-r--r-- | demos/selectmenu/index.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 |
9 files changed, 9 insertions, 7 deletions
diff --git a/demos/autocomplete/categories.html b/demos/autocomplete/categories.html index e3c59ba13..3c436efbd 100644 --- a/demos/autocomplete/categories.html +++ b/demos/autocomplete/categories.html @@ -23,7 +23,7 @@ $.widget( "custom.catcomplete", $.ui.autocomplete, { _create: function() { this._super(); - this.menu.option( "items", "> :not(.ui-autocomplete-category)" ); + this.widget().menu( "option", "items", "> :not(.ui-autocomplete-category)" ); }, _renderMenu: function( ul, items ) { var that = this, 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/selectmenu/custom_render.html b/demos/selectmenu/custom_render.html index 7d33eee8c..b037d325a 100644 --- a/demos/selectmenu/custom_render.html +++ b/demos/selectmenu/custom_render.html @@ -2,6 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <title>jQuery UI Selectmenu - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.10.2.js"></script> diff --git a/demos/selectmenu/default.html b/demos/selectmenu/default.html index 2e35599bc..69bde2a55 100644 --- a/demos/selectmenu/default.html +++ b/demos/selectmenu/default.html @@ -2,6 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <title>jQuery UI Selectmenu - Default functionality</title> <link rel="stylesheet" href="../../themes/base/jquery.ui.all.css"> <script src="../../jquery-1.10.2.js"></script> @@ -90,7 +91,7 @@ <option value="19">19</option> </select> </fieldset> - + </form> </div> diff --git a/demos/selectmenu/index.html b/demos/selectmenu/index.html index ef7162c4d..3b035f5fb 100644 --- a/demos/selectmenu/index.html +++ b/demos/selectmenu/index.html @@ -2,6 +2,7 @@ <html lang="en"> <head> <meta charset="utf-8"> + <meta name="viewport" content="width=device-width, initial-scale=1"> <title>jQuery UI Selectmenu Demos</title> </head> <body> 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, |