Menubar/Popup: Finish merge from master, after redoing the broken merge commit along with the three follow-up commits

Author: jzaefferer

demos/menubar/default.html

@@ -5,7 +5,7 @@
 	<title>jQuery UI Menubar - Default demo</title>
 	<link rel="stylesheet" href="../demos.css" type="text/css" />
 	<link rel="stylesheet" href="../../themes/base/jquery.ui.all.css" />
-	<script src="../../jquery-1.7.1.js"></script>
+	<script src="../../jquery-1.7.2.js"></script>
 	<script src="../../ui/jquery.ui.core.js"></script>
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
@@ -59,7 +59,7 @@
 		<a href="#File">File</a>
 		<ul>
 			<li><a href="#Open...">Open...</a></li>
-			<li class="ui-state-disabled">Open recent...</li>
+			<li class="ui-state-disabled"><a href="#">Open recent...</a></li>
 			<li><a href="#Save">Save</a></li>
 			<li><a href="#Save%20as...">Save as...</a></li>
 			<li><a href="#Close">Close</a></li>
@@ -71,7 +71,7 @@
 		<ul>
 			<li><a href="#Copy">Copy</a></li>
 			<li><a href="#Cut">Cut</a></li>
-			<li class="ui-state-disabled">Paste</li>
+			<li class="ui-state-disabled"><a href="#">Paste</a></li>
 		</ul>
 	</li>
 	<li>
@@ -105,7 +105,7 @@
 		<a href="#File">File</a>
 		<ul>
 			<li><a href="#Open...">Open...</a></li>
-			<li class="ui-state-disabled">Open recent...</li>
+			<li class="ui-state-disabled"><a href="#">Open recent...</a></li>
 			<li><a href="#Save">Save</a></li>
 			<li><a href="#Save%20as...">Save as...</a></li>
 			<li><a href="#Close">Close</a></li>
@@ -117,7 +117,7 @@
 		<ul>
 			<li><a href="#Copy">Copy</a></li>
 			<li><a href="#Cut">Cut</a></li>
-			<li class="ui-state-disabled">Paste</li>
+			<li class="ui-state-disabled"><a href="#">Paste</a></li>
 		</ul>
 	</li>
 	<li>
@@ -151,7 +151,7 @@
 		<a href="#File">File</a>
 		<div class="menuElement">
 			<div><a href="#Open...">Open...</a></div>
-			<div class="ui-state-disabled">Open recent...</div>
+			<div class="ui-state-disabled"><a href="#">Open recent...</a></div>
 			<div><a href="#Save">Save</a></div>
 			<div><a href="#Save%20as...">Save as...</a></div>
 			<div><a href="#Close">Close</a></div>
@@ -163,7 +163,7 @@
 		<div class="menuElement">
 			<div><a href="#Copy">Copy</a></div>
 			<div><a href="#Cut">Cut</a></div>
-			<div class="ui-state-disabled">Paste</div>
+			<div class="ui-state-disabled"><a href="#">Paste</a></div>
 		</div>
 	</div>
 	<div class="menubarItem">
@@ -174,14 +174,14 @@
 			<div>
 				<a href="#Encoding">Encoding</a>
 				<div class="menuElement">
-					<div class="ui-state-disabled">Auto-detect</div>
+					<div class="ui-state-disabled"><a href="#">Auto-detect</a></div>
 					<div><a href="#UTF-8">UTF-8</a></div>
 					<div>
 					  <a href="#UTF-16">UTF-16</a>
 				      <div class="menuElement">
 				         <div><a href="#Option%201">Option 1</a></div>
 				         <div><a href="#Option%202">Option 2</a></div>
-				         <div class="ui-state-disabled">Option 3</div>
+				         <div class="ui-state-disabled"><a href="#">Option 3</a></div>
 				         <div><a href="#Option%204">Option 4</a></div>
 				      </div>
 				   </div>

demos/popup/animation.html

@@ -10,9 +10,9 @@
 	<script src="../../ui/jquery.ui.widget.js"></script>
 	<script src="../../ui/jquery.ui.position.js"></script>
 	<script src="../../ui/jquery.ui.button.js"></script>
-	<script src="../../ui/jquery.effects.core.js"></script>
-	<script src="../../ui/jquery.effects.blind.js"></script>
-	<script src="../../ui/jquery.effects.scale.js"></script>
+	<script src="../../ui/jquery.ui.effect.js"></script>
+	<script src="../../ui/jquery.ui.effect-blind.js"></script>
+	<script src="../../ui/jquery.ui.effect-scale.js"></script>
 	<script src="../../ui/jquery.ui.popup.js"></script>
 	<script>
 	$(function() {

ui/jquery.ui.menubar.js

@@ -141,7 +141,7 @@ $.widget( "ui.menubar", {
 			}
 
 		});
-		that._bind( {
+		that._on( {
 			keydown: function( event ) {
 				if ( event.keyCode === $.ui.keyCode.ESCAPE && that.active && that.active.menu( "collapse", event ) !== true ) {
 					var active = that.active;

ui/jquery.ui.popup.js

@@ -61,7 +61,7 @@ $.widget( "ui.popup", {
 		this._beforeClose();
 		this.element.hide();
 
-		this._bind(this.options.trigger, {
+		this._on(this.options.trigger, {
 			keydown: function( event ) {
 				switch ( event.keyCode ) {
 					case $.ui.keyCode.TAB:
@@ -124,7 +124,7 @@ $.widget( "ui.popup", {
 		});
 
 		if ( this.options.expandOnFocus ) {
-			this._bind( this.options.trigger, {
+			this._on( this.options.trigger, {
 				focus : function( event ) {
 					if ( !suppressExpandOnFocus ) {
 						this._delay( function() {
@@ -144,7 +144,7 @@ $.widget( "ui.popup", {
 		}
 		if ( !this.options.managed ) {
 			//default use case, wrap tab order in popup
-			this._bind({ keydown : function( event ) {
+			this._on({ keydown : function( event ) {
 					if ( event.keyCode !== $.ui.keyCode.TAB ) {
 						return;
 					}
@@ -162,7 +162,7 @@ $.widget( "ui.popup", {
 			});
 		}
 
-		this._bind({
+		this._on({
 			focusout: function( event ) {
 				// use a timer to allow click to clear it and letting that
 				// handle the closing instead of opening again
@@ -178,7 +178,7 @@ $.widget( "ui.popup", {
 			}
 		});
 
-		this._bind({
+		this._on({
 			keyup: function( event ) {
 				if ( event.keyCode === $.ui.keyCode.ESCAPE && this.element.is( ":visible" ) ) {
 					this.close( event );
@@ -187,7 +187,7 @@ $.widget( "ui.popup", {
 			}
 		});
 
-		this._bind( this.document, {
+		this._on( this.document, {
 			click: function( event ) {
 				if ( this.isOpen && !$( event.target ).closest( this.element.add( this.options.trigger ) ).length ) {
 					this.close( event );