Author: bibryam
Date: Sun May 2 17:44:01 2010
New Revision: 940274
URL: http://svn.apache.org/viewvc?rev=940274&view=rev
Log:
Moved autocompleter indicator creation to javascript.
Modified:
ofbiz/trunk/framework/images/webapp/images/selectall.js
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=940274&r1=940273&r2=940274&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/selectall.js Sun May 2 17:44:01
2010
@@ -335,6 +335,7 @@ function ajaxAutoCompleter(areaCsvString
for (var i = 0; i < numAreas * 3; i = i + 3) {
var optionsDivId = areaArray[i] + "_autoCompleterOptions";
var indicatorId = areaArray[i] + "_indicator";
+ $(areaArray[i]).next().insert('<span class="indicator" style="display:
none"' + 'id=' + indicatorId + '><img src="/images/ajax-loader.gif"
alt=""/></span>');
$(areaArray[i]).insert({after: '<div class="autocomplete"' + 'id=' +
optionsDivId + '></div>'});
new Ajax.Autocompleter($(areaArray[i]), optionsDivId, areaArray[i +
1], {parameters: areaArray[i + 2], indicator: indicatorId, afterUpdateElement :
setSelection});
if (showDescription) {
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=940274&r1=940273&r2=940274&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun May 2
17:44:01 2010
@@ -448,9 +448,7 @@ ${item.description}</span>
,document.${formName}.${item}.value<#rt>
</#list>
</#if>
-);">
-<#if ajaxEnabled?has_content && ajaxEnabled><span id="${id}_indicator"
style="display: none" class="indicator"><img src="/images/ajax-loader.gif"
alt=""/></span></#if>
-</a><#rt>
+);"></a><#rt>
<#if disabled?has_content && disabled><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>
</span>
<#if ajaxEnabled?has_content && ajaxEnabled>
