Fix the <script> tag for finished.js

zanata · Feb 25, 2015 · 65445c9 · 65445c9
1 parent 90758c2
commit 65445c9
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -67,3 +67,6 @@ bin/
 
 # Gradle files
 .gradle/
+
+# other things that really ought to go under target/
+ehcache.disk.store.dir/
diff --git a/zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java b/zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
@@ -87,8 +87,8 @@ public String getJavascriptFinishedScript() {
         // http://127.0.0.1:8180/zanata/javax.faces.resource/signals.min.js.seam?ln=script
         String scriptUrl = httpRequest.getContextPath() + "/javax.faces.resource/finished.js.seam?ln=script";
         if (Boolean.getBoolean(propName)) {
-            return "<script defer type=\"application/javascript\" src=\"" +
-                    scriptUrl + "\"/>";
+            return "<script defer=\"defer\" type=\"application/javascript\" src=\"" +
+                    scriptUrl + "\"></script>";
         }
         return "";
     }

diff --git a/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml b/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
@@ -88,9 +88,8 @@
     <ui:remove>
       <!-- This needs to appear after all other JavaScript, for accurate testing -->
     </ui:remove>
-    <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </h:body>
-
+  <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </html>
 </f:view>
 
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
@@ -158,7 +158,7 @@
     <ui:remove>
       <!-- This needs to appear after all other JavaScript, for accurate testing -->
     </ui:remove>
-    <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </h:body>
+  <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </html>
 </f:view>
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
@@ -83,7 +83,7 @@
     <ui:remove>
       <!-- This needs to appear after all other JavaScript, for accurate testing -->
     </ui:remove>
-    <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </h:body>
+  <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </html>
 </f:view>
diff --git a/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml b/zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
@@ -79,7 +79,7 @@
     <ui:remove>
       <!-- This needs to appear after all other JavaScript, for accurate testing -->
     </ui:remove>
-    <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </h:body>
+  <h:outputText value="#{ajaxCounter.javascriptFinishedScript}" escape="false" />
   </html>
 </f:view>