OFBiz › OFBiz - Commits

svn commit: r1813610 - in /ofbiz/ofbiz-framework/trunk/themes/common: template/macro/HtmlFormMacroLibrary.ftl webapp/common/js/util/OfbizUtil.js widget/Theme.xml

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

Deepak Dixit-5

svn commit: r1813610 - in /ofbiz/ofbiz-framework/trunk/themes/common: template/macro/HtmlFormMacroLibrary.ftl webapp/common/js/util/OfbizUtil.js widget/Theme.xml

Author: deepak
Date: Sat Oct 28 11:35:42 2017
New Revision: 1813610

URL: http://svn.apache.org/viewvc?rev=1813610&view=rev
Log:
Reverted 1813609, found some improvements, so reverted commit

Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js
ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml

Modified: ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl?rev=1813610&r1=1813609&r2=1813610&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/template/macro/HtmlFormMacroLibrary.ftl Sat Oct 28 11:35:42 2017
@@ -50,7 +50,9 @@ under the License.

<#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled mask tabindex readonly placeholder="" delegatorName="default">
<#if mask?has_content>
- <#local className = className + " maskIt">
+ <script type="text/javascript">
+ jQuery(function($){jQuery("#${id}").mask("${mask}");});
+ </script>
</#if>
<input type="text" name="${name?default("")?html}"<#t/>
<@renderClass className alert />
@@ -59,7 +61,6 @@ under the License.
<#if maxlength?has_content> maxlength="${maxlength}"</#if><#rt/>
<#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/>
<#if readonly?has_content && readonly> readonly="readonly"</#if><#rt/>
- <#if mask?has_content> data-mask="${mask}"</#if><#rt/>
<#if id?has_content> id="${id}"</#if><#rt/>
<#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/>
<#if clientAutocomplete?has_content && clientAutocomplete=="false"> autocomplete="off"</#if><#rt/>
@@ -75,9 +76,6 @@ under the License.
</#macro>

<#macro renderTextareaField name className alert cols rows maxlength id readonly value visualEditorEnable buttons tabindex language="">
- <#if visualEditorEnable?has_content>
- <#local className = className + " enableVisualEditor">
- </#if>
<textarea name="${name}"<#t/>
<@renderClass className alert />
<#if cols?has_content> cols="${cols}"</#if><#rt/>

Modified: ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js?rev=1813610&r1=1813609&r2=1813610&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/js/util/OfbizUtil.js Sat Oct 28 11:35:42 2017
@@ -49,25 +49,6 @@ function bindObservers(bind_element) {
if (jQuery(".selectAll").is(":checked")) {
jQuery(".selectAll").removeAttr("checked").trigger("click");
}
- jQuery(bind_element).find(".maskIt").each(function(){
- var element = jQuery(this);
- var mask = element.data('mask');
- element.mask(mask);
- });
- jQuery(bind_element).find(".enableVisualEditor").each(function(){
- var element = jQuery(this);
- var toolbar = element.data('toolbar');
- var language = element.data('language');
- var opts = {
- cssClass : 'el-rte',
- lang : language,
- toolbar : toolbar,
- doctype : '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">', //'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">',
- cssfiles : ['/images/jquery/plugins/elrte-1.3/css/elrte-inner.css']
- }
- element.elrte(opts);
- });
-
}

/* SelectAll: This utility can be used when we need to use parent and child box combination over any page. Here is the list of tasks it will do:

Modified: ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml?rev=1813610&r1=1813609&r2=1813610&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml (original)
+++ ofbiz/ofbiz-framework/trunk/themes/common/widget/Theme.xml Sat Oct 28 11:35:42 2017
@@ -76,9 +76,7 @@ under the License.
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/plugins/jsTree/jquery.jstree.js"/>
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/jquery/ui/js/jquery.cookie-1.4.0.js"/>
<property name="VT_HDR_JAVASCRIPT['add']" value="/common/js/plugins/date/FromThruDateCheck.js"/>
- <property name="VT_HDR_JAVASCRIPT['add']" value="/images/jquery/plugins/elrte-1.3/js/elrte.min.js"/>
- 
- <property name="VT_STYLESHEET['add']" value="/images/jquery/plugins/elrte-1.3/css/elrte.min.css"/>
+ 
</theme-properties>

<templates>