dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #08538
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 2066: Removed unused javascript
------------------------------------------------------------
revno: 2066
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2010-11-15 19:43:30 +0100
message:
Removed unused javascript
removed:
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/order.js
modified:
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js
dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.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/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java 2010-11-15 16:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/DefaultSelectedStateManager.java 2010-11-15 18:43:30 +0000
@@ -119,13 +119,6 @@
{
return selectionManager.getSelectedOrganisationUnit();
}
-
- public void clear()
- {
- clearSelectedDataSet();
- clearSelectedPeriod();
- selectionManager.clearSelectedOrganisationUnits();
- }
// -------------------------------------------------------------------------
// DataSet
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java 2010-11-15 16:58:13 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/java/org/hisp/dhis/de/state/SelectedStateManager.java 2010-11-15 18:43:30 +0000
@@ -39,8 +39,6 @@
*/
public interface SelectedStateManager
{
- void clear();
-
// -------------------------------------------------------------------------
// OrganisationUnit
// -------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js 2010-10-29 14:20:23 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/general.js 2010-11-15 18:43:30 +0000
@@ -1,7 +1,5 @@
// -----------------------------------------------------------------------------
-// $Id: general.js 4948 2008-04-21 06:11:33Z leifas $
-// -----------------------------------------------------------------------------
// Selection
// -----------------------------------------------------------------------------
@@ -12,56 +10,6 @@
selection.setListenerFunction( organisationUnitSelected );
-function changeOrder()
-{
- window.open( 'getDataElementOrder.action', '_blank', 'width=700,height=500,scrollbars=yes' );
-}
-
-// -----------------------------------------------------------------------------
-// Comments
-// -----------------------------------------------------------------------------
-
-function commentSelected( dataElementId, optionComboId )
-{
- var commentSelector = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comments' );
- var commentField = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comment' );
-
- var value = commentSelector.options[commentSelector.selectedIndex].value;
-
- if ( value == 'custom' )
- {
- commentSelector.style.display = 'none';
- commentField.style.display = 'inline';
-
- commentField.select();
- commentField.focus();
- }
- else
- {
- commentField.value = value;
-
- saveComment( dataElementId, optionComboId, value );
- }
-}
-
-function commentLeft( dataElementId, optionComboId )
-{
- var commentField = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comment' );
- var commentSelector = document.getElementById( 'value[' + dataElementId + ':' + optionComboId + '].comments' );
-
- saveComment( dataElementId, optionComboId, commentField.value );
-
- var value = commentField.value;
-
- if ( value == '' )
- {
- commentField.style.display = 'none';
- commentSelector.style.display = 'inline';
-
- commentSelector.selectedIndex = 0;
- }
-}
-
// -----------------------------------------------------------------------------
// Save
// -----------------------------------------------------------------------------
=== modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js 2010-10-29 14:20:23 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/multidimensional.js 2010-11-15 18:43:30 +0000
@@ -1,7 +1,5 @@
// -----------------------------------------------------------------------------
-// $Id: general.js 3420 2007-06-29 16:28:29Z hanssto $
-// -----------------------------------------------------------------------------
// Selection
// -----------------------------------------------------------------------------
@@ -12,57 +10,6 @@
selection.setListenerFunction( organisationUnitSelected );
-function changeOrder()
-{
- window.open( 'getDataElementOrder.action', '_blank', 'width=700,height=500,scrollbars=yes' );
-}
-
-// -----------------------------------------------------------------------------
-// Comments
-// -----------------------------------------------------------------------------
-
-function commentSelected( dataElementId, optionComboId )
-{
- var commentSelector = byId( 'value[' + dataElementId + ':' + optionComboId + '].comments' );
- var commentField = byId( 'value[' + dataElementId + ':' + optionComboId + '].comment' );
- var value = commentSelector.options[commentSelector.selectedIndex].value;
-
- if ( value == 'custom' )
- {
- commentSelector.style.display = 'none';
- commentField.style.css = 'text';
- commentField.style.display = 'inline';
-
- commentField.select();
- commentField.focus();
- }
- else
- {
- commentField.value = value;
-
- saveComment( dataElementId, optionComboId, value );
- }
-}
-
-function commentLeft( dataElementId, optionComboId )
-{
- var commentField = byId( 'value[' + dataElementId + ':' + optionComboId + '].comment' );
- var commentSelector = byId( 'value[' + dataElementId + ':' + optionComboId + '].comments' );
-
- saveComment( dataElementId, optionComboId, commentField.value );
-
- var value = commentField.value;
-
- if ( value == '' )
- {
- commentField.style.display = 'none';
- commentSelector.style.css = 'combobox';
- commentSelector.style.display = 'inline';
-
- commentSelector.selectedIndex = 0;
- }
-}
-
// -----------------------------------------------------------------------------
// Save
// -----------------------------------------------------------------------------
=== removed file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/order.js'
--- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/order.js 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/order.js 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
-
-function closeWindow()
-{
- var selectForm = window.opener.location.href = 'select.action';
-
- window.close();
-}
