------------------------------------------------------------
revno: 4369
committer: Lars Helge Overland <[email protected]>
branch nick: dhis2
timestamp: Fri 2011-08-19 10:56:53 +0200
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.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/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-08-19 07:40:22 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-08-19 08:56:53 +0000
@@ -509,6 +509,8 @@
*/
function setHeaderMessage( message )
{
+ window.clearTimeout( headerMessageTimeout );
+
$( 'div#headerMessage' ).html( message );
if ( isHeaderMessageHidden() )
@@ -525,6 +527,8 @@
*/
function setHeaderWaitMessage( message )
{
+ window.clearTimeout( headerMessageTimeout );
+
$( 'div#headerMessage' ).html( message + " " + _loading_bar_html );
if ( isHeaderMessageHidden() )
@@ -540,7 +544,7 @@
{
setHeaderMessage( message );
- window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations
+ window.clearTimeout( headerMessageTimeout );
headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 8000 );
}
@@ -552,7 +556,7 @@
{
setHeaderWaitMessage( message );
- window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations
+ window.clearTimeout( headerMessageTimeout );
headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 8000 );
}
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-08-18 07:55:27 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-08-19 08:56:53 +0000
@@ -198,7 +198,7 @@
*/
function alertField( fieldId, alertMessage )
{
- $( fieldId ).css( fieldId, COLOR_YELLOW );
+ $( fieldId ).css( 'background-color', COLOR_YELLOW );
$( fieldId ).select();
$( fieldId ).focus();
window.alert( alertMessage );
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : [email protected]
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
