Skip to content
This repository was archived by the owner on Feb 12, 2022. It is now read-only.

Commit bb0fdb3

Browse files
committed
Merge pull request #1812 from interactivellama/html-lint-tree-update
Update tree markup to have alert role on span
2 parents 5ff2c22 + ee0673a commit bb0fdb3

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

markup/tree-folders-selectable.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</button>
1313
</div>
1414
<ul class="tree-branch-children" role="group"></ul>
15-
<div class="tree-loader" role="alert">Loading...</div>
15+
<div class="tree-loader"><span role="alert">Loading...</span></div>
1616
</li>
1717
<li class="tree-item hidden" data-template="treeitem" role="treeitem">
1818
<button type="button" class="tree-item-name">

markup/tree.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</button>
1313
</div>
1414
<ul class="tree-branch-children" role="group"></ul>
15-
<div class="tree-loader" role="alert">Loading...</div>
15+
<div class="tree-loader"><span role="alert">Loading...</span></div>
1616
</li>
1717
<li class="tree-item hidden" data-template="treeitem" role="treeitem">
1818
<button type="button" class="tree-item-name">
@@ -26,7 +26,7 @@
2626
<span class="tree-label"></span>
2727
</button>
2828
</li>
29-
<li class="tree-loader hidden" role="alert">Loading...</li>
29+
<li class="tree-loader hidden"><span role="alert">Loading...</span></li>
3030
</ul>
3131
</body>
3232
</html>

templates/handlebars/fuelux/tree.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</div>
1111
<ul class="tree-branch-children" role="group"></ul>
1212
<!-- this loader shows on nested folders and when overflow is triggered -->
13-
{{#if loaderHTML }}{{loaderHTML}}{{else}}<div class="tree-loader hidden" role="alert">Loading...</div>{{/if}}
13+
{{#if loaderHTML }}{{loaderHTML}}{{else}}<div class="tree-loader hidden"><span role="alert">Loading...</span></div>{{/if}}
1414
</li>
1515
<li class="tree-item hidden" data-template="treeitem" role="treeitem">
1616
<button type="button" class="tree-item-name">
@@ -25,5 +25,5 @@
2525
</button>
2626
</li>
2727
<!-- Loader shown at root level and when tree is loading -->
28-
{{#if initialLoaderHTML}}{{initialLoaderHTML}}{{else}}{{#if loaderHTML }}{{loaderHTML}}{{else}}<li class="tree-loader hidden" role="alert">Loading...</li>{{/if}}{{/if}}
28+
{{#if initialLoaderHTML}}{{initialLoaderHTML}}{{else}}{{#if loaderHTML }}{{loaderHTML}}{{else}}<li class="tree-loader hidden"><span role="alert">Loading...</span></li>{{/if}}{{/if}}
2929
</ul>

test/markup/tree-markup.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</button>
1818
</div>
1919
<ul class="tree-branch-children" role="group"></ul>
20-
<div class="tree-loader" role="alert">Loading...</div>
20+
<div class="tree-loader"><span role="alert">Loading...</span></div>
2121
</li>
2222
<!-- item template -->
2323
<li class="tree-item hidden" data-template="treeitem" role="treeitem">
@@ -32,7 +32,7 @@
3232
<span class="tree-label"></span>
3333
</button>
3434
</li>
35-
<li class="tree-loader hidden" role="alert">Loading...</li>
35+
<li class="tree-loader hidden"><span role="alert">Loading...</span></li>
3636
</ul>
3737

3838
<ul id="MyTree2" class="tree" role="tree">
@@ -46,7 +46,7 @@
4646
</button>
4747
</div>
4848
<ul class="tree-branch-children" role="group"></ul>
49-
<div class="tree-loader" role="alert">Loading...</div>
49+
<div class="tree-loader"><span role="alert">Loading...</span></div>
5050
</li>
5151
<!-- item template -->
5252
<li class="tree-item hidden" data-template="treeitem" role="treeitem">
@@ -61,7 +61,7 @@
6161
<span class="tree-label"></span>
6262
</button>
6363
</li>
64-
<li class="tree-loader hidden" role="alert">Loading...</li>
64+
<li class="tree-loader hidden"><span role="alert">Loading...</span></li>
6565
</ul>
6666

6767
</div>
@@ -82,7 +82,7 @@
8282
</button>
8383
</div>
8484
<ul class="tree-branch-children"></ul>
85-
<div class="tree-loader" role="alert">Loading...</div>
85+
<div class="tree-loader"><span role="alert">Loading...</span></div>
8686
</li>
8787
<!-- item template -->
8888
<li class="tree-item hidden" data-template="treeitem" role="treeitem">
@@ -97,7 +97,7 @@
9797
<span class="tree-label"></span>
9898
</button>
9999
</li>
100-
<li class="tree-loader hidden" role="alert">Loading...</li>
100+
<li class="tree-loader hidden"><span role="alert">Loading...</span></li>
101101
</ul>
102102

103103
</div>

0 commit comments

Comments
 (0)