From 054b208a9990fd71d30285e707ad53dae5a48247 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 25 Oct 2012 06:10:00 -0400
Subject: Tabs: Removed all templating features. Fixes #7158 - Tabs: Remove add
 and remove methods. Fixes #7157 - Tabs: Remove templating (idPrefix,
 tabTemplate, panelTemplate options). Fixes #7149 - Tabs: Remove use of title
 attribute.

---
 tests/unit/subsuite.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/unit/subsuite.js')

diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index 1a16a9e94..6238cb2b1 100644
--- a/tests/unit/subsuite.js
+++ b/tests/unit/subsuite.js
@@ -8,8 +8,7 @@ var versions = [
 	],
 	additionalTests = {
 		accordion: [ "accordion_deprecated.html" ],
-		position: [ "position_deprecated.html" ],
-		tabs: [ "tabs_deprecated.html" ]
+		position: [ "position_deprecated.html" ]
 	};
 
 window.testAllVersions = function( widget ) {
-- 
cgit v1.2.3


From bc44e61dd9e6797bb23bc3038d43436a8ba052c3 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 25 Oct 2012 06:19:25 -0400
Subject: Accordion: Removed change and changestart events. Fixes #6841 -
 Accordion: Remove changestart event. Fixes #6843 - Accordion: Remove change
 event.

---
 build/tasks/testswarm.js                           |   1 -
 tests/unit/accordion/accordion.html                |   3 -
 .../unit/accordion/accordion_common_deprecated.js  |  22 ----
 tests/unit/accordion/accordion_deprecated.html     | 140 ---------------------
 tests/unit/accordion/accordion_deprecated.js       |  99 ---------------
 tests/unit/all-active.html                         |   1 -
 tests/unit/all.html                                |   1 -
 tests/unit/subsuite.js                             |   1 -
 ui/jquery.ui.accordion.js                          |  38 ------
 9 files changed, 306 deletions(-)
 delete mode 100644 tests/unit/accordion/accordion_common_deprecated.js
 delete mode 100644 tests/unit/accordion/accordion_deprecated.html
 delete mode 100644 tests/unit/accordion/accordion_deprecated.js

(limited to 'tests/unit/subsuite.js')

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 7219bcf0c..96e33b0f4 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -10,7 +10,6 @@ var versions = {
 	},
 	tests = {
 		"Accordion": "accordion/accordion.html",
-		"Accordion_deprecated": "accordion/accordion_deprecated.html",
 		"Autocomplete": "autocomplete/autocomplete.html",
 		"Button": "button/button.html",
 		"Core": "core/core.html",
diff --git a/tests/unit/accordion/accordion.html b/tests/unit/accordion/accordion.html
index b3b7caeae..4f40091bc 100644
--- a/tests/unit/accordion/accordion.html
+++ b/tests/unit/accordion/accordion.html
@@ -5,9 +5,6 @@
 	<title>jQuery UI Accordion Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script>
-	$.uiBackCompat = false;
-	</script>
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
diff --git a/tests/unit/accordion/accordion_common_deprecated.js b/tests/unit/accordion/accordion_common_deprecated.js
deleted file mode 100644
index 3b1e0f4fe..000000000
--- a/tests/unit/accordion/accordion_common_deprecated.js
+++ /dev/null
@@ -1,22 +0,0 @@
-TestHelpers.commonWidgetTests( "accordion", {
-	defaults: {
-		active: 0,
-		animate: {},
-		collapsible: false,
-		disabled: false,
-		event: "click",
-		header: "> li > :first-child,> :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			"activeHeader": "ui-icon-triangle-1-s",
-			"header": "ui-icon-triangle-1-e"
-		},
-
-		// callbacks
-		activate: null,
-		beforeActivate: null,
-		change: null,
-		changestart: null,
-		create: null
-	}
-});
diff --git a/tests/unit/accordion/accordion_deprecated.html b/tests/unit/accordion/accordion_deprecated.html
deleted file mode 100644
index dfb9fa90e..000000000
--- a/tests/unit/accordion/accordion_deprecated.html
+++ /dev/null
@@ -1,140 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Accordion Test Suite</title>
-
-	<script src="../../jquery.js"></script>
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-	<script>
-	TestHelpers.loadResources({
-		css: [ "ui.core", "ui.accordion" ],
-		js: [
-			"ui/jquery.ui.core.js",
-			"ui/jquery.ui.widget.js",
-			"ui/jquery.ui.accordion.js"
-		]
-	});
-	</script>
-
-	<script src="accordion_test_helpers.js"></script>
-	<script src="accordion_common_deprecated.js"></script>
-	<script src="accordion_core.js"></script>
-	<script src="accordion_events.js"></script>
-	<script src="accordion_methods.js"></script>
-	<script src="accordion_options.js"></script>
-	<script src="accordion_deprecated.js"></script>
-
-	<script src="../swarminject.js"></script>
-	<style>
-	#list, #list1 *, #navigation, #navigation * {
-		margin: 0;
-		padding: 0;
-		font-size: 12px;
-		line-height: 15px;
-	}
-	</style>
-</head>
-<body>
-<h1 id="qunit-header">jQuery UI Accordion Test Suite</h1>
-<h2 id="qunit-banner"></h2>
-<div id="qunit-testrunner-toolbar"></div>
-<h2 id="qunit-userAgent"></h2>
-<ol id="qunit-tests"></ol>
-<div id="qunit-fixture">
-
-<div id="list1" class="foo">
-	<h3 class="bar">There is one obvious advantage:</h3>
-	<div class="foo">
-		<p>
-			You've seen it coming!
-			<br>
-			Buy now and get nothing for free!
-			<br>
-			Well, at least no free beer. Perhaps a bear, if you can afford it.
-		</p>
-	</div>
-	<h3 class="bar">Now that you've got...</h3>
-	<div class="foo">
-		<p>
-			your bear, you have to admit it!
-			<br>
-			No, we aren't <a href="#">selling bears</a>.
-		</p>
-		<p>
-			We could talk about renting one.
-		</p>
-	</div>
-	<h3 class="bar">Rent one bear, ...</h3>
-	<div class="foo">
-		<p>
-			get two for three beer.
-		</p>
-		<p>
-			And now, for something completely different.
-		</p>
-	</div>
-</div>
-
-<div id="navigationWrapper">
-	<ul id="navigation">
-		<li>
-			<h2><a href="?p=1.1.1">Guitar</a></h2>
-			<ul>
-				<li><a href="?p=1.1.1.1">Electric</a></li>
-				<li><a href="?p=1.1.1.2">Acoustic</a></li>
-				<li><a href="?p=1.1.1.3">Amps</a></li>
-				<li><a href="?p=1.1.1.4">Effects</a></li>
-				<li><a href="?p=1.1.1.5">Accessories</a></li>
-			</ul>
-		</li>
-		<li>
-			<h2><a href="?p=1.1.2"><span>Bass</span></a></h2>
-			<ul>
-				<li><a href="?p=1.1.2.1">Electric</a></li>
-				<li><a href="?p=1.1.2.2">Acoustic</a></li>
-				<li><a href="?p=1.1.2.3">Amps</a></li>
-				<li><a href="?p=1.1.2.4">Effects</a></li>
-				<li><a href="?p=1.1.2.5">Accessories</a></li>
-				<li><a href="?p=1.1.2.5">Accessories</a></li>
-				<li><a href="?p=1.1.2.5">Accessories</a></li>
-			</ul>
-		</li>
-		<li>
-			<h2><a href="?p=1.1.3">Drums</a></h2>
-			<ul>
-				<li><a href="?p=1.1.3.2">Acoustic</a></li>
-				<li><a href="?p=1.1.3.3">Electronic</a></li>
-				<li><a href="?p=1.1.3.6">Accessories</a></li>
-			</ul>
-		</li>
-	</ul>
-</div>
-
-<dl id="accordion-dl">
-	<dt>
-		Accordion Header 1
-	</dt>
-	<dd>
-		Accordion Content 1
-	</dd>
-	<dt>
-		Accordion Header 2
-	</dt>
-	<dd>
-		Accordion Content 2
-	</dd>
-	<dt>
-		Accordion Header 3
-	</dt>
-	<dd>
-		Accordion Content 3
-	</dd>
-</dl>
-
-</div>
-</body>
-</html>
diff --git a/tests/unit/accordion/accordion_deprecated.js b/tests/unit/accordion/accordion_deprecated.js
deleted file mode 100644
index 57dabf418..000000000
--- a/tests/unit/accordion/accordion_deprecated.js
+++ /dev/null
@@ -1,99 +0,0 @@
-(function( $ ) {
-
-var equalHeight = TestHelpers.accordion.equalHeight,
-	setupTeardown = TestHelpers.accordion.setupTeardown,
-	state = TestHelpers.accordion.state;
-
-module( "accordion (deprecated) - changestart/change events", setupTeardown() );
-
-test( "changestart", function() {
-	expect( 26 );
-	var element = $( "#list1" ).accordion({
-			active: false,
-			collapsible: true
-		}),
-		headers = element.find( ".ui-accordion-header" ),
-		content = element.find( ".ui-accordion-content" );
-
-	element.one( "accordionchangestart", function( event, ui ) {
-		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldContent.length, 0 );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
-		state( element, 0, 0, 0 );
-	});
-	element.accordion( "option", "active", 0 );
-	state( element, 1, 0, 0 );
-
-	element.one( "accordionchangestart", function( event, ui ) {
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
-		state( element, 1, 0, 0 );
-	});
-	headers.eq( 1 ).click();
-	state( element, 0, 1, 0 );
-
-	element.one( "accordionchangestart", function( event, ui ) {
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.length, 0 );
-		equal( ui.newContent.length, 0 );
-		state( element, 0, 1, 0 );
-	});
-	element.accordion( "option", "active", false );
-	state( element, 0, 0, 0 );
-});
-
-test( "change", function() {
-	expect( 20 );
-	var element = $( "#list1" ).accordion({
-			active: false,
-			collapsible: true
-		}),
-		headers = element.find( ".ui-accordion-header" ),
-		content = element.find( ".ui-accordion-content" );
-
-	element.one( "accordionchange", function( event, ui ) {
-		equal( ui.oldHeader.length, 0 );
-		equal( ui.oldContent.length, 0 );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 0 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 0 ] );
-	});
-	element.accordion( "option", "active", 0 );
-
-	element.one( "accordionchange", function( event, ui ) {
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 0 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 0 ] );
-		equal( ui.newHeader.length, 1 );
-		strictEqual( ui.newHeader[ 0 ], headers[ 1 ] );
-		equal( ui.newContent.length, 1 );
-		strictEqual( ui.newContent[ 0 ], content[ 1 ] );
-	});
-	headers.eq( 1 ).click();
-
-	element.one( "accordionchange", function( event, ui ) {
-		equal( ui.oldHeader.length, 1 );
-		strictEqual( ui.oldHeader[ 0 ], headers[ 1 ] );
-		equal( ui.oldContent.length, 1 );
-		strictEqual( ui.oldContent[ 0 ], content[ 1 ] );
-		equal( ui.newHeader.length, 0 );
-		equal( ui.newContent.length, 0 );
-	});
-	element.accordion( "option", "active", false );
-});
-
-})(jQuery);
diff --git a/tests/unit/all-active.html b/tests/unit/all-active.html
index f842aa5cc..236411475 100644
--- a/tests/unit/all-active.html
+++ b/tests/unit/all-active.html
@@ -17,7 +17,6 @@
 	var params = [],
 		suites = [
 			"accordion/accordion.html",
-			"accordion/accordion_deprecated.html",
 			"autocomplete/autocomplete.html",
 			"button/button.html",
 			"core/core.html",
diff --git a/tests/unit/all.html b/tests/unit/all.html
index bc204c976..e8dac887c 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -17,7 +17,6 @@
 	var params = [],
 		suites = [
 			"accordion/accordion.html",
-			"accordion/accordion_deprecated.html",
 			"autocomplete/autocomplete.html",
 			"button/button.html",
 			"core/core.html",
diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index 6238cb2b1..b583bbd75 100644
--- a/tests/unit/subsuite.js
+++ b/tests/unit/subsuite.js
@@ -7,7 +7,6 @@ var versions = [
 		"git"
 	],
 	additionalTests = {
-		accordion: [ "accordion_deprecated.html" ],
 		position: [ "position_deprecated.html" ]
 	};
 
diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js
index 6ec85b681..b22f0c4e2 100644
--- a/ui/jquery.ui.accordion.js
+++ b/ui/jquery.ui.accordion.js
@@ -540,42 +540,4 @@ $.widget( "ui.accordion", {
 	}
 });
 
-
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-	// change events
-	(function( $, prototype ) {
-		$.extend( prototype.options, {
-			change: null,
-			changestart: null
-		});
-
-		var _trigger = prototype._trigger;
-		prototype._trigger = function( type, event, data ) {
-			var ret = _trigger.apply( this, arguments );
-			if ( !ret ) {
-				return false;
-			}
-
-			if ( type === "beforeActivate" ) {
-				ret = _trigger.call( this, "changestart", event, {
-					oldHeader: data.oldHeader,
-					oldContent: data.oldPanel,
-					newHeader: data.newHeader,
-					newContent: data.newPanel
-				});
-			} else if ( type === "activate" ) {
-				ret = _trigger.call( this, "change", event, {
-					oldHeader: data.oldHeader,
-					oldContent: data.oldPanel,
-					newHeader: data.newHeader,
-					newContent: data.newPanel
-				});
-			}
-			return ret;
-		};
-	}( jQuery, jQuery.ui.accordion.prototype ) );
-}
-
 })( jQuery );
