Merge pull request #805 from hyanwong/error-squash

Don't include OZui twice
OneZoom · Apr 16, 2024 · 8c11642 · 8c11642
2 parents 1ec4953 + adadb89
commit 8c11642
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/views/layout.html b/views/layout.html
@@ -42,8 +42,7 @@
     <!-- Treeviewer code for search / embedded view -->
     {{if is_testing:}}<script>window.is_testing = true;</script>{{pass}}
     <script>var OZstrings={{include 'treeviewer/js_strings.json'}};</script>
-    {{include '../static/OZTreeModule/dist/OZ_main.html'}}
-    {{include '../static/OZTreeModule/dist/OZui.html'}}
+    {{include '../static/OZTreeModule/dist/OZ_main.html'}} <!--includes OZui-->
     {{include 'treeviewer/server_urls.html' }}
 
     {{block head}}{{end}}

diff --git a/views/popup.html b/views/popup.html
@@ -39,7 +39,7 @@
     <!--[if lt IE 9]>
         <script src="{{=URL('static','js/respond-1.4.2.min.js')}}"></script>
         <![endif]-->
-    {{include '../static/OZTreeModule/dist/OZui.html'}}
+    {{include '../static/OZTreeModule/dist/OZui.html'}} <!--Doesn't need the main stuff in a popup -->
     {{include 'treeviewer/server_urls.html' }}
     {{block head}}{{end}}
   </head>