| OLD | NEW |
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 <script src='../resources/testharness.js'></script> | 2 <script src='../resources/testharness.js'></script> |
| 3 <script src='../resources/testharnessreport.js'></script> | 3 <script src='../resources/testharnessreport.js'></script> |
| 4 <script src='../fast/dom/shadow/resources/shadow-dom.js'></script> | 4 <script src='../fast/dom/shadow/resources/shadow-dom.js'></script> |
| 5 <script src='resources/shadow-dom.js'></script> | 5 <script src='resources/shadow-dom.js'></script> |
| 6 <div id="log"></div> | 6 <div id="log"></div> |
| 7 <p> | 7 <p> |
| 8 document tree: [i0 -> [x-foo]]<br> | 8 document tree: [i0 -> [x-foo]]<br> |
| 9 x-foo's shadow tree: [j5 -> [x-bar] -> j6]<br> | 9 x-foo's shadow tree: [j5 -> [x-bar] -> j6]<br> |
| 10 x-bar's shadow tree: [k1 -> k0 -> [s2]]<br> | 10 x-bar's shadow tree: [k1 -> k0 -> [s2]]<br> |
| 11 slot #s2: [j1 -> j2 -> j3 -> j4 -> [s1] -> j0]<br><br> | 11 slot #s2: [j1 -> j2 -> j3 -> j4 -> [s1] -> j0]<br><br> |
| 12 slot #s1: [i1 -> i2]<br> | 12 slot #s1: [i1 -> i2]<br> |
| 13 <b>v1 ideal nav forward: [i0 -> j5 -> xbar -> k1 -> k0 -> j1 -> j2 -> j3 -> j
4 -> i1 -> i2 -> j0 -> j6]</b><br> | 13 <b>v1 ideal nav forward: [i0 -> j5 -> xbar -> k1 -> k0 -> j6]</b><br> |
| 14 </p> | 14 </p> |
| 15 | 15 |
| 16 <input id="i0" tabindex=0 value="i0"> | 16 <input id="i0" tabindex=0 value="i0"> |
| 17 <div id="x-foo"> | 17 <div id="x-foo"> |
| 18 <input id="i2" slot="s1" tabindex=2 value="i2"> | 18 <input id="i2" slot="s1" tabindex=2 value="i2"> |
| 19 <input id="i1" slot="s1" tabindex=1 value="i1"> | 19 <input id="i1" slot="s1" tabindex=1 value="i1"> |
| 20 <template data-mode="open"> | 20 <template data-mode="open"> |
| 21 <div id="x-bar" tabindex=4> | 21 <div id="x-bar" tabindex=4> |
| 22 <input id="j1" slot="s2" tabindex=1 value="j1"> | 22 <input id="j1" slot="s2" tabindex=1 value="j1"> |
| 23 <slot id="s1" name="s1" slot="s2"></slot> | 23 <slot id="s1" name="s1" slot="s2"></slot> |
| 24 <input id="j0" slot="s2" tabindex=0 value="j0"> | 24 <input id="j0" slot="s2" tabindex=0 value="j0"> |
| 25 <input id="j3" slot="s2" tabindex=2 value="j3"> | 25 <input id="j3" slot="s2" tabindex=2 value="j3"> |
| 26 <div id="j4" slot="s2" tabindex=3> | 26 <div id="j4" slot="s2" tabindex=3> |
| 27 <input id="j2" tabindex=1 value="j2"> | 27 <input id="j2" tabindex=1 value="j2"> |
| 28 </div> | 28 </div> |
| 29 <template data-mode="open"> | 29 <template data-mode="open"> |
| 30 <input id="k0" tabindex=0 value="k0"> | 30 <input id="k0" tabindex=0 value="k0"> |
| 31 <slot id="s2" name="s2"></slot> | 31 <slot id="s2" name="s2" tabindex=-1></slot> |
| 32 <input id="k1" tabindex=1 value="k1"> | 32 <input id="k1" tabindex=1 value="k1"> |
| 33 </template> | 33 </template> |
| 34 </div> | 34 </div> |
| 35 <div id="to-be-ignored-host" tabindex=-1> |
| 36 <template data-mode="open"> |
| 37 <input id="ignored-input-in-shadow-host1" tabindex=1 value="ignored"> |
| 38 <input id="ignored-input-in-shadow-host2" tabindex=2 value="ignored"> |
| 39 </template> |
| 40 </div> |
| 35 <input id="j6" tabindex=4 value="j6"> | 41 <input id="j6" tabindex=4 value="j6"> |
| 36 <input id="j5" tabindex=3 value="j5"> | 42 <input id="j5" tabindex=3 value="j5"> |
| 37 </template> | 43 </template> |
| 38 </div> | 44 </div> |
| 39 </div> | 45 </div> |
| 40 | 46 |
| 41 <script> | 47 <script> |
| 42 | 48 |
| 49 var xfoo = document.getElementById('x-foo'); |
| 50 convertTemplatesToShadowRootsWithin(xfoo); |
| 51 var sr = xfoo.shadowRoot; |
| 43 test(function() { | 52 test(function() { |
| 44 var xfoo = document.getElementById('x-foo'); | |
| 45 convertTemplatesToShadowRootsWithin(xfoo); | |
| 46 var sr = xfoo.shadowRoot; | |
| 47 var xbar = sr.querySelector('div'); | |
| 48 convertTemplatesToShadowRootsWithin(xbar); | |
| 49 | |
| 50 var elements = [ | 53 var elements = [ |
| 51 'i0', | 54 'i0', |
| 52 'x-foo/j5', | 55 'x-foo/j5', |
| 53 'x-foo/x-bar', | 56 'x-foo/x-bar', |
| 54 'x-foo/x-bar/k1', | 57 'x-foo/x-bar/k1', |
| 55 'x-foo/x-bar/k0', | 58 'x-foo/x-bar/k0', |
| 56 'x-foo/j1', | |
| 57 'x-foo/j2', | |
| 58 'x-foo/j3', | |
| 59 'x-foo/j4', | |
| 60 'i1', | |
| 61 'i2', | |
| 62 'x-foo/j0', | |
| 63 'x-foo/j6' | 59 'x-foo/j6' |
| 64 ]; | 60 ]; |
| 65 | 61 |
| 66 for (var i = 0; i + 1 < elements.length; ++i) | 62 for (var i = 0; i + 1 < elements.length; ++i) |
| 67 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'),
elements[i]+" to "+ elements[i+1]); | 63 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'),
elements[i] + " to " + elements[i + 1]); |
| 68 elements.reverse(); | 64 elements.reverse(); |
| 69 for (var i = 0; i + 1 < elements.length; ++i) | 65 for (var i = 0; i + 1 < elements.length; ++i) |
| 70 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'backward'),
elements[i]+" to "+ elements[i+1]); | 66 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'backward'),
elements[i] + " to " + elements[i + 1]); |
| 71 }, 'Focus controller should treat slots as a focus scope.'); | 67 }, 'Focus controller should treat slots as a focus scope.'); |
| 72 | 68 |
| 69 test(function() { |
| 70 var ignoredHost = sr.getElementById('to-be-ignored-host'); |
| 71 var ignoredInput1 = ignoredHost.shadowRoot.querySelector('input'); |
| 72 var ignoredInput2 = ignoredInput1.nextElementSibling; |
| 73 |
| 74 var elements = [ |
| 75 'x-foo/to-be-ignored-host/ignored-input-in-shadow-host1', |
| 76 'x-foo/to-be-ignored-host/ignored-input-in-shadow-host2', |
| 77 'x-foo/j6' |
| 78 ]; |
| 79 for (var i = 0; i + 1 < elements.length; ++i) |
| 80 assert_true(shouldNavigateFocus(elements[i], elements[i + 1], 'forward'),
elements[i] + " to " + elements[i + 1]); |
| 81 |
| 82 var elementsBackward = [ |
| 83 'x-foo/to-be-ignored-host/ignored-input-in-shadow-host2', |
| 84 'x-foo/to-be-ignored-host/ignored-input-in-shadow-host1', |
| 85 'x-foo/x-bar/k0' |
| 86 ]; |
| 87 for (var i = 0; i + 1 < elements.length; ++i) |
| 88 assert_true(shouldNavigateFocus(elementsBackward[i], elementsBackward[i +
1], 'backward'), elementsBackward[i] + " to " + elementsBackward[i + 1]); |
| 89 |
| 90 }, 'This is a regression test: After focusing negative tabindex-ed elements, foc
us moves in tree order.'); |
| 91 |
| 73 </script> | 92 </script> |
| OLD | NEW |