From e263ebda99f3d414bae91a4a47e74a37ff93ba9c Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Fri, 27 Sep 2013 18:53:15 +0200
Subject: Dialog: Switch back to shuffling z-index, but only look at .ui-front
 siblings.

Fixes #9166 - Dialog: moveToTop implementation resets flash/video/iframe/scroll
Fixes #9364 - Dialog: Click of element with tooltip scrolls the dialog to the top
---
 tests/unit/dialog/dialog_methods.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/dialog/dialog_methods.js b/tests/unit/dialog/dialog_methods.js
index 60a7aa4d8..8918e8d36 100644
--- a/tests/unit/dialog/dialog_methods.js
+++ b/tests/unit/dialog/dialog_methods.js
@@ -144,8 +144,8 @@ test("moveToTop", function() {
 	expect( 5 );
 	function order() {
 		var actual = $( ".ui-dialog" ).map(function() {
-			return +$( this ).find( ".ui-dialog-content" ).attr( "id" ).replace( /\D+/, "" );
-		}).get().reverse();
+			return +$( this ).css( "z-index" );
+		}).get();
 		deepEqual( actual, $.makeArray( arguments ) );
 	}
 	var dialog1, dialog2,
@@ -161,10 +161,23 @@ test("moveToTop", function() {
 			equal( focusOn, "dialog2" );
 		}
 	});
-	order( 2, 1 );
+	order( 100, 101 );
 	focusOn = "dialog1";
 	dialog1.dialog( "moveToTop" );
-	order( 1, 2 );
+	order( 102, 101 );
+});
+
+test( "moveToTop: content scroll stays intact", function() {
+	expect( 2 );
+	var otherDialog = $( "#dialog1" ).dialog(),
+		scrollDialog = $( "#form-dialog" ).dialog({
+			height: 200
+		});
+	scrollDialog.scrollTop( 50 );
+	equal( scrollDialog.scrollTop(), 50 );
+
+	otherDialog.dialog( "moveToTop" );
+	equal( scrollDialog.scrollTop(), 50 );
 });
 
 test("open", function() {
-- 
cgit v1.2.3