You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by nm...@apache.org on 2015/12/14 10:19:37 UTC
svn commit: r1719868 - in /ofbiz/trunk/framework/widget/templates:
htmlFormMacroLibrary.ftl htmlMenuMacroLibrary.ftl htmlScreenMacroLibrary.ftl
Author: nmalin
Date: Mon Dec 14 09:19:37 2015
New Revision: 1719868
URL: http://svn.apache.org/viewvc?rev=1719868&view=rev
Log:
Remove an over charge on js function getRequestData() use by layered-modal link call when two links are present on the same page. Related to OFBIZ-6768
Modified:
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl
ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1719868&r1=1719867&r2=1719868&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Dec 14 09:19:37 2015
@@ -876,7 +876,7 @@ Parameter: tabindex, String, optional -
<#if style?has_content>class="${style}"</#if>>
<#if description?has_content>${description}</#if></a>
<script type="text/javascript">
- function getRequestData () {
+ function ${uniqueItemName}_data () {
var data = {
<#--list parameterList as parameter>
"${parameter.name}": "${parameter.value}",
@@ -899,7 +899,7 @@ Parameter: tabindex, String, optional -
jQuery.ajax({
url: "${linkUrl}",
type: "POST",
- data: getRequestData(),
+ data: ${uniqueItemName}_data(),
success: function(data) {jQuery("#${uniqueItemName}").html(data);}
});
}
Modified: ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl?rev=1719868&r1=1719867&r2=1719868&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlMenuMacroLibrary.ftl Mon Dec 14 09:19:37 2015
@@ -60,7 +60,7 @@ under the License.
<#if style?has_content>class="${style}"</#if>>
<#if text?has_content>${text}</#if></a>
<script type="text/javascript">
- function getRequestData () {
+ function ${uniqueItemName}_data() {
var data = {
<#--list parameterList as parameter>
"${parameter.name}": "${parameter.value}",
@@ -83,7 +83,7 @@ under the License.
jQuery.ajax({
url: "${linkUrl}",
type: "POST",
- data: getRequestData(),
+ data: ${uniqueItemName}_data(),
success: function(data) {jQuery("#${uniqueItemName}").html(data);}
});
}
Modified: ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1719868&r1=1719867&r2=1719868&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlScreenMacroLibrary.ftl Mon Dec 14 09:19:37 2015
@@ -113,7 +113,7 @@ under the License.
<#if style?has_content>class="${style}"</#if>>
<#if text?has_content>${text}</#if></a>
<script type="text/javascript">
- function getRequestData () {
+ function ${uniqueItemName}_data() {
var data = {
<#list parameterList as parameter>
"${parameter.name}": "${parameter.value}",
@@ -137,7 +137,7 @@ under the License.
jQuery.ajax({
url: "${target}",
type: "POST",
- data: getRequestData(),
+ data: ${uniqueItemName}_data(),
success: function(data) {jQuery("#${uniqueItemName}").html(data);}
});
}