diff options
| author | Felix Nagel <info@felixnagel.com> | 2013-11-13 19:45:56 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2013-11-13 19:45:56 +0100 |
| commit | ab2219b6ac3dbab58885a0bd2aaac01c4bcc1c2f (patch) | |
| tree | dedf39afe3330bae4eec603297432d972e5bcfc1 /demos | |
| parent | a6c5f58d8243b39c6cd57b76ffb0776adfcc8b1c (diff) | |
| parent | 14782c04e2201c53e3ecb80b086f1a4c27aa991d (diff) | |
| download | jquery-ui-ab2219b6ac3dbab58885a0bd2aaac01c4bcc1c2f.tar.gz jquery-ui-ab2219b6ac3dbab58885a0bd2aaac01c4bcc1c2f.zip | |
Merge branch 'master' into selectmenu
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/autocomplete/categories.html | 4 | ||||
| -rw-r--r-- | demos/menu/default.html | 2 | ||||
| -rw-r--r-- | demos/menu/icons.html | 19 | ||||
| -rw-r--r-- | demos/resizable/delay-start.html | 2 |
4 files changed, 16 insertions, 11 deletions
diff --git a/demos/autocomplete/categories.html b/demos/autocomplete/categories.html index 6601ebc1c..e3c59ba13 100644 --- a/demos/autocomplete/categories.html +++ b/demos/autocomplete/categories.html @@ -21,6 +21,10 @@ </style> <script> $.widget( "custom.catcomplete", $.ui.autocomplete, { + _create: function() { + this._super(); + this.menu.option( "items", "> :not(.ui-autocomplete-category)" ); + }, _renderMenu: function( ul, items ) { var that = this, currentCategory = ""; diff --git a/demos/menu/default.html b/demos/menu/default.html index 5fc0971d9..a54eb3d24 100644 --- a/demos/menu/default.html +++ b/demos/menu/default.html @@ -30,7 +30,7 @@ <ul> <li class="ui-state-disabled">Ada</li> <li>Saarland</li> - <li>Salzburg</li> + <li>Salzburg an der schönen Donau</li> </ul> </li> <li>Saarland</li> diff --git a/demos/menu/icons.html b/demos/menu/icons.html index daa66c36d..2c416c65f 100644 --- a/demos/menu/icons.html +++ b/demos/menu/icons.html @@ -22,19 +22,20 @@ <body> <ul id="menu"> - <li><a href="#"><span class="ui-icon ui-icon-disk"></span>Save</a></li> - <li><a href="#"><span class="ui-icon ui-icon-zoomin"></span>Zoom In</a></li> - <li><a href="#"><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</a></li> - <li class="ui-state-disabled"><a href="#"><span class="ui-icon ui-icon-print"></span>Print...</a></li> + <li><span class="ui-icon ui-icon-disk"></span>Save</li> + <li><span class="ui-icon ui-icon-zoomin"></span>Zoom In</li> + <li><span class="ui-icon ui-icon-zoomout"></span>Zoom Out</li> + <li class="ui-state-disabled"><span class="ui-icon ui-icon-print"></span>Print...</li> <li> - <a href="#">Playback</a> + Playback <ul> - <li><a href="#"><span class="ui-icon ui-icon-seek-start"></span>Prev</a></li> - <li><a href="#"><span class="ui-icon ui-icon-stop"></span>Stop</a></li> - <li><a href="#"><span class="ui-icon ui-icon-play"></span>Play</a></li> - <li><a href="#"><span class="ui-icon ui-icon-seek-end"></span>Next</a></li> + <li><span class="ui-icon ui-icon-seek-start"></span>Prev</li> + <li><span class="ui-icon ui-icon-stop"></span>Stop</li> + <li><span class="ui-icon ui-icon-play"></span>Play</li> + <li><span class="ui-icon ui-icon-seek-end"></span>Next</li> </ul> </li> + <li>Learn more about this menu</li> </ul> <div class="demo-description"> diff --git a/demos/resizable/delay-start.html b/demos/resizable/delay-start.html index b7ced8818..6ecd3b6f8 100644 --- a/demos/resizable/delay-start.html +++ b/demos/resizable/delay-start.html @@ -39,7 +39,7 @@ </div> <div class="demo-description"> -<p>Delay the start of resizng for a number of milliseconds with the <code>delay</code> option; prevent resizing until the cursor is held down and dragged a specifed number of pixels with the <code>distance</code> option.</p> +<p>Delay the start of resizing for a number of milliseconds with the <code>delay</code> option; prevent resizing until the cursor is held down and dragged a specifed number of pixels with the <code>distance</code> option.</p> </div> </body> </html> |