Merge branch 'master' into selectmenu

6 files changed, 14 insertions, 9 deletions

diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html
index f89f260eb..22f34aa17 100644
--- a/demos/autocomplete/combobox.html
+++ b/demos/autocomplete/combobox.html
@@ -41,6 +41,7 @@
 					.addClass( "ui-combobox" )
 					.insertAfter( this.element );
 
+				this.element.hide();
 				this._createAutocomplete();
 				this._createShowAllButton();
 			},
@@ -76,7 +77,8 @@
 			},
 
 			_createShowAllButton: function() {
-				var wasOpen = false;
+				var input = this.input,
+					wasOpen = false;
 
 				$( "<a>" )
 					.attr( "tabIndex", -1 )
@@ -152,7 +154,7 @@
 				this._delay(function() {
 					this.input.tooltip( "close" ).attr( "title", "" );
 				}, 2500 );
-				this.input.data( "ui-autocomplete" ).term = "";
+				this.input.autocomplete( "instance" ).term = "";
 			},
 
 			_destroy: function() {
diff --git a/demos/autocomplete/custom-data.html b/demos/autocomplete/custom-data.html
index 4e518db4d..32e6a9ad3 100644
--- a/demos/autocomplete/custom-data.html
+++ b/demos/autocomplete/custom-data.html
@@ -66,7 +66,7 @@
 				return false;
 			}
 		})
-		.data( "ui-autocomplete" )._renderItem = function( ul, item ) {
+		.autocomplete( "instance" )._renderItem = function( ul, item ) {
 			return $( "<li>" )
 				.append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
 				.appendTo( ul );
diff --git a/demos/autocomplete/multiple-remote.html b/demos/autocomplete/multiple-remote.html
index ed275628a..c97b3a904 100644
--- a/demos/autocomplete/multiple-remote.html
+++ b/demos/autocomplete/multiple-remote.html
@@ -29,7 +29,7 @@
 			// don't navigate away from the field on tab when selecting an item
 			.bind( "keydown", function( event ) {
 				if ( event.keyCode === $.ui.keyCode.TAB &&
-						$( this ).data( "ui-autocomplete" ).menu.active ) {
+						$( this ).autocomplete( "instance" ).menu.active ) {
 					event.preventDefault();
 				}
 			})
diff --git a/demos/autocomplete/multiple.html b/demos/autocomplete/multiple.html
index 68ae3d6a0..909432277 100644
--- a/demos/autocomplete/multiple.html
+++ b/demos/autocomplete/multiple.html
@@ -48,7 +48,7 @@
 			// don't navigate away from the field on tab when selecting an item
 			.bind( "keydown", function( event ) {
 				if ( event.keyCode === $.ui.keyCode.TAB &&
-						$( this ).data( "ui-autocomplete" ).menu.active ) {
+						$( this ).autocomplete( "instance" ).menu.active ) {
 					event.preventDefault();
 				}
 			})
diff --git a/demos/progressbar/label.html b/demos/progressbar/label.html
index 3e669ba4a..a1e16cb71 100644
--- a/demos/progressbar/label.html
+++ b/demos/progressbar/label.html
@@ -10,10 +10,13 @@
 	<script src="../../ui/jquery.ui.progressbar.js"></script>
 	<link rel="stylesheet" href="../demos.css">
 	<style>
+	.ui-progressbar {
+		position: relative;
+	}
 	.progress-label {
-		float: left;
-		margin-left: 50%;
-		margin-top: 5px;
+		position: absolute;
+		left: 50%;
+		top: 4px;
 		font-weight: bold;
 		text-shadow: 1px 1px 0 #fff;
 	}
diff --git a/demos/spinner/default.html b/demos/spinner/default.html
index 5093e8666..3d3288807 100644
--- a/demos/spinner/default.html
+++ b/demos/spinner/default.html
@@ -23,7 +23,7 @@
 			}
 		});
 		$( "#destroy" ).click(function() {
-			if ( spinner.data( "ui-spinner" ) ) {
+			if ( spinner.spinner( "instance" ) ) {
 				spinner.spinner( "destroy" );
 			} else {
 				spinner.spinner();