Author: jleroux
Date: Sun Aug 5 11:27:20 2012
New Revision: 1369555
URL: http://svn.apache.org/viewvc?rev=1369555&view=rev
Log:
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/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl
Modified:
ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl?rev=1369555&r1=1369554&r2=1369555&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
(original)
+++ ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
Sun Aug 5 11:27:20 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/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl?rev=1369555&r1=1369554&r2=1369555&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl
(original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/findOrders.ftl Sun Aug
5 11:27:20 2012
@@ -532,12 +532,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="<@ofbizUrl>massApproveOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderApproveOrder}</option>
<option
value="<@ofbizUrl>massHoldOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderHold}</option>
<option
value="<@ofbizUrl>massProcessOrders?hideFields=${requestParameters.hideFields?default("N")}${paramList}</@ofbizUrl>">${uiLabelMap.OrderProcessOrder}</option>
@@ -550,7 +550,7 @@ document.lookuporder.orderId.focus();
<option
value="<@ofbizUrl>massCreateFileForOrders?hideFields=${requestParameters.hideFields?default('N')}${paramList}</@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/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1369555&r1=1369554&r2=1369555&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Aug 5
11:27:20 2012
@@ -691,7 +691,7 @@ Parameter: lastViewName, String, optiona
});
</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>
Modified:
ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl?rev=1369555&r1=1369554&r2=1369555&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl
(original)
+++ ofbiz/trunk/specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl
Sun Aug 5 11:27:20 2012
@@ -20,9 +20,9 @@ under the License.
<div class="screenlet-title-bar">
<ul>
<li class="h3">
- <a id="billingAddressSelected"
href="javascript:void();">${uiLabelMap.WebPosBillingAddress}</a>
+ <a id="billingAddressSelected"
href="javascript:void(0);">${uiLabelMap.WebPosBillingAddress}</a>
- <a id="shippingAddressSelected"
href="javascript:void();">${uiLabelMap.WebPosShippingAddress}</a>
+ <a id="shippingAddressSelected"
href="javascript:void(0);">${uiLabelMap.WebPosShippingAddress}</a>
</li>
</ul>
<br class="clear" />