-- 
cgit v1.2.3


From 2582bfab46613da613f1a3354bc733b68a110b95 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Thu, 25 Oct 2012 06:39:14 -0400
Subject: Position: Removed offset option. Fixes #6982 - Position: Remove
 offset option.

---
 build/tasks/testswarm.js                     |  1 -
 demos/position/default.html                  |  5 ---
 tests/unit/all-active.html                   |  1 -
 tests/unit/all.html                          |  1 -
 tests/unit/position/position.html            |  3 --
 tests/unit/position/position_deprecated.html | 56 ----------------------------
 tests/unit/position/position_deprecated.js   | 33 ----------------
 tests/unit/subsuite.js                       |  2 +-
 tests/visual/position/position_feedback.html | 29 +++++++-------
 tests/visual/tooltip/tooltip.html            |  6 +--
 ui/jquery.ui.position.js                     | 36 ------------------
 11 files changed, 17 insertions(+), 156 deletions(-)
 delete mode 100644 tests/unit/position/position_deprecated.html
 delete mode 100644 tests/unit/position/position_deprecated.js

(limited to 'tests/unit/subsuite.js')

diff --git a/build/tasks/testswarm.js b/build/tasks/testswarm.js
index 96e33b0f4..21b644a52 100644
--- a/build/tasks/testswarm.js
+++ b/build/tasks/testswarm.js
@@ -20,7 +20,6 @@ var versions = {
 		"Effects": "effects/effects.html",
 		"Menu": "menu/menu.html",
 		"Position": "position/position.html",
-		"Position_deprecated": "position/position_deprecated.html",
 		"Progressbar": "progressbar/progressbar.html",
 		//"resizable/resizable.html",
 		//"selectable/selectable.html",
diff --git a/demos/position/default.html b/demos/position/default.html
index 223788b1f..48fd07e35 100644
--- a/demos/position/default.html
+++ b/demos/position/default.html
@@ -48,7 +48,6 @@
 				of: $( "#parent" ),
 				my: $( "#my_horizontal" ).val() + " " + $( "#my_vertical" ).val(),
 				at: $( "#at_horizontal" ).val() + " " + $( "#at_vertical" ).val(),
-				offset: $( "#offset" ).val(),
 				collision: $( "#collision_horizontal" ).val() + " " + $( "#collision_vertical" ).val()
 			});
 		}
