svn commit: r1055109 - in /ofbiz/trunk/framework/images/webapp/images: fieldlookup.js selectall.js

Author: jleroux
Date: Tue Jan  4 17:21:51 2011
New Revision: 1055109

URL: http://svn.apache.org/viewvc?rev=1055109&view=rev
Log:
Still missed something, it's clean now.

Modified:
    ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
    ofbiz/trunk/framework/images/webapp/images/selectall.js

Modified: ofbiz/trunk/framework/images/webapp/images/fieldlookup.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/fieldlookup.js?rev=1055109&r1=1055108&r2=1055109&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/fieldlookup.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/fieldlookup.js Tue Jan  4 17:21:51 2011
@@ -754,7 +754,7 @@ lookupDescriptionLoaded.prototype.update
     data: this.allParams,
     async: false,
     success: function(result){
-      // This would be far more reliable if we would remove the widget boundaries in LookupDecorator using widgetVerbose in context
+      // This would be far more reliable if we would remove the widget boundaries in LookupDecorator using widgetVerbose in context :/
       if (result.split("ajaxAutocompleteOptions.ftl -->")[1]) {
         setLookDescription(_fieldId, result.split("ajaxAutocompleteOptions.ftl -->")[1].trim().split("<!--")[0].trim(), "", "");
       }

Modified: ofbiz/trunk/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/selectall.js?rev=1055109&r1=1055108&r2=1055109&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/trunk/framework/images/webapp/images/selectall.js Tue Jan  4 17:21:51 2011
@@ -453,16 +453,16 @@ function setLookDescription(textFieldId,
         if (lookupWrapperEl.length) {
             if (start == -1) {
                 var start = description.indexOf(' ');
-                if (start != -1) {
+                if (start != -1 && description.indexOf('<script type="text/javascript">') == -1) {
                     description = description.substring(start);
                 }
-                tooltipElement = jQuery("#" + textFieldId + '_lookupDescription')
-                if (!tooltipElement.length) {
-                    tooltipElement = jQuery("<span id='" + textFieldId + "_lookupDescription' class='tooltip'></span>");
-                }
-                tooltipElement.html(description);
-                lookupWrapperEl.append(tooltipElement);
             }
+            tooltipElement = jQuery("#" + textFieldId + '_lookupDescription')
+            if (!tooltipElement.length) {
+                tooltipElement = jQuery("<span id='" + textFieldId + "_lookupDescription' class='tooltip'></span>");
+            }
+            tooltipElement.html(description);
+            lookupWrapperEl.append(tooltipElement);
         }
     }
 }