Changeset 761


Ignore:
Timestamp:
Jan 27, 2011, 6:55:48 PM (9 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:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • branches/features/taskProcedureRework/application.properties

    r759 r761  
    11#Grails Metadata file
    2 #Wed Jan 26 04:01:20 EST 2011
     2#Thu Jan 27 17:24:52 EST 2011
    33app.grails.version=1.2.2
    44app.name=gnuMims
     
    1313plugins.hibernate=1.2.2
    1414plugins.jasper=0.9.7
    15 plugins.jquery=1.4.4.1
    1615plugins.navigation=1.1.1
    1716plugins.quartz=0.4.2
  • branches/features/taskProcedureRework/grails-app/conf/Config.groovy

    r759 r761  
    4848// packages to include in Spring bean scanning
    4949grails.spring.bean.packages = []
    50 
    51 grails.views.javascript.library="jquery"
    5250
    5351/**
  • branches/features/taskProcedureRework/grails-app/views/layouts/main.gsp

    r711 r761  
    55        <link rel="stylesheet" href="${resource(dir:'css',file:'main.css')}" />
    66        <link rel="shortcut icon" href="${resource(dir:'images',file:'gnuMimsIcon.ico')}" type="image/x-icon" />
     7        <g:javascript library="jquery" />
    78        <g:javascript library="prototype/prototype" />
    89        <g:javascript library="prototype/effects" />
  • branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/_maintenanceActions.gsp

    r760 r761  
    77        var templateHtml = "<div id='" + htmlId + "' name='" + htmlId + "'>\n";
    88        templateHtml += "<input type='text' id='expandableMaintenanceActionList[" + childCount + "].description' name='expandableMaintenanceActionList[" + childCount + "].description' />\n";
    9         templateHtml += "<span onClick='$(\"#" + htmlId + "\").remove();'><img src='" + deleteIcon + "' /></span>\n";
     9        templateHtml += "<span onClick='jQuery(\"#" + htmlId + "\").remove();'><img src='" + deleteIcon + "' /></span>\n";
    1010        templateHtml += "</div>\n";
    11         $("#childList").append(templateHtml);
     11        jQuery("#childList").append(templateHtml);
    1212        childCount++;
    1313    }
     
    2020            <g:textField name='expandableMaintenanceActionList[${i}].description' value='${maintenanceAction.description}'/>
    2121            <input type="hidden" name='expandableMaintenanceActionList[${i}].deleted' id='expandableMaintenanceActionList[${i}].deleted' value='false'/>
    22             <span onClick="$('#expandableMaintenanceActionList\\[${i}\\]\\.deleted').val('true'); $('#maintenanceAction${i}').hide()"><img src="${resource(dir:'images/skin', file:'database_delete.png')}" /></span>
     22            <span onClick="jQuery('#expandableMaintenanceActionList\\[${i}\\]\\.deleted').val('true'); jQuery('#maintenanceAction${i}').hide()"><img src="${resource(dir:'images/skin', file:'database_delete.png')}" /></span>
    2323        </div>
    2424    </g:each>
  • branches/features/taskProcedureRework/grails-app/views/taskProcedureDetailed/create.gsp

    r760 r761  
    66        <meta name="layout" content="main" />
    77        <title>Create TaskProcedure</title>
    8         <g:javascript library="jquery" plugin="jquery"/>
    98        <nav:resources override="true"/>
    109    </head>
Note: See TracChangeset for help on using the changeset viewer.