This is an automated email from the ASF dual-hosted git repository. jleroux pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push: new f96232d75 Improved: Use media type "text/javascript" instead of "application/javascript to follow RFC-9239 (OFBIZ-13156) f96232d75 is described below commit f96232d75369f28b8a662085f3e69954c88e0598 Author: Jacques Le Roux <jacques.le.r...@les7arts.com> AuthorDate: Mon Oct 21 10:46:44 2024 +0200 Improved: Use media type "text/javascript" instead of "application/javascript to follow RFC-9239 (OFBIZ-13156) See https://datatracker.ietf.org/doc/html/rfc9239#name-iana-considerations --- cmssite/data/CmsMultiSiteDemoData.xml | 8 ++++---- cmssite/data/CmsSiteDemoData.xml | 4 ++-- cmssite/template/cms/HtmlHead.ftl | 2 +- ebay/template/find/EbayAdvancedSearch.ftl | 2 +- ebay/template/find/EbayExportLink.ftl | 2 +- ebay/template/find/ProductsExportToEbay.ftl | 4 ++-- ebaystore/template/feedback/LeaveFeedback.ftl | 2 +- ebaystore/template/store/EbayApiKeywordSearch.ftl | 2 +- ebaystore/template/store/OrderImported.ftl | 2 +- ebaystore/template/store/ProductSearchExport.ftl | 12 ++++++------ ebaystore/template/store/StoreSetting.ftl | 6 +++--- ecommerce/template/Login.ftl | 6 +++--- ecommerce/template/RequirePasswordChange.ftl | 2 +- ecommerce/template/cart/ShowCart.ftl | 6 +++--- ecommerce/template/catalog/CategoryDetail.ftl | 2 +- ecommerce/template/catalog/ConfigProductDetail.ftl | 6 +++--- ecommerce/template/catalog/DetailImage.ftl | 2 +- ecommerce/template/catalog/ProductCategories.ftl | 2 +- ecommerce/template/catalog/ProductDetail.ftl | 4 ++-- ecommerce/template/catalog/ProductSummary.ftl | 2 +- ecommerce/template/catalog/TellAFriend.ftl | 2 +- ecommerce/template/customer/AnonContactus.ftl | 2 +- ecommerce/template/customer/MiniSignUpForContactList.ftl | 2 +- ecommerce/template/customer/NewCustomer.ftl | 4 ++-- ecommerce/template/customer/profile/ManageAddress.ftl | 8 ++++---- ecommerce/template/includes/HeaderHead.ftl | 6 +++--- ecommerce/template/order/AnonymousCheckoutLinks.ftl | 2 +- ecommerce/template/order/BillSettings.ftl | 2 +- ecommerce/template/order/CheckoutOptions.ftl | 2 +- ecommerce/template/order/CheckoutPayment.ftl | 2 +- ecommerce/template/order/CheckoutReview.ftl | 2 +- ecommerce/template/order/CheckoutShippingAddress.ftl | 2 +- ecommerce/template/order/CheckoutShippingOptions.ftl | 2 +- ecommerce/template/order/PaymentInformation.ftl | 2 +- ecommerce/template/order/QuickAnonCheckoutLinks.ftl | 2 +- ecommerce/template/order/QuickAnonCheckoutReview.ftl | 2 +- ecommerce/template/order/QuickAnonOptionSettings.ftl | 2 +- ecommerce/template/order/QuickAnonPaymentInformation.ftl | 2 +- ecommerce/template/order/SplitShip.ftl | 2 +- ecommerce/template/shoppinglist/EditShoppingList.ftl | 2 +- example/template/includes/AppendJavascript.ftl | 2 +- multiflex/template/Footer.ftl | 2 +- myportal/template/Login.ftl | 2 +- myportal/template/RegisterPerson.ftl | 2 +- .../main/java/org/apache/ofbiz/htmlreport/HtmlReport.java | 2 +- pricat/template/pricat/ExcelImportHistoryReport.ftl | 2 +- pricat/template/pricat/pricatreport.ftl | 2 +- pricat/template/pricat/report.ftl | 2 +- projectmgr/template/project/GanttChart.ftl | 4 ++-- rest-api/webapp/docs/redoc.standalone.js | 2 +- scrum/template/includes/BacklogByStatusChart.ftl | 4 ++-- scrum/template/includes/BacklogByTypeChart.ftl | 4 ++-- scrum/template/includes/BurnDown.ftl | 4 ++-- scrum/template/includes/PieChart.ftl | 4 ++-- scrum/template/includes/ProjectAndSprintChart.ftl | 4 ++-- scrum/template/includes/ProjectByStatusChart.ftl | 4 ++-- scrum/template/includes/TaskByStatusChart.ftl | 4 ++-- scrum/template/includes/TaskByTypeChart.ftl | 4 ++-- solr/home/solrdefault/conf/velocity/mime_type_lists.vm | 2 +- solr/webapp/solr/js/require.js | 2 +- webpos/template/Login.ftl | 2 +- webpos/template/RequirePasswordChange.ftl | 2 +- webpos/template/cart/ShowCart.ftl | 2 +- webpos/template/cart/ShowCartItemSelected.ftl | 2 +- webpos/template/catalog/CategoryDetail.ftl | 2 +- webpos/template/includes/Header.ftl | 2 +- webpos/template/search/CustomerAddress.ftl | 2 +- webpos/template/search/SearchParties.ftl | 2 +- webpos/template/search/SearchProducts.ftl | 2 +- webpos/template/shortcuts/Shortcuts.ftl | 2 +- 70 files changed, 104 insertions(+), 104 deletions(-) diff --git a/cmssite/data/CmsMultiSiteDemoData.xml b/cmssite/data/CmsMultiSiteDemoData.xml index e6636b03a..c80a77416 100644 --- a/cmssite/data/CmsMultiSiteDemoData.xml +++ b/cmssite/data/CmsMultiSiteDemoData.xml @@ -44,8 +44,8 @@ under the License. <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${(decoratedContent.subcontent.title.render)!"WebSite 1 Generic Title (Set subcontent 'title' on your content!)"}</title> <link rel="shortcut icon" href="/images/ofbiz.ico" /> - <script src="/common/js/util/fieldlookup.js" type="application/javascript"></script> - <script src="/common/js/util/OfbizUtil.js" type="application/javascript"></script> + <script src="/common/js/util/fieldlookup.js" type="text/javascript"></script> + <script src="/common/js/util/OfbizUtil.js" type="text/javascript"></script> <link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/> <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/> <link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/> @@ -125,8 +125,8 @@ under the License. <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <title>${(decoratedContent.subcontent.title.render)!"WebSite 2 Generic Title (Set subcontent 'title' on your content!)"}</title> <link rel="shortcut icon" href="/images/ofbiz.ico" /> - <script src="/common/js/util/fieldlookup.js" type="application/javascript"></script> - <script src="/common/js/util/OfbizUtil.js" type="application/javascript"></script> + <script src="/common/js/util/fieldlookup.js" type="text/javascript"></script> + <script src="/common/js/util/OfbizUtil.js" type="text/javascript"></script> <link rel="stylesheet" href="/ecommerce/images/ecommain.css" type="text/css"/> <link rel="stylesheet" href="/ecommerce/images/blog.css" type="text/css"/> <link rel="stylesheet" href="/contentimages/css/contentForum.css" type="text/css"/> diff --git a/cmssite/data/CmsSiteDemoData.xml b/cmssite/data/CmsSiteDemoData.xml index ba6ebde88..f4675e85c 100644 --- a/cmssite/data/CmsSiteDemoData.xml +++ b/cmssite/data/CmsSiteDemoData.xml @@ -41,11 +41,11 @@ under the License. <Content contentId="CMSS_HHEAD" contentTypeId="DOCUMENT" contentName="CMS Site HTML Head" dataResourceId="CMSS_HHEAD"/> <ContentPurpose contentId="CMSS_HHEAD" contentPurposeTypeId="SECTION"/> - <DataResource dataResourceId="FIELD_LOOKUP_JS" dataResourceTypeId="LINK" mimeTypeId="application/javascript" objectInfo="/common/js/util/fieldlookup.js"/> + <DataResource dataResourceId="FIELD_LOOKUP_JS" dataResourceTypeId="LINK" mimeTypeId="text/javascript" objectInfo="/common/js/util/fieldlookup.js"/> <Content contentId="FIELD_LOOKUP_JS" contentTypeId="DOCUMENT" contentName="Field Lookup JS" dataResourceId="FIELD_LOOKUP_JS"/> <ContentAssoc contentId="CMSS_HHEAD" contentIdTo="FIELD_LOOKUP_JS" sequenceNum="1" contentAssocTypeId="SUB_CONTENT" mapKey="js" fromDate="2014-10-02 00:00:00"/> - <DataResource dataResourceId="OFBIZ_UTIL_JS" dataResourceTypeId="LINK" mimeTypeId="application/javascript" objectInfo="/common/js/util/OfbizUtil.js"/> + <DataResource dataResourceId="OFBIZ_UTIL_JS" dataResourceTypeId="LINK" mimeTypeId="text/javascript" objectInfo="/common/js/util/OfbizUtil.js"/> <Content contentId="OFBIZ_UTIL_JS" contentTypeId="DOCUMENT" contentName="OFBiz Util JS" dataResourceId="OFBIZ_UTIL_JS"/> <ContentAssoc contentId="CMSS_HHEAD" contentIdTo="OFBIZ_UTIL_JS" sequenceNum="2" contentAssocTypeId="SUB_CONTENT" mapKey="js" fromDate="2014-10-02 00:00:00"/> diff --git a/cmssite/template/cms/HtmlHead.ftl b/cmssite/template/cms/HtmlHead.ftl index 35b20b979..e2377b054 100644 --- a/cmssite/template/cms/HtmlHead.ftl +++ b/cmssite/template/cms/HtmlHead.ftl @@ -32,7 +32,7 @@ under the License. <#assign nothing = thisContent.setSortOrder("caSequenceNum")/> <#assign nothing = thisContent.setMapKeyFilter("js")/> <#list thisContent.subcontent_all as content> - <script src="${content.render!}" type="application/javascript"></script> + <script src="${content.render!}" type="text/javascript"></script> </#list> <#assign nothing = thisContent.setMapKeyFilter("css")/> <#list thisContent.subcontent_all as content> diff --git a/ebay/template/find/EbayAdvancedSearch.ftl b/ebay/template/find/EbayAdvancedSearch.ftl index f48e66898..1e07948cf 100644 --- a/ebay/template/find/EbayAdvancedSearch.ftl +++ b/ebay/template/find/EbayAdvancedSearch.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function selectChange(formId, elementId) { if (elementId.id == 'searchProductStoreId') { document.getElementById('searchCatalogId')[document.getElementById('searchCatalogId') diff --git a/ebay/template/find/EbayExportLink.ftl b/ebay/template/find/EbayExportLink.ftl index 99c1c468c..1fe673143 100644 --- a/ebay/template/find/EbayExportLink.ftl +++ b/ebay/template/find/EbayExportLink.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function exportToEbay() { <#if toEbayStore??> document.products.action="<@ofbizUrl>prepareProductListing</@ofbizUrl>"; diff --git a/ebay/template/find/ProductsExportToEbay.ftl b/ebay/template/find/ProductsExportToEbay.ftl index adb2db2a5..97bf8a73c 100644 --- a/ebay/template/find/ProductsExportToEbay.ftl +++ b/ebay/template/find/ProductsExportToEbay.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function changeEbayCategory(categ) { document.forms["ProductsExportToEbay"].action = "<@ofbizUrl>ProductsExportToEbay?categoryCode="+categ+"</@ofbizUrl>"; @@ -240,7 +240,7 @@ under the License. </#if> </table> </form> - <script type="application/javascript"> + <script type="text/javascript"> activateSubmitButton(); </script> </div> diff --git a/ebaystore/template/feedback/LeaveFeedback.ftl b/ebaystore/template/feedback/LeaveFeedback.ftl index 180d8ecca..34a85517d 100644 --- a/ebaystore/template/feedback/LeaveFeedback.ftl +++ b/ebaystore/template/feedback/LeaveFeedback.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> <#if results.itemsAwaitingFeedback?has_content> -<script type="application/javascript"> +<script type="text/javascript"> var active = ""; function overStar(obj){ if(obj.src.match("starActive")){ diff --git a/ebaystore/template/store/EbayApiKeywordSearch.ftl b/ebaystore/template/store/EbayApiKeywordSearch.ftl index ee857fc20..85a02800d 100644 --- a/ebaystore/template/store/EbayApiKeywordSearch.ftl +++ b/ebaystore/template/store/EbayApiKeywordSearch.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> //<![CDATA[ function selectChange(formId, elementId) { if (elementId.id == 'searchCatalogId') { diff --git a/ebaystore/template/store/OrderImported.ftl b/ebaystore/template/store/OrderImported.ftl index ba1b23f06..4ff2aaaf2 100644 --- a/ebaystore/template/store/OrderImported.ftl +++ b/ebaystore/template/store/OrderImported.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> <!-- // function uploadTrackingCode(orderId, productStoreId) { document.uploadTracking.orderId.value = orderId; diff --git a/ebaystore/template/store/ProductSearchExport.ftl b/ebaystore/template/store/ProductSearchExport.ftl index 45f74634a..df6dca828 100644 --- a/ebaystore/template/store/ProductSearchExport.ftl +++ b/ebaystore/template/store/ProductSearchExport.ftl @@ -62,7 +62,7 @@ under the License. background-color:#FFF; } </style> -<script type="application/javascript"> +<script type="text/javascript"> function retrieveEbayCategoryByParent(url,cateId,productStoreId,id){ if (cateId.match('true')){ @@ -584,18 +584,18 @@ under the License. <td> <script src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/elrte.min.js</@ofbizContentUrl>" - type="application/javascript"> + type="text/javascript"> </script> <#if language?has_content && language != "en"> <script src="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/js/i18n/elrte.${language!"en"}.js</@ofbizContentUrl>" - type="application/javascript"> + type="text/javascript"> </script> <#rt/> </#if> <link href="<@ofbizContentUrl>/common/js/jquery/plugins/elrte-1.3/css/elrte.min.css</@ofbizContentUrl>" rel="stylesheet" type="text/css"> - <script type="application/javascript"> + <script type="text/javascript"> var opts = { cssClass: 'el-rte', lang: '${language}', @@ -608,7 +608,7 @@ under the License. <textarea id="description" name="description" style="width:800px; height:300px"> <#if item.getDescription()??>description<#else>${item.getDescription()!}</#if> </textarea> - <script type="application/javascript"> + <script type="text/javascript"> jQuery('#description').elrte(opts); </script> </td> @@ -657,7 +657,7 @@ under the License. <tr> <td></td> <td valign="top"> - <script type="application/javascript"> + <script type="text/javascript"> function popUpImg() { //popUp(document.getElementById('themeImg').src, 'themeImgBig', '400', '550'); } diff --git a/ebaystore/template/store/StoreSetting.ftl b/ebaystore/template/store/StoreSetting.ftl index 021c60b4c..1126b4290 100644 --- a/ebaystore/template/store/StoreSetting.ftl +++ b/ebaystore/template/store/StoreSetting.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function countAreaChars(areaName, limit, charleft) { if (areaName.value.length > limit) { @@ -549,7 +549,7 @@ under the License. </td> </tr> </table> - <script type="application/javascript"> + <script type="text/javascript"> document.getElementById('charsleft1').innerHTML = (35 - document.StoreSettingForm.storeName.value.length) + " charactors left."; document.getElementById('charsleft2').innerHTML @@ -558,7 +558,7 @@ under the License. </fieldset> </form> </#if> -<script type="application/javascript"> +<script type="text/javascript"> <#if "Basic" == themeType!> document.StoreSettingForm.storeAdvancedTheme.disabled = true; document.StoreSettingForm.storeAdvancedThemeColor.disabled = true; diff --git a/ecommerce/template/Login.ftl b/ecommerce/template/Login.ftl index 1a35fcb5c..355d3921e 100644 --- a/ecommerce/template/Login.ftl +++ b/ecommerce/template/Login.ftl @@ -19,7 +19,7 @@ under the License. <#assign janrainEnabled = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("ecommerce", "janrain.enabled", delegator)> <#assign appName = Static["org.apache.ofbiz.entity.util.EntityUtilProperties"].getPropertyValue("ecommerce", "janrain.appName", delegator)> <#if "Y" == janrainEnabled> -<script type="application/javascript"> +<script type="text/javascript"> (function() { if (typeof window.janrain !== 'object') window.janrain = {}; window.janrain.settings = {}; @@ -34,7 +34,7 @@ under the License. } var e = document.createElement('script'); - e.type = 'application/javascript'; + e.type = 'text/javascript'; e.id = 'janrainAuthWidget'; if (document.location.protocol === 'https:') { @@ -142,7 +142,7 @@ under the License. <div class="endcolumns"> </div> -<script type="application/javascript"> +<script type="text/javascript"> <#if autoUserLogin?has_content>document.loginform.PASSWORD.focus();</#if> <#if !autoUserLogin?has_content>document.loginform.USERNAME.focus();</#if> </script> diff --git a/ecommerce/template/RequirePasswordChange.ftl b/ecommerce/template/RequirePasswordChange.ftl index 257dd8928..dee3ada3a 100644 --- a/ecommerce/template/RequirePasswordChange.ftl +++ b/ecommerce/template/RequirePasswordChange.ftl @@ -62,7 +62,7 @@ under the License. </div> </div> -<script type="application/javascript"> +<script type="text/javascript"> <#if autoUserLogin?has_content>document.loginform.PASSWORD.focus();</#if> <#if !autoUserLogin?has_content>document.loginform.USERNAME.focus();</#if> </script> diff --git a/ecommerce/template/cart/ShowCart.ftl b/ecommerce/template/cart/ShowCart.ftl index 7df05981e..15cf2ddd2 100644 --- a/ecommerce/template/cart/ShowCart.ftl +++ b/ecommerce/template/cart/ShowCart.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function removeSelected() { var cform = document.cartform; cform.removeSelected.value = true; @@ -61,7 +61,7 @@ under the License. } </script> -<script type="application/javascript"> +<script type="text/javascript"> function setAlternateGwp(field) { window.location=field.value; }; @@ -122,7 +122,7 @@ under the License. </div> </div> -<script type="application/javascript"> +<script type="text/javascript"> document.quickaddform.add_product_id.focus(); </script> diff --git a/ecommerce/template/catalog/CategoryDetail.ftl b/ecommerce/template/catalog/CategoryDetail.ftl index 5681e2f82..ba4bfdd0e 100644 --- a/ecommerce/template/catalog/CategoryDetail.ftl +++ b/ecommerce/template/catalog/CategoryDetail.ftl @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> - <script type="application/javascript"> + <script type="text/javascript"> function callDocumentByPaginate(info) { var str = info.split('~'); var checkUrl = '<@ofbizUrl>categoryAjaxFired</@ofbizUrl>'; diff --git a/ecommerce/template/catalog/ConfigProductDetail.ftl b/ecommerce/template/catalog/ConfigProductDetail.ftl index 56bfe2414..441738ba0 100644 --- a/ecommerce/template/catalog/ConfigProductDetail.ftl +++ b/ecommerce/template/catalog/ConfigProductDetail.ftl @@ -23,7 +23,7 @@ under the License. <#-- virtual product javascript --> ${virtualJavaScript!} -<script type="application/javascript"> +<script type="text/javascript"> var detailImageUrl = null; function setAddProductId(name) { document.addform.add_product_id.value = name; @@ -133,7 +133,7 @@ ${virtualJavaScript!} } </script> -<script type="application/javascript"> +<script type="text/javascript"> jQuery(document).ready(function () { jQuery('#configFormId').change(getConfigDetails) @@ -423,7 +423,7 @@ ${virtualJavaScript!} <td> <#-- Prefill first select box (virtual products only) --> <#if variantTree?? && 0 < variantTree.size()> - <script type="application/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> + <script type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) --> diff --git a/ecommerce/template/catalog/DetailImage.ftl b/ecommerce/template/catalog/DetailImage.ftl index a5ec24c7f..8f72c1fb5 100644 --- a/ecommerce/template/catalog/DetailImage.ftl +++ b/ecommerce/template/catalog/DetailImage.ftl @@ -21,7 +21,7 @@ under the License. <#if requestParameters.detail?has_content> <img src="${requestParameters.detail}" alt=""/> <#else> - <script type="application/javascript"> + <script type="text/javascript"> window.close(); </script> </#if> diff --git a/ecommerce/template/catalog/ProductCategories.ftl b/ecommerce/template/catalog/ProductCategories.ftl index 6487399a4..6ec8d4b9e 100644 --- a/ecommerce/template/catalog/ProductCategories.ftl +++ b/ecommerce/template/catalog/ProductCategories.ftl @@ -16,7 +16,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> <#-- some labels are not unescaped in the JSON object so we have to do this manuely --> function unescapeHtmlText(text) { return jQuery('<div />').html(text).text() diff --git a/ecommerce/template/catalog/ProductDetail.ftl b/ecommerce/template/catalog/ProductDetail.ftl index fec317724..497bee276 100644 --- a/ecommerce/template/catalog/ProductDetail.ftl +++ b/ecommerce/template/catalog/ProductDetail.ftl @@ -24,7 +24,7 @@ under the License. <#-- virtual product javascript --> ${virtualJavaScript!} ${virtualVariantJavaScript!} -<script type="application/javascript"> +<script type="text/javascript"> var detailImageUrl = null; function setAddProductId2(sku, with_bak) { document.addform.add_product_id.value = sku; @@ -844,7 +844,7 @@ ${variantInfoJavaScript!} </div> <#-- Prefill first select box (virtual products only) --> <#if variantTree?? && 0 < variantTree.size()> - <script type="application/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> + <script type="text/javascript">eval("list" + "${featureOrderFirst}" + "()");</script> </#if> <#-- Swatches (virtual products only) --> diff --git a/ecommerce/template/catalog/ProductSummary.ftl b/ecommerce/template/catalog/ProductSummary.ftl index 10bf0285b..87c35877a 100644 --- a/ecommerce/template/catalog/ProductSummary.ftl +++ b/ecommerce/template/catalog/ProductSummary.ftl @@ -17,7 +17,7 @@ under the License. --> ${virtualJavaScript!} - <script type="application/javascript"> + <script type="text/javascript"> function displayProductVirtualId(variantId, virtualProductId, pForm) { if(variantId){ pForm.product_id.value = variantId; diff --git a/ecommerce/template/catalog/TellAFriend.ftl b/ecommerce/template/catalog/TellAFriend.ftl index a730f929c..973b71b83 100644 --- a/ecommerce/template/catalog/TellAFriend.ftl +++ b/ecommerce/template/catalog/TellAFriend.ftl @@ -56,7 +56,7 @@ under the License. </tr> </table> <#else> - <script type="application/javascript"> + <script type="text/javascript"> window.close(); </script> <div>${uiLabelMap.EcommerceTellAFriendSorry}</div> diff --git a/ecommerce/template/customer/AnonContactus.ftl b/ecommerce/template/customer/AnonContactus.ftl index c97a4b582..c66ecaf2b 100644 --- a/ecommerce/template/customer/AnonContactus.ftl +++ b/ecommerce/template/customer/AnonContactus.ftl @@ -25,7 +25,7 @@ under the License. <div class="card-header"> <strong>${uiLabelMap.CommonContactUs}</strong> </div> - <script type="application/javascript"> + <script type="text/javascript"> function reloadCaptcha(fieldName) { var captchaUri = "<@ofbizUrl>captcha.jpg?captchaCodeId=" + fieldName + "&unique=_PLACEHOLDER_</@ofbizUrl>"; var unique = Date.now(); diff --git a/ecommerce/template/customer/MiniSignUpForContactList.ftl b/ecommerce/template/customer/MiniSignUpForContactList.ftl index 47b45bb09..e7b388ca4 100644 --- a/ecommerce/template/customer/MiniSignUpForContactList.ftl +++ b/ecommerce/template/customer/MiniSignUpForContactList.ftl @@ -29,7 +29,7 @@ under the License. </select> </#macro> -<script type="application/javascript"> +<script type="text/javascript"> function unsubscribe() { var form = document.getElementById("signUpForContactListForm"); form.action = "<@ofbizUrl>unsubscribeContactListParty</@ofbizUrl>" diff --git a/ecommerce/template/customer/NewCustomer.ftl b/ecommerce/template/customer/NewCustomer.ftl index 34075c00f..1596b6b9f 100644 --- a/ecommerce/template/customer/NewCustomer.ftl +++ b/ecommerce/template/customer/NewCustomer.ftl @@ -18,7 +18,7 @@ under the License. --> <#if getUsername> -<script type="application/javascript"> +<script type="text/javascript"> //<![CDATA[ lastFocusedName = null; function setLastFocused(formElement) { @@ -478,7 +478,7 @@ button actions. <a href="javascript:document.getElementById('newuserform').submit()" class="btn btn-outline-secondary btn-sm">${uiLabelMap.CommonSave}</a> </div> -<script type="application/javascript"> +<script type="text/javascript"> //<![CDATA[ hideShowUsaStates(); //]]> diff --git a/ecommerce/template/customer/profile/ManageAddress.ftl b/ecommerce/template/customer/profile/ManageAddress.ftl index 2f6c48a33..eefdaf76c 100644 --- a/ecommerce/template/customer/profile/ManageAddress.ftl +++ b/ecommerce/template/customer/profile/ManageAddress.ftl @@ -98,7 +98,7 @@ under the License. </fieldset> </form> </div> - <script type="application/javascript"> + <script type="text/javascript"> jQuery("#displayCreateAddressForm").dialog({ autoOpen: false, modal: true, buttons: { @@ -160,7 +160,7 @@ under the License. <div id="displayEditBillToPostalAddress" style="display: none;"> <#include "EditBillToAddress.ftl" /> </div> - <script type="application/javascript"> + <script type="text/javascript"> jQuery("#displayEditBillToPostalAddress").dialog({ autoOpen: false, modal: true, buttons: { @@ -218,7 +218,7 @@ under the License. <div id="displayEditShipToPostalAddress" style="display: none;"> <#include "EditShipToAddress.ftl" /> </div> - <script type="application/javascript"> + <script type="text/javascript"> jQuery("#displayEditShipToPostalAddress").dialog({ autoOpen: false, modal: true, buttons: { @@ -296,7 +296,7 @@ under the License. </fieldset> </form> </div> - <script type="application/javascript"> + <script type="text/javascript"> jQuery("#displayEditAddressForm_${contactMech.contactMechId}").dialog({ autoOpen: false, modal: true, buttons: { diff --git a/ecommerce/template/includes/HeaderHead.ftl b/ecommerce/template/includes/HeaderHead.ftl index c1a007c1a..29b737a04 100644 --- a/ecommerce/template/includes/HeaderHead.ftl +++ b/ecommerce/template/includes/HeaderHead.ftl @@ -78,7 +78,7 @@ under the License. </#if> <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript> - <script type="application/javascript" + <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> </#list> </#if> @@ -89,7 +89,7 @@ under the License. <#list layoutSettings.javaScripts as javaScript> <#if javaScriptsSet.contains(javaScript)> <#assign nothing = javaScriptsSet.remove(javaScript)/> - <script type="application/javascript" + <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script> </#if> </#list> @@ -110,7 +110,7 @@ under the License. <meta name="keywords" content="${metaKeywords}"/> </#if> <#if webAnalyticsConfigs?has_content> - <script type="application/javascript"> + <script type="text/javascript"> <#list webAnalyticsConfigs as webAnalyticsConfig> <#if webAnalyticsConfig.webAnalyticsTypeId != "BACKEND_ANALYTICS"> ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)} diff --git a/ecommerce/template/order/AnonymousCheckoutLinks.ftl b/ecommerce/template/order/AnonymousCheckoutLinks.ftl index 6eb6c0f19..730b5eab9 100644 --- a/ecommerce/template/order/AnonymousCheckoutLinks.ftl +++ b/ecommerce/template/order/AnonymousCheckoutLinks.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form) { form.submit(); } diff --git a/ecommerce/template/order/BillSettings.ftl b/ecommerce/template/order/BillSettings.ftl index 01304dbeb..c908de5aa 100644 --- a/ecommerce/template/order/BillSettings.ftl +++ b/ecommerce/template/order/BillSettings.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function shipBillAddr() { <#if "Y" == requestParameters.singleUsePayment?default("N")> <#assign singleUse = "&singleUsePayment=Y"> diff --git a/ecommerce/template/order/CheckoutOptions.ftl b/ecommerce/template/order/CheckoutOptions.ftl index 8d5643eff..044e3c0e0 100644 --- a/ecommerce/template/order/CheckoutOptions.ftl +++ b/ecommerce/template/order/CheckoutOptions.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form, mode, value) { if ("DN" == mode) { // done action; checkout diff --git a/ecommerce/template/order/CheckoutPayment.ftl b/ecommerce/template/order/CheckoutPayment.ftl index 2dcf203bb..b2d776262 100644 --- a/ecommerce/template/order/CheckoutPayment.ftl +++ b/ecommerce/template/order/CheckoutPayment.ftl @@ -19,7 +19,7 @@ under the License. <!-- TODO : Need formatting --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form, mode, value) { if ("DN" == mode) { // done action; checkout diff --git a/ecommerce/template/order/CheckoutReview.ftl b/ecommerce/template/order/CheckoutReview.ftl index 1d7e1ff38..288e46108 100644 --- a/ecommerce/template/order/CheckoutReview.ftl +++ b/ecommerce/template/order/CheckoutReview.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> var clicked = 0; function processOrder() { if (clicked == 0) { diff --git a/ecommerce/template/order/CheckoutShippingAddress.ftl b/ecommerce/template/order/CheckoutShippingAddress.ftl index c592868a6..3cf7ed0e3 100644 --- a/ecommerce/template/order/CheckoutShippingAddress.ftl +++ b/ecommerce/template/order/CheckoutShippingAddress.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form, mode, value) { if ("DN" == mode) { // done action; checkout diff --git a/ecommerce/template/order/CheckoutShippingOptions.ftl b/ecommerce/template/order/CheckoutShippingOptions.ftl index c7147a220..9bc19f75b 100644 --- a/ecommerce/template/order/CheckoutShippingOptions.ftl +++ b/ecommerce/template/order/CheckoutShippingOptions.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form, mode, value) { if ("DN" == mode) { // done action; checkout diff --git a/ecommerce/template/order/PaymentInformation.ftl b/ecommerce/template/order/PaymentInformation.ftl index 0cf726ca6..a68f21fba 100644 --- a/ecommerce/template/order/PaymentInformation.ftl +++ b/ecommerce/template/order/PaymentInformation.ftl @@ -19,7 +19,7 @@ under the License. <#if requestParameters.paymentMethodTypeId?has_content> <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId!}"> </#if> -<script type="application/javascript"> +<script type="text/javascript"> function shipBillAddr() { <#if "Y" == requestParameters.singleUsePayment?default("N")> <#assign singleUse = "&singleUsePayment=Y"> diff --git a/ecommerce/template/order/QuickAnonCheckoutLinks.ftl b/ecommerce/template/order/QuickAnonCheckoutLinks.ftl index 672bb0e36..2c6b8ce3c 100644 --- a/ecommerce/template/order/QuickAnonCheckoutLinks.ftl +++ b/ecommerce/template/order/QuickAnonCheckoutLinks.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form) { form.submit(); } diff --git a/ecommerce/template/order/QuickAnonCheckoutReview.ftl b/ecommerce/template/order/QuickAnonCheckoutReview.ftl index 61b6b1bc6..f28cda2f8 100644 --- a/ecommerce/template/order/QuickAnonCheckoutReview.ftl +++ b/ecommerce/template/order/QuickAnonCheckoutReview.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> var clicked = 0; function processOrder() { if (clicked == 0) { diff --git a/ecommerce/template/order/QuickAnonOptionSettings.ftl b/ecommerce/template/order/QuickAnonOptionSettings.ftl index 54e1adc1e..886967d06 100644 --- a/ecommerce/template/order/QuickAnonOptionSettings.ftl +++ b/ecommerce/template/order/QuickAnonOptionSettings.ftl @@ -16,7 +16,7 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> jQuery(document).ready(init); diff --git a/ecommerce/template/order/QuickAnonPaymentInformation.ftl b/ecommerce/template/order/QuickAnonPaymentInformation.ftl index 71f307f53..60823f04e 100644 --- a/ecommerce/template/order/QuickAnonPaymentInformation.ftl +++ b/ecommerce/template/order/QuickAnonPaymentInformation.ftl @@ -19,7 +19,7 @@ under the License. <#if requestParameters.paymentMethodTypeId?has_content> <#assign paymentMethodTypeId = "${requestParameters.paymentMethodTypeId!}"> </#if> -<script type="application/javascript"> +<script type="text/javascript"> jQuery(document).ready(init); diff --git a/ecommerce/template/order/SplitShip.ftl b/ecommerce/template/order/SplitShip.ftl index b9e78ab7e..634035c49 100644 --- a/ecommerce/template/order/SplitShip.ftl +++ b/ecommerce/template/order/SplitShip.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> function submitForm(form, mode, value) { if ("DN" == mode) { // done action; payment info diff --git a/ecommerce/template/shoppinglist/EditShoppingList.ftl b/ecommerce/template/shoppinglist/EditShoppingList.ftl index 1ea42a04a..a553dd39b 100644 --- a/ecommerce/template/shoppinglist/EditShoppingList.ftl +++ b/ecommerce/template/shoppinglist/EditShoppingList.ftl @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> -<script type="application/javascript"> +<script type="text/javascript"> <!-- function to add extra info for Timestamp format --> function TimestampSubmit(obj) { reservStartStr = jQuery(obj).find("input[name='reservStartStr']"); diff --git a/example/template/includes/AppendJavascript.ftl b/example/template/includes/AppendJavascript.ftl index 9342b4578..db9e7ab00 100644 --- a/example/template/includes/AppendJavascript.ftl +++ b/example/template/includes/AppendJavascript.ftl @@ -16,4 +16,4 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> -<script type="application/javascript" src="${reactAppJavascriptUrlPath}"></script> \ No newline at end of file +<script type="text/javascript" src="${reactAppJavascriptUrlPath}"></script> \ No newline at end of file diff --git a/multiflex/template/Footer.ftl b/multiflex/template/Footer.ftl index 6dd265561..ed4a7f96c 100644 --- a/multiflex/template/Footer.ftl +++ b/multiflex/template/Footer.ftl @@ -26,7 +26,7 @@ under the License. </div> <#if layoutSettings.VT_FTR_JAVASCRIPT?has_content> <#list layoutSettings.VT_FTR_JAVASCRIPT as javaScript> - <script type="application/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script> + <script type="text/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script> </#list> </#if> </footer> diff --git a/myportal/template/Login.ftl b/myportal/template/Login.ftl index f522a0a1d..304ad3410 100644 --- a/myportal/template/Login.ftl +++ b/myportal/template/Login.ftl @@ -67,7 +67,7 @@ under the License. </div> </center> -<script type="application/javascript"> +<script type="text/javascript"> document.loginform.JavaScriptEnabled.value = "Y"; <#if focusName> document.loginform.USERNAME.focus(); diff --git a/myportal/template/RegisterPerson.ftl b/myportal/template/RegisterPerson.ftl index c72723560..bd90189b0 100644 --- a/myportal/template/RegisterPerson.ftl +++ b/myportal/template/RegisterPerson.ftl @@ -98,7 +98,7 @@ under the License. <td class="label"> Code Captcha </td> <td><div><img id="captchaImage" src="<@ofbizUrl>captcha.jpg?captchaCodeId=captchaImage&unique=${nowTimestamp.getTime()}</@ofbizUrl>" alt="" /></div></td> </tr> - <script type="application/javascript"> + <script type="text/javascript"> function reloadCaptcha(fieldName) { var captchaUri = "<@ofbizUrl>captcha.jpg?captchaCodeId=" + fieldName + "&unique=_PLACEHOLDER_</@ofbizUrl>"; var unique = Date.now(); diff --git a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java index a5aa40417..d54f17064 100644 --- a/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java +++ b/pricat/src/main/java/org/apache/ofbiz/htmlreport/HtmlReport.java @@ -516,7 +516,7 @@ public class HtmlReport extends AbstractReport { result.append("<link rel=\"stylesheet\" type=\"text/css\" href=\""); result.append("/pricat/includes/pricat.css"); result.append("\">\n"); - result.append("<script type=\"application/javascript\">\n"); + result.append("<script type=\"text/javascript\">\n"); result.append(dialogScriptSubmit()); result.append("</script>\n"); } diff --git a/pricat/template/pricat/ExcelImportHistoryReport.ftl b/pricat/template/pricat/ExcelImportHistoryReport.ftl index c7dc88d88..fb846037b 100644 --- a/pricat/template/pricat/ExcelImportHistoryReport.ftl +++ b/pricat/template/pricat/ExcelImportHistoryReport.ftl @@ -98,7 +98,7 @@ under the License. </#if> </tbody> </table> -<script type="application/javascript"> +<script type="text/javascript"> function viewExcelImportLog(sequenceNum) { document.location = "<@ofbizUrl>viewExcelImportLog</@ofbizUrl>?sequenceNum=" + sequenceNum; } diff --git a/pricat/template/pricat/pricatreport.ftl b/pricat/template/pricat/pricatreport.ftl index f2c788b91..c2db26538 100644 --- a/pricat/template/pricat/pricatreport.ftl +++ b/pricat/template/pricat/pricatreport.ftl @@ -141,7 +141,7 @@ function continueReport() { ${StringUtil.wrapString(report.htmlStart())} -<script type="application/javascript"> +<script type="text/javascript"> <!-- // saves the HTML of the extended report format, diff --git a/pricat/template/pricat/report.ftl b/pricat/template/pricat/report.ftl index f3e186452..477cb2b0d 100644 --- a/pricat/template/pricat/report.ftl +++ b/pricat/template/pricat/report.ftl @@ -141,7 +141,7 @@ function continueReport() { ${StringUtil.wrapString(report.htmlStart())} -<script type="application/javascript"> +<script type="text/javascript"> <!-- // saves the HTML of the extended report format, diff --git a/projectmgr/template/project/GanttChart.ftl b/projectmgr/template/project/GanttChart.ftl index 7cbbf0298..cb08a3697 100644 --- a/projectmgr/template/project/GanttChart.ftl +++ b/projectmgr/template/project/GanttChart.ftl @@ -22,5 +22,5 @@ under the License. <input id="ofbizGantItemsJson" type="hidden" value="${phaseTaskListJson}"/> -<script type="application/javascript" src="/projectmgr/node_modules/jsgantt-improved/dist/jsgantt.js"></script> -<script type="application/javascript" src="/projectmgr/static/projectmgr.js"></script> +<script type="text/javascript" src="/projectmgr/node_modules/jsgantt-improved/dist/jsgantt.js"></script> +<script type="text/javascript" src="/projectmgr/static/projectmgr.js"></script> diff --git a/rest-api/webapp/docs/redoc.standalone.js b/rest-api/webapp/docs/redoc.standalone.js index 09f3ab83f..3c7725ab6 100644 --- a/rest-api/webapp/docs/redoc.standalone.js +++ b/rest-api/webapp/docs/redoc.standalone.js @@ -1,3 +1,3 @@ /*! For license information please see redoc.standalone.js.LICENSE.txt */ -!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("null")):"function"==typeof define&&define.amd?define(["null"],t):"object"==typeof exports?exports.Redoc=t(require("null")):e.Redoc=t(e.null)}(this,(function(e){return function(){var t={7228:function(e){e.exports=function(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r},e.exports.default=e.exports,e.exports.__esModule=!0},2858:function(e){e.exports=func [...] ":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function w(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}for(var k=new Array(256),E=new Array(256),S=0;S<256;S++)k[S]=x(S)?1:0,E[S]=x(S);function _(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||s,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typ [...] \u2028\u2029".indexOf(this.buffer.charAt(o-1));)if(o-=1,this.position-o>t/2-1){n=" ... ",o+=5;break}for(i="",a=this.position;a<this.buffer.length&&-1==="\0\r\n \u2028\u2029".indexOf(this.buffer.charAt(a));)if((a+=1)-this.position>t/2-1){i=" ... ",a-=5;break}return s=this.buffer.slice(o,a),r.repeat(" ",e)+n+s+i+"\n"+r.repeat(" ",e+this.position-o+n.length)+"^"},o.prototype.toString=function(e){var t,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet())&&(n+=":\n"+t),n},e.exports=o},304:function(e,t,n){"use strict";n(4747),n(7327);var r=n(910),o=n(2188),i=n(889);function [...] "!=" "[e]()||o[e].name!==e}))}},3111:function(e,t,n){var r=n(4488),o="["+n(1361)+"]",i=RegExp("^"+o+o+"*"),a=RegExp(o+o+"*$"),s=function(e){return function(t){var n=String(r(t));return 1&e&&(n=n.replace(i,"")),2&e&&(n=n.replace(a,"")),n}};e.exports={start:s(1),end:s(2),trim:s(3)}},261:function(e,t,n){var r,o,i,a=n(7854),s=n(7293),l=n(9974),c=n(490),u=n(317),p=n(6833),f=n(5268),d=a.location,h=a.setImmediate,m=a.clearImmediate,v=a.process,g=a.MessageChannel,y=a.Dispatch,b=0,x={},w=function(e){i [...] "!=" "[e]()||i[e].name!==e}))}},3111:function(e,t,r){var n=r(4488),i="["+r(1361)+"]",o=RegExp("^"+i+i+"*"),s=RegExp(i+i+"*$"),a=function(e){return function(t){var r=String(n(t));return 1&e&&(r=r.replace(o,"")),2&e&&(r=r.replace(s,"")),r}};e.exports={start:a(1),end:a(2),trim:a(3)}},261:function(e,t,r){var n,i,o,s=r(7854),a=r(7293),u=r(9974),c=r(490),l=r(317),f=r(6833),h=r(5268),p=s.location,d=s.setImmediate,v=s.clearImmediate,y=s.process,g=s.MessageChannel,m=s.Dispatch,x=0,w={},b=function(e){i [...] +!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("null")):"function"==typeof define&&define.amd?define(["null"],t):"object"==typeof exports?exports.Redoc=t(require("null")):e.Redoc=t(e.null)}(this,(function(e){return function(){var t={7228:function(e){e.exports=function(e,t){(null==t||t>e.length)&&(t=e.length);for(var n=0,r=new Array(t);n<t;n++)r[n]=e[n];return r},e.exports.default=e.exports,e.exports.__esModule=!0},2858:function(e){e.exports=func [...] ":95===e?" ":76===e?"\u2028":80===e?"\u2029":""}function w(e){return e<=65535?String.fromCharCode(e):String.fromCharCode(55296+(e-65536>>10),56320+(e-65536&1023))}for(var k=new Array(256),E=new Array(256),S=0;S<256;S++)k[S]=x(S)?1:0,E[S]=x(S);function _(e,t){this.input=e,this.filename=t.filename||null,this.schema=t.schema||s,this.onWarning=t.onWarning||null,this.legacy=t.legacy||!1,this.json=t.json||!1,this.listener=t.listener||null,this.implicitTypes=this.schema.compiledImplicit,this.typ [...] \u2028\u2029".indexOf(this.buffer.charAt(o-1));)if(o-=1,this.position-o>t/2-1){n=" ... ",o+=5;break}for(i="",a=this.position;a<this.buffer.length&&-1==="\0\r\n \u2028\u2029".indexOf(this.buffer.charAt(a));)if((a+=1)-this.position>t/2-1){i=" ... ",a-=5;break}return s=this.buffer.slice(o,a),r.repeat(" ",e)+n+s+i+"\n"+r.repeat(" ",e+this.position-o+n.length)+"^"},o.prototype.toString=function(e){var t,n="";return this.name&&(n+='in "'+this.name+'" '),n+="at line "+(this.line+1)+", column "+(this.column+1),e||(t=this.getSnippet())&&(n+=":\n"+t),n},e.exports=o},304:function(e,t,n){"use strict";n(4747),n(7327);var r=n(910),o=n(2188),i=n(889);function [...] "!=" "[e]()||o[e].name!==e}))}},3111:function(e,t,n){var r=n(4488),o="["+n(1361)+"]",i=RegExp("^"+o+o+"*"),a=RegExp(o+o+"*$"),s=function(e){return function(t){var n=String(r(t));return 1&e&&(n=n.replace(i,"")),2&e&&(n=n.replace(a,"")),n}};e.exports={start:s(1),end:s(2),trim:s(3)}},261:function(e,t,n){var r,o,i,a=n(7854),s=n(7293),l=n(9974),c=n(490),u=n(317),p=n(6833),f=n(5268),d=a.location,h=a.setImmediate,m=a.clearImmediate,v=a.process,g=a.MessageChannel,y=a.Dispatch,b=0,x={},w=function(e){i [...] "!=" "[e]()||i[e].name!==e}))}},3111:function(e,t,r){var n=r(4488),i="["+r(1361)+"]",o=RegExp("^"+i+i+"*"),s=RegExp(i+i+"*$"),a=function(e){return function(t){var r=String(n(t));return 1&e&&(r=r.replace(o,"")),2&e&&(r=r.replace(s,"")),r}};e.exports={start:a(1),end:a(2),trim:a(3)}},261:function(e,t,r){var n,i,o,s=r(7854),a=r(7293),u=r(9974),c=r(490),l=r(317),f=r(6833),h=r(5268),p=s.location,d=s.setImmediate,v=s.clearImmediate,y=s.process,g=s.MessageChannel,m=s.Dispatch,x=0,w={},b=function(e){i [...] //# sourceMappingURL=redoc.standalone.js.map \ No newline at end of file diff --git a/scrum/template/includes/BacklogByStatusChart.ftl b/scrum/template/includes/BacklogByStatusChart.ftl index 8a2f7ca29..03d732204 100644 --- a/scrum/template/includes/BacklogByStatusChart.ftl +++ b/scrum/template/includes/BacklogByStatusChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_birtReport" method="post"></form> -<script type="application/javascript"> +<script type="text/javascript"> function loadViewerbirtReport(){ var formObj = document.getElementById( "form_birtReport" ); var paramContainer = document.getElementById("params_birtReport"); @@ -41,4 +41,4 @@ under the License. } </script> <iframe name="birtReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;' ></iframe> -<script type="application/javascript">loadViewerbirtReport();</script> +<script type="text/javascript">loadViewerbirtReport();</script> diff --git a/scrum/template/includes/BacklogByTypeChart.ftl b/scrum/template/includes/BacklogByTypeChart.ftl index 0683396a9..faf2aec3c 100644 --- a/scrum/template/includes/BacklogByTypeChart.ftl +++ b/scrum/template/includes/BacklogByTypeChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_byTypeReport" method="post"></form> -<script type="application/javascript"> +<script type="text/javascript"> function loadViewerByTypeReport(){ var formObj = document.getElementById( "form_byTypeReport" ); var paramContainer = document.getElementById("params_byTypeReport"); @@ -41,4 +41,4 @@ under the License. } </script> <iframe name="byTypeReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;' ></iframe> -<script type="application/javascript">loadViewerByTypeReport();</script> +<script type="text/javascript">loadViewerByTypeReport();</script> diff --git a/scrum/template/includes/BurnDown.ftl b/scrum/template/includes/BurnDown.ftl index 04e6f2e21..1973ce559 100644 --- a/scrum/template/includes/BurnDown.ftl +++ b/scrum/template/includes/BurnDown.ftl @@ -34,7 +34,7 @@ under the License. <INPUT type="HIDDEN" name="maxHours" value="${maxHours!}"/> </div> <form id="form_birtReport" method="post"></form> - <script type="application/javascript"> + <script type="text/javascript"> function loadViewerbirtReport(){ var formObj = document.getElementById( "form_birtReport" ); var paramContainer = document.getElementById("params_birtReport"); @@ -57,5 +57,5 @@ under the License. </script> <iframe name="birtReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;' ></iframe> - <script type="application/javascript">loadViewerbirtReport();</script> + <script type="text/javascript">loadViewerbirtReport();</script> </#if> diff --git a/scrum/template/includes/PieChart.ftl b/scrum/template/includes/PieChart.ftl index 3dfc16c13..2c07dd20c 100644 --- a/scrum/template/includes/PieChart.ftl +++ b/scrum/template/includes/PieChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_birtReport" method="post"></form> - <script type="application/javascript"> + <script type="text/javascript"> function loadViewerbirtReport(){ var formObj = document.getElementById( "form_birtReport" ); var paramContainer = document.getElementById("params_birtReport"); @@ -44,4 +44,4 @@ under the License. </script> <iframe name="birtReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;' ></iframe> - <script type="application/javascript">loadViewerbirtReport();</script> \ No newline at end of file + <script type="text/javascript">loadViewerbirtReport();</script> \ No newline at end of file diff --git a/scrum/template/includes/ProjectAndSprintChart.ftl b/scrum/template/includes/ProjectAndSprintChart.ftl index cd955041d..b91213d74 100644 --- a/scrum/template/includes/ProjectAndSprintChart.ftl +++ b/scrum/template/includes/ProjectAndSprintChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_projectSprintReport" method="post"></form> -<script type="application/javascript"> +<script type="text/javascript"> function loadViewerProjectSprintReport(){ var formObj = document.getElementById( "form_projectSprintReport" ); var paramContainer = document.getElementById("params_projectSprintReport"); @@ -41,4 +41,4 @@ under the License. } </script> <iframe name="projectSprintReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;' ></iframe> -<script type="application/javascript">loadViewerProjectSprintReport();</script> +<script type="text/javascript">loadViewerProjectSprintReport();</script> diff --git a/scrum/template/includes/ProjectByStatusChart.ftl b/scrum/template/includes/ProjectByStatusChart.ftl index de4e74462..597135919 100644 --- a/scrum/template/includes/ProjectByStatusChart.ftl +++ b/scrum/template/includes/ProjectByStatusChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_projectReport" method="post"></form> -<script type="application/javascript"> +<script type="text/javascript"> function loadViewerProjectReport(){ var formObj = document.getElementById( "form_projectReport" ); var paramContainer = document.getElementById("params_projectReport"); @@ -41,4 +41,4 @@ under the License. } </script> <iframe name="projectReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;' ></iframe> -<script type="application/javascript">loadViewerProjectReport();</script> +<script type="text/javascript">loadViewerProjectReport();</script> diff --git a/scrum/template/includes/TaskByStatusChart.ftl b/scrum/template/includes/TaskByStatusChart.ftl index 9e533d47c..7bbcde8d0 100644 --- a/scrum/template/includes/TaskByStatusChart.ftl +++ b/scrum/template/includes/TaskByStatusChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_taskByStatusReport" method="post"></form> -<script type="application/javascript"> +<script type="text/javascript"> function loadViewertaskReport(){ var formObj = document.getElementById( "form_taskByStatusReport" ); var paramContainer = document.getElementById("params_taskByStatusReport"); @@ -40,4 +40,4 @@ under the License. } </script> <iframe name="taskByStatusReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;'></iframe> -<script type="application/javascript">loadViewertaskReport();</script> +<script type="text/javascript">loadViewertaskReport();</script> diff --git a/scrum/template/includes/TaskByTypeChart.ftl b/scrum/template/includes/TaskByTypeChart.ftl index 5f6048bc1..2c2a4c028 100644 --- a/scrum/template/includes/TaskByTypeChart.ftl +++ b/scrum/template/includes/TaskByTypeChart.ftl @@ -20,7 +20,7 @@ under the License. <INPUT type="HIDDEN" name="productId" value="${product.productId}"/> </div> <form id="form_taskByTypeReport" method="post"></form> -<script type="application/javascript"> +<script type="text/javascript"> function loadViewertaskReport(){ var formObj = document.getElementById( "form_taskByTypeReport" ); var paramContainer = document.getElementById("params_taskByTypeReport"); @@ -40,5 +40,5 @@ under the License. } </script> <iframe name="taskByTypeReport" frameborder="no" scrolling = "auto" style='height:350px;width:100%;'></iframe> -<script type="application/javascript">loadViewertaskReport();</script> +<script type="text/javascript">loadViewertaskReport();</script> \ No newline at end of file diff --git a/solr/home/solrdefault/conf/velocity/mime_type_lists.vm b/solr/home/solrdefault/conf/velocity/mime_type_lists.vm index c9832b407..dfb128c1c 100644 --- a/solr/home/solrdefault/conf/velocity/mime_type_lists.vm +++ b/solr/home/solrdefault/conf/velocity/mime_type_lists.vm @@ -32,7 +32,7 @@ "application/java-archive": "jar", "text/x-java-source": "java", "image/jpeg": "jpeg", - "application/javascript": "js", + "text/javascript": "js", "application/vnd.oasis.opendocument.chart": "odc", "application/vnd.oasis.opendocument.formula": "odf", "application/vnd.oasis.opendocument.graphics": "odg", diff --git a/solr/webapp/solr/js/require.js b/solr/webapp/solr/js/require.js index a47f8b441..c322c0def 100644 --- a/solr/webapp/solr/js/require.js +++ b/solr/webapp/solr/js/require.js @@ -9994,7 +9994,7 @@ jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) { // Install script dataType jQuery.ajaxSetup({ accepts: { - script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript" + script: "text/javascript, text/javascript, application/ecmascript, application/x-ecmascript" }, contents: { script: /javascript|ecmascript/ diff --git a/webpos/template/Login.ftl b/webpos/template/Login.ftl index 99aecf914..76aabc914 100644 --- a/webpos/template/Login.ftl +++ b/webpos/template/Login.ftl @@ -72,7 +72,7 @@ under the License. </div> </center> -<script type="application/javascript"> +<script type="text/javascript"> document.loginform.JavaScriptEnabled.value = "Y"; <#if focusName> document.loginform.USERNAME.focus(); diff --git a/webpos/template/RequirePasswordChange.ftl b/webpos/template/RequirePasswordChange.ftl index 86f13908c..fada780df 100644 --- a/webpos/template/RequirePasswordChange.ftl +++ b/webpos/template/RequirePasswordChange.ftl @@ -57,7 +57,7 @@ under the License. </div> </div> -<script type="application/javascript"> +<script type="text/javascript"> <#if autoUserLogin?has_content>document.loginform.PASSWORD.focus();</#if> <#if !autoUserLogin?has_content>document.loginform.USERNAME.focus();</#if> </script> diff --git a/webpos/template/cart/ShowCart.ftl b/webpos/template/cart/ShowCart.ftl index 03ce9eb8d..3bd19cad9 100644 --- a/webpos/template/cart/ShowCart.ftl +++ b/webpos/template/cart/ShowCart.ftl @@ -145,6 +145,6 @@ under the License. </#if> </table> </div> -<script type="application/javascript"> +<script type="text/javascript"> selectCartItem(); </script> diff --git a/webpos/template/cart/ShowCartItemSelected.ftl b/webpos/template/cart/ShowCartItemSelected.ftl index ceca6255c..4380353a0 100644 --- a/webpos/template/cart/ShowCartItemSelected.ftl +++ b/webpos/template/cart/ShowCartItemSelected.ftl @@ -67,7 +67,7 @@ under the License. <a id="updateCartItem" name="updateCartItem" href="javascript:updateCartItem();" class="buttontext">${uiLabelMap.CommonUpdate}</a> <a id="deleteCartItem" name="deleteCartItem" href="javascript:deleteCartItem('${cartLineIndex}');" class="buttontext">${uiLabelMap.CommonDelete}</a> </div> - <script type="application/javascript"> + <script type="text/javascript"> cartItemSelectedEvents('${focusOnQuantity}'); </script> </#if> diff --git a/webpos/template/catalog/CategoryDetail.ftl b/webpos/template/catalog/CategoryDetail.ftl index 9e016e23f..7917dcc8d 100644 --- a/webpos/template/catalog/CategoryDetail.ftl +++ b/webpos/template/catalog/CategoryDetail.ftl @@ -62,7 +62,7 @@ under the License. </tr> </#if> </table> -<script type="application/javascript"> +<script type="text/javascript"> showSelectedButton(); </script> </#if> diff --git a/webpos/template/includes/Header.ftl b/webpos/template/includes/Header.ftl index cea4fc357..df7e19162 100644 --- a/webpos/template/includes/Header.ftl +++ b/webpos/template/includes/Header.ftl @@ -28,7 +28,7 @@ under the License. <#if layoutSettings.javaScripts?has_content> <#--layoutSettings.javaScripts is a list of java scripts. --> <#list layoutSettings.javaScripts as javaScript> - <script src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="application/javascript"></script> + <script src="<@ofbizContentUrl>${javaScript}</@ofbizContentUrl>" type="text/javascript"></script> </#list> </#if> <#if layoutSettings.styleSheets?has_content> diff --git a/webpos/template/search/CustomerAddress.ftl b/webpos/template/search/CustomerAddress.ftl index f07af82d7..2aa38d9c3 100644 --- a/webpos/template/search/CustomerAddress.ftl +++ b/webpos/template/search/CustomerAddress.ftl @@ -116,6 +116,6 @@ under the License. </div> </div> </div> -<script type="application/javascript"> +<script type="text/javascript"> customerAddressSelected(); </script> diff --git a/webpos/template/search/SearchParties.ftl b/webpos/template/search/SearchParties.ftl index 70778ad8a..f62a6df95 100644 --- a/webpos/template/search/SearchParties.ftl +++ b/webpos/template/search/SearchParties.ftl @@ -29,6 +29,6 @@ under the License. <input type="submit" value="${uiLabelMap.CommonSearch}" id="partySearchConfirm"/> <br/> </div> -<script type="application/javascript"> +<script type="text/javascript"> partyKeyEvents(); </script> \ No newline at end of file diff --git a/webpos/template/search/SearchProducts.ftl b/webpos/template/search/SearchProducts.ftl index ec6540e80..ba12cc12b 100644 --- a/webpos/template/search/SearchProducts.ftl +++ b/webpos/template/search/SearchProducts.ftl @@ -34,6 +34,6 @@ under the License. </div> </form> <br /> -<script type="application/javascript"> +<script type="text/javascript"> document.SearchProducts.productToSearch.focus(); </script> \ No newline at end of file diff --git a/webpos/template/shortcuts/Shortcuts.ftl b/webpos/template/shortcuts/Shortcuts.ftl index 73eb883f5..5307c5553 100644 --- a/webpos/template/shortcuts/Shortcuts.ftl +++ b/webpos/template/shortcuts/Shortcuts.ftl @@ -26,7 +26,7 @@ under the License. </td> </tr> </table> -<script type="application/javascript"> +<script type="text/javascript"> function activateHotKeys() { $(document).keydown(function(e){ switch (e.keyCode) {