Removed TouchList.identifiedTouch.
authorCathy Chan <cathy.chan@nokia.com>
Tue, 22 Jan 2013 13:28:15 -0500
changeset 177 19c6f3d0eb8a
parent 167 418583839ba5
child 178 67530967ba81
Removed TouchList.identifiedTouch.
Fixed a few typos.
tests/touch-events-v1/approved/create-touch-touchlist.html
tests/touch-events-v1/approved/multi-touch-interfaces.html
tests/touch-events-v1/approved/single-touch.html
--- a/tests/touch-events-v1/approved/create-touch-touchlist.html	Sat Dec 08 17:08:18 2012 -0500
+++ b/tests/touch-events-v1/approved/create-touch-touchlist.html	Tue Jan 22 13:28:15 2013 -0500
@@ -21,8 +21,6 @@
 <script>
 	setup({explicit_done: true});
 
-	var hasIdentifiedTouch = true;
-
 	// Check a Touch object's atttributes for existence and correct type
 	// TA: 1.1.2, 1.1.3
 	function check_Touch_object (t) {
@@ -73,22 +71,13 @@
 		test(function() {
 			assert_equals(Object.prototype.toString.call(tl), "[object TouchList]", "touch list is of type TouchList");
 		}, "touch list is a TouchList object");
-		test(function() {
-			// A common failure mode (eg. WebKit bug 96294), don't report multiple errors for it
-			hasIdentifiedTouch = 'identifiedTouch' in tl;
-			assert_true(hasIdentifiedTouch);
-		}, "TouchList contains an identifiedTouch property");
 		[
 			["unsigned long", "length"],
 			["function", "item"],
-			["function", "identifiedTouch"],
 		].forEach(function(attr) {
 			var type = attr[0];
 			var name = attr[1];
 
-			if (name == "identifiedTouch" && !hasIdentifiedTouch)
-				return;
-			  
 			// existence check
 			test(function() {
 				assert_true(name in tl, name + " attribute in TouchList");
@@ -103,7 +92,7 @@
 				break;
 			case "function":
 				test(function() {
-					assert_equals(typeof tl[name], "function", name + " attribute of type long");
+					assert_equals(typeof tl[name], "function", name + " attribute of type function");
 				}, "TouchList." + name + " attribute is of type function");
 				break;
 			default:
@@ -114,14 +103,6 @@
 		for (var i=0; i < tl.length; i++) {
 			check_Touch_object(tl.item(i));
 		}
-		// identifiedTouch should return the member Touch object with the specified identifier
-		test(function() {
-			if (hasIdentifiedTouch) {
-				for (var i=0; i < tl.length; i++) {
-					assert_equals(tl.item(i), tl.identifiedTouch(tl.item(i).identifier), "TouchList.identifiedTouch returns the correct item");
-				}
-			}
-		}, "TouchList.identifiedTouch returns the correct item");
 	}
 
     function check_touch_clientXY(touch) {
--- a/tests/touch-events-v1/approved/multi-touch-interfaces.html	Sat Dec 08 17:08:18 2012 -0500
+++ b/tests/touch-events-v1/approved/multi-touch-interfaces.html	Tue Jan 22 13:28:15 2013 -0500
@@ -22,8 +22,6 @@
 <script>
     setup({explicit_done: true});
 
-    var hasIdentifiedTouch = true;
-    
     // Check a Touch object's atttributes for existence and correct type
     // TA: 1.1.2, 1.1.3
     function check_Touch_object (t) {
@@ -74,24 +72,13 @@
         test(function() {
            assert_equals(Object.prototype.toString.call(tl), "[object TouchList]", "touch list is of type TouchList");
         }, "touch list is a TouchList object");
-		if(hasIdentifiedTouch) {
-			test(function() {
-				// A common failure mode (eg. WebKit bug 96294), don't report multiple errors for it
-				hasIdentifiedTouch = 'identifiedTouch' in tl;
-				assert_true(hasIdentifiedTouch);
-			}, "TouchList contains an identifiedTouch property");
-		}
         [
           ["unsigned long", "length"],
           ["function", "item"],
-          ["function", "identifiedTouch"],
         ].forEach(function(attr) {
             var type = attr[0];
             var name = attr[1];
 
-            if (name == "identifiedTouch" && !hasIdentifiedTouch)
-              return;
-              
             // existence check
             test(function() {
                 assert_true(name in tl, name + " attribute in TouchList");
@@ -106,7 +93,7 @@
                 break;
             case "function":
                 test(function() {
-                    assert_equals(typeof tl[name], "function", name + " attribute of type long");
+                    assert_equals(typeof tl[name], "function", name + " attribute of type function");
                 }, "TouchList." + name + " attribute is of type function");
                 break;
             default:
@@ -117,14 +104,6 @@
        for (var i=0; i < tl.length; i++) {
            check_Touch_object(tl.item(i));
        }
-       // identifiedTouch should return the member Touch object with the specified identifier
-	   test(function() {
-		   if (hasIdentifiedTouch) {
-			  for (var i=0; i < tl.length; i++) {
-				  assert_equals(tl.item(i), tl.identifiedTouch(tl.item(i).identifier), "TouchList.identifiedTouch returns the correct item");
-			   }
-		   }
-		}, "TouchList.identifiedTouch returns the correct item");
     }
 
     // Check a TouchEvent event's attributes for existence and proper type
--- a/tests/touch-events-v1/approved/single-touch.html	Sat Dec 08 17:08:18 2012 -0500
+++ b/tests/touch-events-v1/approved/single-touch.html	Tue Jan 22 13:28:15 2013 -0500
@@ -19,8 +19,6 @@
   <script>
     setup({explicit_done: true});
 
-    var hasIdentifiedTouch = true;
-    
     // Check a Touch object's atttributes for existence and correct type
     // TA: 1.1.2, 1.1.3
     function check_Touch_object (t) {
@@ -74,14 +72,10 @@
         [
           ["unsigned long", "length"],
           ["function", "item"],
-          ["function", "identifiedTouch"],
         ].forEach(function(attr) {
             var type = attr[0];
             var name = attr[1];
 
-            if (name == "identifiedTouch" && !hasIdentifiedTouch)
-              return;
-              
             // existence check
             test(function() {
                 assert_true(name in tl, name + " attribute in TouchList");
@@ -96,7 +90,7 @@
                 break;
             case "function":
                 test(function() {
-                    assert_equals(typeof tl[name], "function", name + " attribute of type long");
+                    assert_equals(typeof tl[name], "function", name + " attribute of type function");
                 }, "TouchList." + name + " attribute is of type function");
                 break;
             default:
@@ -198,12 +192,6 @@
         assert_equals(touchList.item(0), touch, "touchList.item(0) is input touch");
       }, "document.createTouchList exists and correctly creates a TouchList from a single Touch");
 
-      test(function() {
-        // A common failure mode (eg. WebKit bug 96294), don't report multiple errors for it
-        hasIdentifiedTouch = 'identifiedTouch' in touchList;
-        assert_true(hasIdentifiedTouch);
-      }, "TouchList contains an identifiedTouch property");
-
       if (touchList)
         check_TouchList_object(touchList);
 
@@ -254,13 +242,6 @@
         }, "touchstart: event target same as targetTouches target");
 
         // TA: @TBD
-        if (hasIdentifiedTouch) {
-          test(function() {
-            assert_equals(ev.touches.identifiedTouch(touchstart_identifier), t, "touches.identifiedTouch is correct.");
-          }, "touchstart: touches.identifiedTouch same as first touch point id");
-        }
-        
-        // TA: @TBD
         test(function() {
           assert_true(is_touch_over_element(t, target0), "touch.pageX/pageY is over target0.");
         }, "touchstart: touch pageX/pageY inside of target element");