Merge branch 'selectmenu' of github.com:jquery/jquery-ui into selectmenu

Truenorthlogic · Dec 1, 2011 · 9810d2d · 9810d2d
2 parents aef2d2f + c336936
commit 9810d2d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git 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
@@ -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()