@@ -113,10 +112,6 @@
 			<option value="bottom">bottom</option>
 		</select>
 	</div>
-	<div style="padding-bottom: 20px;">
-		<b>offset:</b>
-		<input id="offset">
-	</div>
 	<div style="padding-bottom: 20px;">
 		<b>collision:</b>
 		<select id="collision_horizontal">
diff --git a/tests/unit/all-active.html b/tests/unit/all-active.html
index 236411475..fe3e05682 100644
--- a/tests/unit/all-active.html
+++ b/tests/unit/all-active.html
@@ -27,7 +27,6 @@
 			"effects/effects.html",
 			"menu/menu.html",
 			"position/position.html",
-			"position/position_deprecated.html",
 			"progressbar/progressbar.html",
 			//"resizable/resizable.html",
 			//"selectable/selectable.html",
diff --git a/tests/unit/all.html b/tests/unit/all.html
index e8dac887c..f3e5b33c1 100644
--- a/tests/unit/all.html
+++ b/tests/unit/all.html
@@ -27,7 +27,6 @@
 			"effects/effects.html",
 			"menu/menu.html",
 			"position/position.html",
-			"position/position_deprecated.html",
 			"progressbar/progressbar.html",
 			//"resizable/resizable.html",
 			//"selectable/selectable.html",
