dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #13431
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 4302: Minor fix
------------------------------------------------------------
revno: 4302
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2011-08-15 16:08:38 +0200
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2011-08-12 13:23:47 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm 2011-08-15 14:08:38 +0000
@@ -14,7 +14,6 @@
css/widgets.css
../dhis-web-dataentry/style/dhis-web-dataentry.css
javascripts/jQuery/jquery-1.6.1.min.js
-javascripts/jQuery/ui/jquery-ui-1.8.12.custom.min.js
javascripts/jQuery/jquery.metadata.js
javascripts/jQuery/jquery.glob.js
javascripts/jQuery/jquery.date.js
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js 2011-04-11 13:46:07 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.ext.js 2011-08-15 14:08:38 +0000
@@ -550,7 +550,11 @@
// Set Message for validatior
// --------------------------------------------------------------------------
jQuery(document).ready( function(){
- jQuery.validator.setMessages( validationMessage );
+ if ( validationMessage != "undefined" )
+ {
+ jQuery.validator.setMessages( validationMessage );
+ }
+
jQuery.validator.setDefaults({
debug: false,
success: "valid"
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-08-15 13:48:42 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-08-15 14:08:38 +0000
@@ -54,7 +54,7 @@
{
selection.setListenerFunction( organisationUnitSelected );
- $( "#orgUnitTree" ).bind( "ouwtLoaded", function() {
+ $( '#orgUnitTree' ).bind( 'ouwtLoaded', function() {
updateForms();
} );
} );