dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16737
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-09-17 13:14:47 +0200
message:
  Data entry. Removed deprecated triggers.
modified:
  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/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-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	2014-09-10 03:45:33 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js	2014-09-17 11:14:47 +0000
@@ -309,14 +309,6 @@
     return false;
 }
 
-/**
- * Convenience method which can be used in custom form scripts. Do not change.
- */
-function onValueSave( fn )
-{
-	$( 'body' ).off( EVENT_VALUE_SAVED ).on( EVENT_VALUE_SAVED, fn );
-}
-
 // -----------------------------------------------------------------------------
 // Saver objects
 // -----------------------------------------------------------------------------
@@ -369,8 +361,6 @@
     	dhis2.de.storageManager.clearDataValueJSON( dataValue );
         markValue( fieldId, resultColor );
         $( document ).trigger( dhis2.de.event.dataValueSaved, dataValue );
-        
-        $( 'body' ).trigger( EVENT_VALUE_SAVED, dataValue ); // Deprecated
     }
 
     function handleError( xhr, textStatus, errorThrown )

=== 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	2014-09-12 09:40:25 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js	2014-09-17 11:14:47 +0000
@@ -123,9 +123,6 @@
     $( document ).off( event ).on( event, fn );
 }
 
-var EVENT_FORM_LOADED = "dhis-web-dataentry-form-loaded"; // Deprecated
-var EVENT_VALUE_SAVED = 'dhis-web-dataentry-value-saved'; // Deprecated
-
 var DAO = DAO || {};
 
 function getCurrentOrganisationUnit() 
@@ -1529,8 +1526,6 @@
     hideLoader();
     
     $( document ).trigger( dhis2.de.event.formReady );
-    
-    $( 'body' ).trigger( EVENT_FORM_LOADED ); // Deprecated
 }
 
 function valueFocus( e )
@@ -1615,14 +1610,6 @@
     }
 }
 
-/**
- * Convenience method which can be used in custom form scripts. Do not change.
- */
-function onFormLoad( fn )
-{
-	$( 'body' ).off( EVENT_FORM_LOADED ).on( EVENT_FORM_LOADED, fn );
-}
-
 // -----------------------------------------------------------------------------
 // Data completeness
 // -----------------------------------------------------------------------------