diff --git a/tests/unit/position/position.html b/tests/unit/position/position.html
index 8738ae667..f3b1ad86c 100644
--- a/tests/unit/position/position.html
+++ b/tests/unit/position/position.html
@@ -5,9 +5,6 @@
 	<title>jQuery UI Position Test Suite</title>
 
 	<script src="../../jquery.js"></script>
-	<script>
-	$.uiBackCompat = false;
-	</script>
 	<link rel="stylesheet" href="../../../external/qunit.css">
 	<script src="../../../external/qunit.js"></script>
 	<script src="../../jquery.simulate.js"></script>
diff --git a/tests/unit/position/position_deprecated.html b/tests/unit/position/position_deprecated.html
deleted file mode 100644
index 84aae61f8..000000000
--- a/tests/unit/position/position_deprecated.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>jQuery UI Position Test Suite</title>
-
-	<script src="../../jquery.js"></script>
-
-
-
-	<link rel="stylesheet" href="../../../external/qunit.css">
-	<script src="../../../external/qunit.js"></script>
-	<script src="../../jquery.simulate.js"></script>
-	<script src="../testsuite.js"></script>
-	<script>
-	TestHelpers.loadResources({
-		js: [ "ui/jquery.ui.position.js" ]
-	});
-	</script>
-
-	<script src="position_core.js"></script>
-	<script src="position_deprecated.js"></script>
-	<script src="../swarminject.js"></script>
-</head>
-<body>
-<div id="qunit" style="position:relative; z-index:2;"></div>
-
-<!--
-elements smaller than 20px have a line-height set on them to avoid a bug in IE6
-.height() returns the greater of the height and line-height
--->
-
-<div id="qunit-fixture" style="top: 0; left: 0; z-index:1">
-	<div id="el1" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
-	<div id="el2" style="position: absolute; width: 6px; height: 6px; line-height: 6px;"></div>
-	<div id="parent" style="position: absolute; width: 6px; height: 6px; top: 4px; left: 4px; line-height: 6px;"></div>
-	<div id="within" style="position: absolute; width: 12px; height: 12px; top: 2px; left: 0px; line-height: 12px;"></div>
-
-	<div id="scrollx" style="position: absolute; top: 0px; left: 0px">
-		<div id="elx" style="position: absolute; width: 10px; height: 10px; line-height: 10px;"></div>
-		<div id="parentx" style="position: absolute; width: 20px; height: 20px; top: 40px; left: 40px;"></div>
-	</div>
-
-	<div style="position: absolute; height: 5000px; width: 5000px;"></div>
-
-	<div id="fractions-parent" style="position: absolute; left: 10.7432222px; top: 10.532325px; height: 30px; width: 201px;">
-		<div id="fractions-element"></div>
-	</div>
-
-	<div id="bug-5280" style="height: 30px; width: 201px;">
-		<div style="width: 50px; height: 10px;"></div>
-	</div>
-</div>
-
-</body>
-</html>
diff --git a/tests/unit/position/position_deprecated.js b/tests/unit/position/position_deprecated.js
deleted file mode 100644
index 789d4e608..000000000
--- a/tests/unit/position/position_deprecated.js
+++ /dev/null
@@ -1,33 +0,0 @@
-(function( $ ) {
-
-test( "offset", function() {
-	expect( 3 );
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parentx",
-		offset: "10",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 70, left: 50 }, "single value" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parentx",
-		offset: "5 -3",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 57, left: 45 }, "two values" );
-
-	$( "#elx" ).position({
-		my: "left top",
-		at: "left bottom",
-		of: "#parentx",
-		offset: "5px -3px",
-		collision: "none"
-	});
-	deepEqual( $( "#elx" ).offset(), { top: 57, left: 45 }, "with units" );
-});
-
-}( jQuery ) );
diff --git a/tests/unit/subsuite.js b/tests/unit/subsuite.js
index b583bbd75..148f35b1e 100644
--- a/tests/unit/subsuite.js
+++ b/tests/unit/subsuite.js
@@ -7,7 +7,7 @@ var versions = [
 		"git"
 	],
 	additionalTests = {
-		position: [ "position_deprecated.html" ]
+		// component: [ "other_test.html" ]
 	};
 
 window.testAllVersions = function( widget ) {
diff --git a/tests/visual/position/position_feedback.html b/tests/visual/position/position_feedback.html
index fe1f04e5b..fb3bf00fd 100644
--- a/tests/visual/position/position_feedback.html
+++ b/tests/visual/position/position_feedback.html
@@ -55,25 +55,24 @@
 		});
 
 		element.width( 150 );
