Unnest treeview examples for consistency (issue 2418 task) (pull #2517)

Co-authored-by: Matt King <a11yThinker@gmail.com>
w3c · Oct 27, 2022 · 07859e9 · 07859e9
1 parent 5c5f372
commit 07859e9
Show file tree

Hide file tree

Showing 28 changed files with 76 additions and 88 deletions.
diff --git a/content/index/index.html b/content/index/index.html
@@ -163,8 +163,8 @@ <h2 id="examples_by_role_label">Examples by Role</h2>
                 <li><a href="../patterns/slider/examples/slider-color-viewer.html">Color Viewer Slider</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
                 <li><a href="../patterns/spinbutton/examples/datepicker-spinbuttons.html">Date Picker Spin Button</a></li>
                 <li><a href="../patterns/switch/examples/switch-button.html">Switch  Using HTML Button</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
                 <li><a href="../patterns/treeview/examples/treeview-navigation.html">Navigation Treeview</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
               </ul>
             </td>
@@ -413,8 +413,8 @@ <h2 id="examples_by_role_label">Examples by Role</h2>
             <td><code>tree</code></td>
             <td>
               <ul>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
                 <li><a href="../patterns/treeview/examples/treeview-navigation.html">Navigation Treeview</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
               </ul>
             </td>
@@ -427,8 +427,8 @@ <h2 id="examples_by_role_label">Examples by Role</h2>
             <td><code>treeitem</code></td>
             <td>
               <ul>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
                 <li><a href="../patterns/treeview/examples/treeview-navigation.html">Navigation Treeview</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
               </ul>
             </td>
@@ -593,8 +593,8 @@ <h2 id="examples_by_props_label">Examples By Properties and States</h2>
                 <li><a href="../patterns/menubar/examples/menubar-navigation.html">Navigation Menubar</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
                 <li><a href="../patterns/toolbar/examples/toolbar.html">Toolbar</a></li>
                 <li><a href="../patterns/treegrid/examples/treegrid-1.html">Treegrid Email Inbox</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
                 <li><a href="../patterns/treeview/examples/treeview-navigation.html">Navigation Treeview</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
               </ul>
             </td>
@@ -695,8 +695,8 @@ <h2 id="examples_by_props_label">Examples By Properties and States</h2>
                 <li><a href="../patterns/switch/examples/switch-button.html">Switch  Using HTML Button</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
                 <li><a href="../patterns/tabs/examples/tabs-automatic.html">Tabs with Automatic Activation</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
                 <li><a href="../patterns/tabs/examples/tabs-manual.html">Tabs with Manual Activation</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
                 <li><a href="../patterns/treeview/examples/treeview-navigation.html">Navigation Treeview</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
                 <li><a href="../patterns/landmarks/examples/complementary.html">Complementary Landmark</a></li>
                 <li><a href="../patterns/landmarks/examples/form.html">Form Landmark</a></li>
@@ -712,7 +712,7 @@ <h2 id="examples_by_props_label">Examples By Properties and States</h2>
             <td>
               <ul>
                 <li><a href="../patterns/treegrid/examples/treegrid-1.html">Treegrid Email Inbox</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
               </ul>
             </td>
           </tr>
@@ -757,7 +757,7 @@ <h2 id="examples_by_props_label">Examples By Properties and States</h2>
               <ul>
                 <li><a href="../patterns/feed/examples/feed.html">Feed</a></li>
                 <li><a href="../patterns/treegrid/examples/treegrid-1.html">Treegrid Email Inbox</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
               </ul>
             </td>
           </tr>
@@ -816,8 +816,8 @@ <h2 id="examples_by_props_label">Examples By Properties and States</h2>
                 <li><a href="../patterns/listbox/examples/listbox-scrollable.html">Scrollable Listbox</a></li>
                 <li><a href="../patterns/tabs/examples/tabs-automatic.html">Tabs with Automatic Activation</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
                 <li><a href="../patterns/tabs/examples/tabs-manual.html">Tabs with Manual Activation</a> (<abbr title="High Contrast Support">HC</abbr>)</li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1a.html">File Directory Treeview  Using Computed Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
               </ul>
             </td>
           </tr>
@@ -827,7 +827,7 @@ <h2 id="examples_by_props_label">Examples By Properties and States</h2>
               <ul>
                 <li><a href="../patterns/feed/examples/feed.html">Feed</a></li>
                 <li><a href="../patterns/treegrid/examples/treegrid-1.html">Treegrid Email Inbox</a></li>
-                <li><a href="../patterns/treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
+                <li><a href="../patterns/treeview/examples/treeview-1b.html">File Directory Treeview  Using Declared Properties</a></li>
               </ul>
             </td>
           </tr>

diff --git a/content/patterns/alert/examples/alert.html b/content/patterns/alert/examples/alert.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/alertdialog/examples/alertdialog.html b/content/patterns/alertdialog/examples/alertdialog.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/breadcrumb/examples/breadcrumb.html b/content/patterns/breadcrumb/examples/breadcrumb.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/carousel/examples/carousel-1-prev-next.html b/content/patterns/carousel/examples/carousel-1-prev-next.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/carousel/examples/carousel-2-tablist.html b/content/patterns/carousel/examples/carousel-2-tablist.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/checkbox/examples/checkbox-mixed.html b/content/patterns/checkbox/examples/checkbox-mixed.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/feed/examples/feed.html b/content/patterns/feed/examples/feed.html
@@ -193,7 +193,7 @@ <h2>Javascript and CSS Source Code</h2>
         <p>The following Javascript and CSS is used by the feedDisplay.html page:</p>
         <ul>
           <li><a href="css/feedDisplay.css" type="tex/css">feedDisplay.css</a></li>
-          <li>Javascript: <a href="js/feed.js" type="text/javascript">feed.js</a>, <a href="js/feedDisplay.js" type="text/javascript">feedDisplay.js</a>, <a href="js/main.js" type="text/javascript">main.js</a>, <a href="../js/utils.js">utils.js</a></li>
+          <li>Javascript: <a href="js/feed.js" type="text/javascript">feed.js</a>, <a href="js/feedDisplay.js" type="text/javascript">feedDisplay.js</a>, <a href="js/main.js" type="text/javascript">main.js</a>, <a href="../../../shared/js/utils.js">utils.js</a></li>
         </ul>
       </section>
 

diff --git a/content/patterns/menu-button/examples/menu-button-actions-active-descendant.html b/content/patterns/menu-button/examples/menu-button-actions-active-descendant.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/menu-button/examples/menu-button-actions.html b/content/patterns/menu-button/examples/menu-button-actions.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/menu-button/examples/menu-button-links.html b/content/patterns/menu-button/examples/menu-button-links.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/radio/examples/radio.html b/content/patterns/radio/examples/radio.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/slider-multithumb/examples/slider-multithumb.html b/content/patterns/slider-multithumb/examples/slider-multithumb.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/tabs/examples/tabs-automatic.html b/content/patterns/tabs/examples/tabs-automatic.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/tabs/examples/tabs-manual.html b/content/patterns/tabs/examples/tabs-manual.html
@@ -9,7 +9,6 @@
     <link rel="stylesheet" href="https://www.w3.org/StyleSheets/TR/2016/base.css">
     <link rel="stylesheet" href="../../../shared/css/core.css">
     <script src="../../../shared/js/examples.js"></script>
-    <script src="../../../shared/js/utils.js"></script>
     <script src="../../../shared/js/highlight.pack.js"></script>
     <script src="../../../shared/js/app.js"></script>
     <script src="../../../shared/js/skipto.js"></script>

diff --git a/content/patterns/treegrid/examples/treegrid-1.html b/content/patterns/treegrid/examples/treegrid-1.html
@@ -54,8 +54,8 @@ <h2>About This Example</h2>
         <p>Similar examples include:</p>
         <ul>
           <li><a href="../../grid/examples/dataGrids.html">Data Grid Examples</a>: Three example implementations of grid that include features relevant to presenting tabular information, such as content editing, sort, and column hiding.</li>
-          <li><a href="../../treeview/examples/treeview-1/treeview-1a.html">File Directory Treeview using <em>computed</em> properties</a></li>
-          <li><a href="../../treeview/examples/treeview-1/treeview-1b.html">File Directory Treeview using <em>declared</em> properties</a></li>
+          <li><a href="../../treeview/examples/treeview-1a.html">File Directory Treeview using <em>computed</em> properties</a></li>
+          <li><a href="../../treeview/examples/treeview-1b.html">File Directory Treeview using <em>declared</em> properties</a></li>
           <li><a href="../../treeview/examples/treeview-navigation.html">Navigation Treeview Example</a></li>
         </ul>
       </section>

diff --git a/...treeview/examples/treeview-1/css/tree.css → ...t/patterns/treeview/examples/css/tree.css b/...treeview/examples/treeview-1/css/tree.css → ...t/patterns/treeview/examples/css/tree.css
diff --git a/...s/treeview/examples/treeview-1/js/tree.js → ...ent/patterns/treeview/examples/js/tree.js b/...s/treeview/examples/treeview-1/js/tree.js → ...ent/patterns/treeview/examples/js/tree.js
diff --git a/...eeview/examples/treeview-1/js/treeitem.js → ...patterns/treeview/examples/js/treeitem.js b/...eeview/examples/treeview-1/js/treeitem.js → ...patterns/treeview/examples/js/treeitem.js
diff --git a/...w/examples/treeview-1/js/treeitemClick.js → ...rns/treeview/examples/js/treeitemClick.js b/...w/examples/treeview-1/js/treeitemClick.js → ...rns/treeview/examples/js/treeitemClick.js