fluid-projectGH-32: fix a couple of issues found in code review

cindyli · Dec 20, 2022 · c443e40 · c443e40
1 parent ffb695d
commit c443e40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/html/adjusters.html b/src/html/adjusters.html
@@ -12,19 +12,21 @@
         <link rel="stylesheet" type="text/css" href="../lib/infusion/src/framework/preferences/css/SeparatedPanelPrefsEditor.css" />
         <link rel="stylesheet" type="text/css" href="../css/adjusters.css" />
 
-        <script src="../lib/infusion/dist/infusion-uio.js" defer></script>
-        <script src="../js/schemas.js" defer></script>
-        <script src="../js/store.js" defer></script>
-        <script src="../js/panels.js" defer></script>
-        <script src="../js/prefsEditor.js" defer></script>
-        <script src="../js/instantiator.js" defer></script>
+        <script src="../lib/infusion/dist/infusion-uio.js"></script>
+        <script src="../js/schemas.js"></script>
+        <script src="../js/store.js"></script>
+        <script src="../js/panels.js"></script>
+        <script src="../js/prefsEditor.js"></script>
 
         <title>Preferences Editor</title>
      </head>
 
     <body class="fl-prefsEditor-separatedPanel fl-focus">
         <div class="uioPlus"></div>
         <div class="flc-toc-tocContainer fl-toc-tocContainer"></div>
+
+        <!-- Instantiate when containers are loaded. Using "defer" is not reliable. -->
+        <script src="../js/instantiator.js"></script>
     </body>
 
 </html>
diff --git a/src/js/enactors.js b/src/js/enactors.js
@@ -308,8 +308,8 @@ fluid.defaults("uioPlus.enactor.selfVoicing", {
         controllerParentContainer: ".flc-prefs-selfVoicingWidget",
         domReaderContent: ".flc-orator-content"
     },
-    domReaderContent: ["domReaderContent", "article", "main", "genericContent"],
-    controllerParentContainer: ["controllerParentContainer", "article", "main", "genericContent"],
+    domReaderContent: ["domReaderContent", "main", "article"],
+    controllerParentContainer: ["controllerParentContainer", "main", "article"],
     distributeOptions: [{
         record: {
             expander: {