Changeset 761 for branches

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.

Location:

branches/features/taskProcedureRework

Files:

• application.properties (modified) (2 diffs)
• grails-app/conf/Config.groovy (modified) (1 diff)
• grails-app/views/layouts/main.gsp (modified) (1 diff)
• grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp (modified) (2 diffs)
• grails-app/views/taskProcedureDetailed/create.gsp (modified) (1 diff)
• web-app/js/jquery.js (added)

branches/features/taskProcedureRework/application.properties

@@ -1 +1 @@
 #Grails Metadata file
-#Wed Jan 26 04:01:20 EST 2011
+#Thu Jan 27 17:24:52 EST 2011
 app.grails.version=1.2.2
 app.name=gnuMims
@@ -13 +13 @@
 plugins.hibernate=1.2.2
 plugins.jasper=0.9.7
-plugins.jquery=1.4.4.1
 plugins.navigation=1.1.1
 plugins.quartz=0.4.2

branches/features/taskProcedureRework/grails-app/conf/Config.groovy

@@ -48 +48 @@
 // packages to include in Spring bean scanning
 grails.spring.bean.packages = []
-
-grails.views.javascript.library="jquery"
 
 /**

branches/features/taskProcedureRework/grails-app/views/layouts/main.gsp

@@ -5 +5 @@
         <link rel="stylesheet" href="${resource(dir:'css',file:'main.css')}" />
         <link rel="shortcut icon" href="${resource(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" />
+        <g:javascript library="jquery" />
         <g:javascript library="prototype/prototype" />
         <g:javascript library="prototype/effects" />

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>

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

@@ -6 +6 @@
         <meta name="layout" content="main" />
         <title>Create TaskProcedure</title>
-        <g:javascript library="jquery" plugin="jquery"/>
         <nav:resources override="true"/>
     </head>