diff options
| author | Felix Nagel <info@felixnagel.com> | 2011-12-01 20:10:48 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2011-12-01 20:10:48 +0100 |
| commit | 9810d2d7f6d7c1b09046afe77beb40328d451bf7 (patch) | |
| tree | aa761e0fb81b44bae377d1122202adf4d810d322 | |
| parent | aef2d2fc6ccf233121b152d76e3795c3c1c0ea25 (diff) | |
| parent | c3369365c37363a91acb6d13fa3f112372439b5a (diff) | |
| download | jquery-ui-9810d2d7f6d7c1b09046afe77beb40328d451bf7.tar.gz jquery-ui-9810d2d7f6d7c1b09046afe77beb40328d451bf7.zip | |
Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu
| -rw-r--r-- | build/build.xml | 6 | ||||
| -rw-r--r-- | ui/jquery.ui.menu.js | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/build/build.xml b/build/build.xml index 49568b3cc..ddaa5b86d 100644 --- a/build/build.xml +++ b/build/build.xml @@ -123,6 +123,12 @@ <mapper type="glob" from="*.js" to="${min.dir}/*.min.js" /> <targetfile/> </apply> + <apply executable="build/minify-js.sh"> + <fileset dir="${dist.dir}/ui/i18n" includes="**.js" /> + <srcfile /> + <mapper type="glob" from="*.js" to="${min.dir}/i18n/*.min.js" /> + <targetfile/> + </apply> <apply executable="java" parallel="false"> <fileset dir="${dist.dir}/themes/base" includes="*.css" /> <arg line="-jar" /> diff --git a/ui/jquery.ui.menu.js b/ui/jquery.ui.menu.js index 77190189e..0263cff65 100644 --- a/ui/jquery.ui.menu.js +++ b/ui/jquery.ui.menu.js @@ -20,7 +20,7 @@ $.widget( "ui.menu", { defaultElement: "<ul>", delay: 150, options: { - items: "ul", + menus: "ul", position: { my: "left top", at: "right top" @@ -250,7 +250,7 @@ $.widget( "ui.menu", { refresh: function() { // initialize nested menus - var submenus = this.element.find( this.options.items + ":not( .ui-menu )" ) + var submenus = this.element.find( this.options.menus + ":not( .ui-menu )" ) .addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" ) .attr( "role", "menu" ) .hide() |