-		$( document ).on( "mousemove", function( event ) {
-			var base = {
+		function positionWithOffset( horizontal, vertical ) {
+			return {
 				my: "left top",
-				at: "left top",
+				at: "left" + (horizontal < 0 ? horizontal : "+" + horizontal) + " " +
+					"top" + (vertical < 0 ? vertical : "+" + vertical),
 				of: target,
 				using: using
 			};
-			element.position( $.extend({
-				offset: (event.pageX - targetOffset.left) + " " + (event.pageY - targetOffset.top)
-			}, base ));
-			oppositeElement.position( $.extend({
-				offset: (-1 * (event.pageX - targetOffset.left)) + " " + (-1 * (event.pageY - targetOffset.top))
-			}, base ));
-			leftElement.position( $.extend({
-				offset: (-0.9 * (event.pageX - targetOffset.left)) + " " + (0.9 * (event.pageY - targetOffset.top))
-			}, base ));
-			rightElement.position( $.extend({
-				offset: (0.9 * (event.pageX - targetOffset.left)) + " " + (-0.9 * (event.pageY - targetOffset.top))
-			}, base) );
+		};
+		$( document ).on( "mousemove", function( event ) {
+			element.position( positionWithOffset(
+				event.pageX - targetOffset.left, event.pageY - targetOffset.top ) );
+			oppositeElement.position( positionWithOffset(
+				-1 * (event.pageX - targetOffset.left), -1 * (event.pageY - targetOffset.top) ) );
+			leftElement.position( positionWithOffset(
+				-0.9 * (event.pageX - targetOffset.left), 0.9 * (event.pageY - targetOffset.top) ) );
+			rightElement.position( positionWithOffset(
+				0.9 * (event.pageX - targetOffset.left), -0.9 * (event.pageY - targetOffset.top) ) );
 		});
 	});
 	</script>
diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html
index 598af0ee8..706ed5091 100644
--- a/tests/visual/tooltip/tooltip.html
+++ b/tests/visual/tooltip/tooltip.html
@@ -66,8 +66,7 @@
 			tooltipClass: "ui-state-highlight",
 			position: {
 				my: "center top",
-				at: "center bottom",
-				offset: "0 10"
+				at: "center bottom+10"
 			}
 		});
 
