Changeset 457 for trunk

Timestamp:

May 25, 2010, 11:05:52 AM (13 years ago)

Author:

duh

Message:

• fixed improved tooltip functionality

Location:

trunk

Files:

• grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy (modified) (2 diffs)
• web-app/js/wizard.js (modified) (1 diff)

trunk/grails-app/taglib/dbnp/studycapturing/WizardTagLib.groovy

@@ -761 +761 @@
                 def inputElement= null
 
-                String helpText
-
                 // got a template?
                 if (template) {
                         // render template fields
                         entity.giveFields().each() {
-                                def fieldValue = entity.getFieldValue(it.name)
-                                helpText = (it.comment && renderType == 'element') ? it.comment : ''
+                                def fieldValue  = entity.getFieldValue(it.name)
+                                def helpText    = (it.comment && renderType == 'element') ? it.comment : ''
 
                                 // output column opening element?
@@ -868 +866 @@
                                 }
 
-                                // Render comment, if any
-                                //if (it.comment) {
-                                //      out << {"$helpText"}
-                                //}
-
                                 // output column closing element?
                                 if (renderType == 'column') {

trunk/web-app/js/wizard.js

@@ -104 +104 @@
     $('div#wizard').find('div.helpIcon').each(function() {
         helpIcon = $(this);
-        helpContent = helpIcon.parent().parent().find('div.helpContent');
+        helpContent = helpIcon.parent().find('div.helpContent');
+        if (!helpContent.html()) {
+            helpContent = helpIcon.parent().parent().find('div.helpContent');
+        }
 
         // handle special content