You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2012/08/05 13:30:32 UTC
svn commit: r1369557 - in /ofbiz/branches/release11.04: ./
applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
applications/order/webapp/ordermgr/order/findOrders.ftl
framework/widget/templates/htmlFormMacroLibrary.ftl
Author: jleroux
Date: Sun Aug 5 11:30:32 2012
New Revision: 1369557
URL: http://svn.apache.org/viewvc?rev=1369557&view=rev
Log:
"Applied fix from trunk for revision: 1369555" (fixed a tree conflict by hand)
------------------------------------------------------------------------
r1369555 | jleroux | 2012-08-05 13:27:20 +0200 (dim., 05 août 2012) | 5 lines
Closes "correct "javascript:void();" to "javascript:void(0);" to make it syntax valid" reported by Leon https://issues.apache.org/jira/browse/OFBIZ-4970
Firefox will throw syntax error if you call javascript void function without parameter.
jleroux: I did not reproduce with FF14 on XP (modern browsers correct by themselves) but I agree it's a better syntax. So I changed all where it was needed.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release11.04/ (props changed)
ofbiz/branches/release11.04/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
Propchange: ofbiz/branches/release11.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1369555
Modified: ofbiz/branches/release11.04/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1369557&r1=1369556&r2=1369557&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (original)
+++ ofbiz/branches/release11.04/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl Sun Aug 5 11:30:32 2012
@@ -128,7 +128,7 @@ function runAction() {
<span class="label">${uiLabelMap.AccountingRunningTotalOutstanding} :</span>
<span class="label" id="showInvoiceRunningTotal"></span>
</div>
- <form name="listPurchaseInvoices" id="listPurchaseInvoices" method="post" action="javascript:void();">
+ <form name="listPurchaseInvoices" id="listPurchaseInvoices" method="post" action="javascript:void(0);">
<div align="right">
<!-- May add some more options in future like cancel selected invoices-->
<select name="serviceName" id="serviceName" onchange="javascript:setServiceName(this);">
Modified: ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/findOrders.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1369557&r1=1369556&r2=1369557&view=diff
==============================================================================
--- ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/findOrders.ftl (original)
+++ ofbiz/branches/release11.04/applications/order/webapp/ordermgr/order/findOrders.ftl Sun Aug 5 11:30:32 2012
@@ -520,12 +520,12 @@ document.lookuporder.orderId.focus();
</#list>
</#if>
</form>
- <form name="massOrderChangeForm" method="post" action="javascript:void();">
+ <form name="massOrderChangeForm" method="post" action="javascript:void(0);">
<div> </div>
<div align="right">
<input type="hidden" name="screenLocation" value="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF"/>
<select name="serviceName" onchange="javascript:setServiceName(this);">
- <option value="javascript:void();"> </option>
+ <option value="javascript:void(0);"> </option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.OrderHold}</option>
<option value="<@o...@ofbizUrl>">${uiLabelMap.OrderProcessOrder}</option>
@@ -538,7 +538,7 @@ document.lookuporder.orderId.focus();
<option value="<@o...@ofbizUrl>">${uiLabelMap.ContentCreateFile}</option>
</select>
<select name="printerName">
- <option value="javascript:void();"> </option>
+ <option value="javascript:void(0);"> </option>
<#list printers as printer>
<option value="${printer}">${printer}</option>
</#list>
Modified: ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1369557&r1=1369556&r2=1369557&view=diff
==============================================================================
--- ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release11.04/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Aug 5 11:30:32 2012
@@ -611,7 +611,7 @@ ${item.description}</span>
});
</script>
</#if>
-<#if readonly?has_content && readonly><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void();" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if>
+<#if readonly?has_content && readonly><a id="${id}_clear" style="background:none;margin-left:5px;margin-right:15px;" class="clearField" href="javascript:void(0);" onclick="javascript:document.${formName}.${name}.value='';<#if descriptionFieldName?has_content>document.${formName}.${descriptionFieldName}.value='';</#if>">${clearText}</a></#if>
</span>
<#if ajaxEnabled?has_content && ajaxEnabled && (presentation?has_content && presentation == "window")>
<#if ajaxUrl?index_of("_LAST_VIEW_NAME_") < 0>