NOJIRA: Remove redundant type='text/javascript' from imports in Samigo (

sakaiproject#7804)
slmsshk · Jan 31, 2020 · 254220d · 254220d
1 parent b0d996a
commit 254220d
Show file tree

Hide file tree

Showing 56 changed files with 120 additions and 120 deletions.
diff --git a/samigo/samigo-app/src/webapp/html/picker.html b/samigo/samigo-app/src/webapp/html/picker.html
@@ -31,7 +31,7 @@
 </select>
 </td></tr>
 <tr><td align="center">
-<script type="text/javascript">
+<script>
 	var P = opener.TCP;
 	onload = "P.show(P.initPalette)";
 	document.forms[0].elements[0].selectedIndex = P.initPalette;

diff --git a/samigo/samigo-app/src/webapp/js/delivery.js b/samigo/samigo-app/src/webapp/js/delivery.js
@@ -1,7 +1,7 @@
 <%-- JAVSCRIPT FOR DISABLING SHOWFEEDBACK AND TOC AFTER ONE CLICK 
 Note that this will be embedded in the page exactly as is
 --%><!-- Samigo embedded delivery.js starts here -->
-<script type="text/javascript">
+<script>
 
 function printForm(){
   alert("print 0");

diff --git a/samigo/samigo-app/src/webapp/jsf/author/audioRecordingPopup.jsp b/samigo/samigo-app/src/webapp/jsf/author/audioRecordingPopup.jsp
@@ -21,7 +21,7 @@ $Id: audioRecordingPopup.jsp 6643 2006-03-13 19:38:07Z [email protected] $
 **********************************************************************************/
 --%>
 
-<script type="text/javascript">
+<script>
     $(document).ready(function() {
         var localeLanguage = <h:outputText value="'#{person.localeLanguage}'" escape="false"/>;
         var localeCountry = <h:outputText value="'#{person.localeCountry}'" escape="false"/>;

diff --git a/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp b/samigo/samigo-app/src/webapp/jsf/author/authorIndex_content.jsp
@@ -36,11 +36,11 @@
 <body onload="<%= request.getAttribute("html.body.onload") %>">
     <div class="portletBody container-fluid">
 
-    <script type="text/JavaScript">includeWebjarLibrary('datatables');</script>
-    <script type="text/JavaScript">includeWebjarLibrary('bootstrap-multiselect');</script>
-    <script type="text/javascript" src="/samigo-app/js/info.js"></script>
-    <script type="text/javascript" src="/samigo-app/js/naturalSort.js"></script>
-    <script type="text/javascript">
+    <script>includeWebjarLibrary('datatables');</script>
+    <script>includeWebjarLibrary('bootstrap-multiselect');</script>
+    <script src="/samigo-app/js/info.js"></script>
+    <script src="/samigo-app/js/naturalSort.js"></script>
+    <script>
         $(document).ready(function() {
             jQuery.extend(jQuery.fn.dataTableExt.oSort, {
                 "span-asc": function (a, b) {

diff --git a/samigo/samigo-app/src/webapp/jsf/author/createAssessment_title.jsp b/samigo/samigo-app/src/webapp/jsf/author/createAssessment_title.jsp
@@ -39,8 +39,8 @@
     <h:form id="authorIndexForm">
         <!-- HEADINGS -->
         <%@ include file="/jsf/author/editAssessmentHeadings.jsp" %>
-        <script type="text/JavaScript">includeWebjarLibrary('datatables');</script>
-        <script type="text/javascript" src="/samigo-app/js/info.js"></script>
+        <script>includeWebjarLibrary('datatables');</script>
+        <script src="/samigo-app/js/info.js"></script>
 
 <%--        header--%>
         <div class="page-header">

diff --git a/samigo/samigo-app/src/webapp/jsf/author/editPart.jsp b/samigo/samigo-app/src/webapp/jsf/author/editPart.jsp
@@ -35,8 +35,8 @@
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.create_modify_p}" /></title>
       <!-- AUTHORING -->
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
-      <script type="text/javascript" src="/library/js/spinner.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
+      <script src="/library/js/spinner.js"></script>
       </head>
       <body onload="<%= request.getAttribute("html.body.onload") %>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/calculatedQuestion.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/calculatedQuestion.jsp
@@ -42,10 +42,10 @@ confirmation dialog
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head><%= request.getAttribute("html.head") %>
 	<title><h:outputText value="#{authorMessages.item_display_author}"/></title>
-	<script type="text/javascript" src="/samigo-app/js/info.js"></script>
+	<script src="/samigo-app/js/info.js"></script>
 	<!-- AUTHORING -->
-	<script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
-	<script type="text/javascript">
+	<script src="/samigo-app/js/authoring.js"></script>
+	<script>
 	$(document).ready(function() {
 		initCalcQuestion();
 	});

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/emiWhatsThis.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/emiWhatsThis.jsp
@@ -12,7 +12,7 @@
 <head><%=request.getAttribute("html.head")%>
 <title><h:outputText
 		value="#{authorMessages.example_emi_question}" escape="false" /></title>
-<script type="text/javascript">
+<script>
 	$(document).ready(function() {
 		$('#closeBut').click(function() {
 			window.close();

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/extendedMatchingItems.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/extendedMatchingItems.jsp
@@ -40,13 +40,13 @@
 <!-- AUTHORING -->
 <link type="text/css"
 	rel="Stylesheet" />
-<script type="text/javascript">
+<script>
 	var emiAuthoring = true;
 </script>
 
-<script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
-<script type="text/javascript" src="/samigo-app/js/utils-emi.js"></script>
-<script type="text/javascript" src="/samigo-app/js/authoring-emi.js"></script>
+<script src="/samigo-app/js/authoring.js"></script>
+<script src="/samigo-app/js/utils-emi.js"></script>
+<script src="/samigo-app/js/authoring-emi.js"></script>
 </head>
 <body onload="<%=request.getAttribute("html.body.onload")%>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/fillInNumeric.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/fillInNumeric.jsp
@@ -33,7 +33,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
       </head>
       <body onload="countNum();<%= request.getAttribute("html.body.onload") %>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/fillInTheBlank.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/fillInTheBlank.jsp
@@ -32,7 +32,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
       </head>
       <body onload="<%= request.getAttribute("html.body.onload") %>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/imageMapQuestion.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/imageMapQuestion.jsp
@@ -35,20 +35,20 @@
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
 
-	  <script type="text/javascript" src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
-	  <script type="text/javascript" src="/samigo-app/js/jquery.dynamiclist.author.js"></script>
-	  <script type="text/javascript" src="/samigo-app/js/selection.author.js"></script>
+	  <script src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
+	  <script src="/samigo-app/js/jquery.dynamiclist.author.js"></script>
+	  <script src="/samigo-app/js/selection.author.js"></script>
 
 	  <link rel="stylesheet" type="text/css" href="/samigo-app/css/imageQuestion.author.css">
 <%--
-<script type="text/JavaScript">
+<script>
 <!--
 <%@ include file="/js/authoring.js" %>
 //-->
 </script>
 --%>
 
-<script type="text/JavaScript">
+<script>
 
 	var dynamicList = new DynamicList('itemForm\\:serialized', 'template', {selectionClass: 'selectiondiv', textClass: 'textContainer'}, 'imageContainer');
 			

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/itemHeadings.jsp
@@ -1,6 +1,6 @@
 <%-- Headings for item edit pages, needs to have msg=AuthorMessages.properties.  --%>
 <!-- Core files -->
-<script type="text/JavaScript">
+<script>
 function changeTypeLink(field){
 
 var newindex = 0;

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/matching.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/matching.jsp
@@ -35,9 +35,9 @@
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
 
       <!-- AUTHORING -->
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
 <%--
-<script type="text/JavaScript">
+<script>
 <!--
 <%@ include file="/js/authoring.js" %>
 //-->
@@ -382,7 +382,7 @@
 <!-- end content -->
 </div>
 
-<script type="text/javascript">
+<script>
 applyMenuListener("controllingSequence", "feedbackContainer", "noFeedbackMsg");
 </script>
     </body>

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/matrixChoicesSurvey.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/matrixChoicesSurvey.jsp
@@ -34,8 +34,8 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
-      <script type="text/JavaScript">
+      <script src="/samigo-app/js/authoring.js"></script>
+      <script>
       	function textCounter(field,cntfield,maxlimit) {
           	
       		if (field.value.length > maxlimit) // if too long...trim it!

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/multipleChoice.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/multipleChoice.jsp
@@ -457,7 +457,7 @@
 </div>
 
 <f:verbatim> 
-	<script type="text/javascript" defer='defer'>
+	<script defer='defer'>
 	$(document).ready(function(){
 		var itemType = "${itemauthor.currentItem.itemType}";
 		var prefixId='#itemForm\\:';

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/multipleChoiceSurvey.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/multipleChoiceSurvey.jsp
@@ -33,7 +33,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
       </head>
 <body onload="<%= request.getAttribute("html.body.onload") %>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/tags.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/tags.jsp
@@ -1,7 +1,7 @@
 <script>includeWebjarLibrary('select2');</script>
 <script src="/library/webjars/select2/4.0.12/js/i18n/<h:outputText value='#{itemauthor.language}' rendered='#{not empty itemauthor.language}' /><h:outputText value='en' rendered='#{empty itemauthor.language}' />.js"></script>
 <f:subview id="delete" rendered="#{itemauthor.deleteTagsAllowed == true}">
-    <script type="text/javascript">
+    <script>
 
 
         $(document).ready(function () {
@@ -122,7 +122,7 @@
 </f:subview>
 <f:subview id="nodelete" rendered="#{itemauthor.deleteTagsAllowed == false}">
 
-    <script type="text/javascript">
+    <script>
 
 
         $(document).ready(function () {

diff --git a/samigo/samigo-app/src/webapp/jsf/author/item/trueFalse.jsp b/samigo/samigo-app/src/webapp/jsf/author/item/trueFalse.jsp
@@ -34,7 +34,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.item_display_author}"/></title>
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
       </head>
 <body onload="countNum();;<%= request.getAttribute("html.body.onload") %>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/preview_item/tags.jsp b/samigo/samigo-app/src/webapp/jsf/author/preview_item/tags.jsp
@@ -1,6 +1,6 @@
-<script type="text/javascript">includeWebjarLibrary('select2');</script>
+<script>includeWebjarLibrary('select2');</script>
 
-<script type="text/javascript">
+<script>
 
     $(document).ready(function () {
         $(".tag_selector_<h:outputText value="#{question.itemData.itemId}"/>").select2({

diff --git a/samigo/samigo-app/src/webapp/jsf/author/publishAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/author/publishAssessment.jsp
@@ -307,7 +307,7 @@
 
 <f:verbatim><p></p></f:verbatim>
 
-<script type="text/JavaScript">
+<script>
 var clicked = 'false';
 function toggle(){
   if (clicked == 'false'){

diff --git a/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp b/samigo/samigo-app/src/webapp/jsf/author/publishedSettings.jsp
@@ -43,18 +43,18 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{assessmentSettingsMessages.sakai_assessment_manager} #{assessmentSettingsMessages.dash} #{assessmentSettingsMessages.settings}" /></title>
-      <script type="text/javascript" src="/samigo-app/jsf/widget/hideDivision/hideDivision.js"></script>
-      <script type="text/javascript" src="/samigo-app/jsf/widget/colorpicker/colorpicker.js"></script>
-      <script type="text/javascript" src="/library/js/lang-datepicker/lang-datepicker.js"></script>
-      <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+      <script src="/samigo-app/jsf/widget/hideDivision/hideDivision.js"></script>
+      <script src="/samigo-app/jsf/widget/colorpicker/colorpicker.js"></script>
+      <script src="/library/js/lang-datepicker/lang-datepicker.js"></script>
+      <script src="/samigo-app/js/authoring.js"></script>
 
-      <script type="text/javascript">
+      <script>
       if (needJQuery) {
          document.write('\x3Clink href="/library/webjars/jquery-ui/1.12.1/jquery-ui.min.css?version=" rel="stylesheet">');
       }
       </script>
 
-      <script type="text/javascript">
+      <script>
         $(document).ready(function() {
           // set up the accordion for settings
           var accordionPanel = 1;

diff --git a/samigo/samigo-app/src/webapp/jsf/author/removePart.jsp b/samigo/samigo-app/src/webapp/jsf/author/removePart.jsp
@@ -31,7 +31,7 @@
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
       <head><%= request.getAttribute("html.head") %>
       <title><h:outputText value="#{authorMessages.remove_p_conf}" /></title>
-      <script type="text/javascript" src="/library/js/spinner.js"></script>
+      <script src="/library/js/spinner.js"></script>
       </head>
       <body onload="<%= request.getAttribute("html.body.onload") %>">
 

diff --git a/samigo/samigo-app/src/webapp/jsf/author/searchQuestion.jsp b/samigo/samigo-app/src/webapp/jsf/author/searchQuestion.jsp
@@ -32,10 +32,10 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
     <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
     <head><%= request.getAttribute("html.head") %>
         <title><h:outputText value="#{authorMessages.search_question}" /></title>
-        <script type="text/javascript" src="/samigo-app/js/authoring.js"></script>
+        <script src="/samigo-app/js/authoring.js"></script>
 
 
-        <script type="text/JavaScript">
+        <script>
             <%@ include file="/js/samigotree.js" %>
 
             function textCounter(field, maxlimit) {
@@ -48,11 +48,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
             });
         </script>
 
-        <script type="text/javascript" src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
-        <script type="text/javascript" src="/library/js/spinner.js"></script>
-        <script type="text/javascript">includeWebjarLibrary('select2');</script>
+        <script src="/library/webjars/jquery/1.12.4/jquery.min.js"></script>
+        <script src="/library/js/spinner.js"></script>
+        <script>includeWebjarLibrary('select2');</script>
 
-        <script type="text/javascript">
+        <script>
             function initPage()
             {
                 disableIt();

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/assessmentDeliveryTimer.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/assessmentDeliveryTimer.jsp
@@ -57,7 +57,7 @@ Headings for delivery pages, needs to have msg=DeliveryMessages.properties, etc.
 <h:inputHidden id="elapsed" value="#{delivery.timeElapse}" />
 <h:inputHidden id="outoftime" value="#{delivery.timeOutSubmission}"/>
 
-<script type="text/JavaScript">
+<script>
 function isFromLink() {
   if (${delivery.actionMode} == 5) {
     return true;

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/confirmSubmit.jsp
@@ -76,7 +76,7 @@ remove the javascript onclick stuff.
 <!-- JAVASCRIPT -->
 <%@ include file="/js/delivery.js" %>
 
-<script type="text/JavaScript">
+<script>
 
 function saveTime()
 {

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/deliverAssessment.jsp
@@ -70,7 +70,7 @@
 <!-- JAVASCRIPT -->
 <%@ include file="/js/delivery.js" %>
 
-<script type="text/JavaScript">
+<script>
 function checkRadio()
 {
   for (i=0; i<document.forms[0].elements.length; i++)
@@ -196,7 +196,7 @@ document.links[newindex].onclick();
 <link rel="stylesheet" type="text/css" href="/samigo-app/css/imageQuestion.student.css">
 <link rel="stylesheet" type="text/css" href="/samigo-app/css/imageQuestion.author.css">
 
-<script type="text/JavaScript">
+<script>
 	var dynamicListMap = [];		
 	jQuery(window).load(function(){
 		
@@ -606,8 +606,8 @@ document.links[newindex].onclick();
 <!-- end content -->
 </div>
 <f:verbatim></div></f:verbatim>
-<script type="text/javascript" src="/samigo-app/js/questionProgress.js"></script>
-<script type="text/JavaScript">
+<script src="/samigo-app/js/questionProgress.js"></script>
+<script>
 	<%= request.getAttribute("html.body.onload") %> 
 	setLocation(); 
 	checkRadio();

diff --git a/samigo/samigo-app/src/webapp/jsf/delivery/deliveryjQuery.jsp b/samigo/samigo-app/src/webapp/jsf/delivery/deliveryjQuery.jsp
@@ -20,9 +20,9 @@
 --%>
 -->
 
-<script type="text/javascript" src="/library/webjars/jquery-blockui/2.65/jquery.blockUI.js"></script>
+<script src="/library/webjars/jquery-blockui/2.65/jquery.blockUI.js"></script>
 
-<script type="text/javascript">
+<script>
      var honorPledgeIsChecked = true;
      var scoringType = <h:outputText value="#{delivery.scoringType}"/>;
      var autoSubmit = <h:outputText value="#{delivery.settings.autoSubmit}"/>;