Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
commit c3369365c37363a91acb6d13fa3f112372439b5a 2 parents b539e2e + ce7918f
@kborchers kborchers authored
Showing with 8 additions and 2 deletions.
  1. +6 −0 build/build.xml
  2. +2 −2 ui/jquery.ui.menu.js
View
6 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" />
View
4 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()
Please sign in to comment.
Something went wrong with that request. Please try again.