@@ -86,8 +85,7 @@
 		$( "#buttons" ).tooltip({
 			position: {
 				my: "center bottom",
-				at: "center top",
-				offset: "0 -5"
+				at: "center top-5"
 			}
 		});
 
diff --git a/ui/jquery.ui.position.js b/ui/jquery.ui.position.js
index 5b595a8c0..edbb0f6ff 100644
--- a/ui/jquery.ui.position.js
+++ b/ui/jquery.ui.position.js
@@ -478,40 +478,4 @@ $.ui.position = {
 	testElementParent.removeChild( testElement );
 })();
 
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-	// offset option
-	(function( $ ) {
-		var _position = $.fn.position;
-		$.fn.position = function( options ) {
-			if ( !options || !options.offset ) {
-				return _position.call( this, options );
-			}
-			var offset = options.offset.split( " " ),
-				at = options.at.split( " " );
-			if ( offset.length === 1 ) {
-				offset[ 1 ] = offset[ 0 ];
-			}
-			if ( /^\d/.test( offset[ 0 ] ) ) {
-				offset[ 0 ] = "+" + offset[ 0 ];
-			}
-			if ( /^\d/.test( offset[ 1 ] ) ) {
-				offset[ 1 ] = "+" + offset[ 1 ];
-			}
-			if ( at.length === 1 ) {
-				if ( /left|center|right/.test( at[ 0 ] ) ) {
-					at[ 1 ] = "center";
-				} else {
-					at[ 1 ] = at[ 0 ];
-					at[ 0 ] = "center";
-				}
-			}
-			return _position.call( this, $.extend( options, {
-				at: at[ 0 ] + offset[ 0 ] + " " + at[ 1 ] + offset[ 1 ],
-				offset: undefined
-			} ) );
-		};
-	}( jQuery ) );
-}
-
 }( jQuery ) );
-- 
cgit v1.2.3