Changeset 761 for branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp

Timestamp:

Jan 27, 2011, 6:55:48 PM (14 years ago)

Author:

gav

Message:

JQuery plugin uninstalled, including jQuery-1.4.4.min.js directly.
This leave Grails taglibs to use prototype.
Including jQuery before other javascript libs prevents conflicts and allows jQuery plugins and code to use 'jQuery' instead of '$' variable.

File:

• branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp (modified) (2 diffs)

branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp

@@ -7 +7 @@
         var templateHtml = "<div id='" + htmlId + "' name='" + htmlId + "'>\n";
         templateHtml += "<input type='text' id='expandableMaintenanceActionList[" + childCount + "].description' name='expandableMaintenanceActionList[" + childCount + "].description' />\n";
-        templateHtml += "<span onClick='$(\"#" + htmlId + "\").remove();'><img src='" + deleteIcon + "' /></span>\n";
+        templateHtml += "<span onClick='jQuery(\"#" + htmlId + "\").remove();'><img src='" + deleteIcon + "' /></span>\n";
         templateHtml += "</div>\n";
-        $("#childList").append(templateHtml);
+        jQuery("#childList").append(templateHtml);
         childCount++;
     }
@@ -20 +20 @@
             <g:textField name='expandableMaintenanceActionList[${i}].description' value='${maintenanceAction.description}'/>
             <input type="hidden" name='expandableMaintenanceActionList[${i}].deleted' id='expandableMaintenanceActionList[${i}].deleted' value='false'/>
-            <span onClick="$('#expandableMaintenanceActionList\\[${i}\\]\\.deleted').val('true'); $('#maintenanceAction${i}').hide()"><img src="${resource(dir:'images/skin', file:'database_delete.png')}" /></span>
+            <span onClick="jQuery('#expandableMaintenanceActionList\\[${i}\\]\\.deleted').val('true'); jQuery('#maintenanceAction${i}').hide()"><img src="${resource(dir:'images/skin', file:'database_delete.png')}" /></span>
         </div>
     </g:each>