diff options
| author | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:31:27 +0100 |
|---|---|---|
| committer | jzaefferer <joern.zaefferer@gmail.com> | 2010-12-22 18:31:27 +0100 |
| commit | 3552947c19b8ea1b779dc9809783c6ac6a218d68 (patch) | |
| tree | 61b23078b9ff83f65bd5258bc4dd9efed5ac5f7a /tests/visual/position | |
| parent | 8d39171fa285519203688084f3cf66c1e2ae0ada (diff) | |
| parent | 70e8e9f294729f120f7b52fb9803fddfd37e464e (diff) | |
| download | jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.tar.gz jquery-ui-3552947c19b8ea1b779dc9809783c6ac6a218d68.zip | |
Merge remote branch 'origin/menu'
Conflicts:
demos/autocomplete/categories.html
demos/autocomplete/combobox.html
demos/autocomplete/custom-data.html
demos/autocomplete/default.html
demos/autocomplete/folding.html
demos/autocomplete/multiple-remote.html
demos/autocomplete/multiple.html
demos/autocomplete/remote-jsonp.html
demos/autocomplete/remote-with-cache.html
demos/autocomplete/remote.html
demos/autocomplete/xml.html
demos/button/splitbutton.html
demos/index.html
tests/visual/menu/nested.html
themes/base/jquery.ui.autocomplete.css
ui/jquery.ui.autocomplete.js
Diffstat (limited to 'tests/visual/position')
| -rw-r--r-- | tests/visual/position/position.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/visual/position/position.html b/tests/visual/position/position.html index 80452bc81..11fb48d6e 100644 --- a/tests/visual/position/position.html +++ b/tests/visual/position/position.html @@ -9,7 +9,7 @@ <script type="text/javascript" src="../../../ui/jquery.ui.core.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.widget.js"></script> <script type="text/javascript" src="../../../ui/jquery.ui.position.js"></script> - <script type="text/javascript" src="../../../ui/jquery.ui.autocomplete.js"></script> + <script type="text/javascript" src="../../../ui/jquery.ui.menu.js"></script> <script type="text/javascript" src="http://jqueryui.com/themeroller/themeswitchertool/"></script> <script type="text/javascript"> $(function() { |