You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2014/09/20 13:17:27 UTC
svn commit: r1626420 -
/ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl
Author: ashish
Date: Sat Sep 20 11:17:26 2014
New Revision: 1626420
URL: http://svn.apache.org/r1626420
Log:
Applied bug fix from trunk r1626419.
Applied bug fix from jira issue - OFBIZ-5773 - <@htmlTemplate.renderDateTimeField> icon buttons disappear on some pages after refresh.
Thanks Akash Jain for the contribution.
Modified:
ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1626420&r1=1626419&r2=1626420&view=diff
==============================================================================
--- ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/release13.07/framework/widget/templates/htmlFormMacroLibrary.ftl Sat Sep 20 11:17:26 2014
@@ -130,7 +130,7 @@ under the License.
initDate = initDate.substring(0, initDate.indexOf('.'));
}
var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
- var dateObj = Date.parseExact(initDate, ofbizTime);
+ var dateObj = Date.parse(initDate, ofbizTime);
var formatedObj = dateObj.toString(dateFormat);
jQuery("#${id}_i18n").val(formatedObj);
}
@@ -139,7 +139,7 @@ under the License.
var ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";
var newValue = ""
if (this.value != "") {
- var dateObj = Date.parseExact(this.value, ofbizTime);
+ var dateObj = Date.parse(this.value, ofbizTime);
var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>;
newValue = dateObj.toString(dateFormat);
}
@@ -148,7 +148,7 @@ under the License.
jQuery("#${id}_i18n").change(function() {
var dateFormat = Date.CultureInfo.formatPatterns.shortDate<#if shortDateInput?exists && !shortDateInput> + " " + Date.CultureInfo.formatPatterns.longTime</#if>,
newValue = "",
- dateObj = Date.parseExact(this.value, dateFormat),
+ dateObj = Date.parse(this.value, dateFormat),
ofbizTime;
if (this.value != "" && dateObj !== null) {
ofbizTime = "<#if shortDateInput?exists && shortDateInput>yyyy-MM-dd<#else>yyyy-MM-dd HH:mm:ss</#if>";