------------------------------------------------------------
revno: 4352
committer: Morten Olav Hansen <morte...@gmail.com>
branch nick: dhis2
timestamp: Thu 2011-08-18 14:01:44 +0200
message:
minor changes to js
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.ajax.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.comparator.js
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.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.ajax.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.ajax.js 2011-06-19 11:30:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.ajax.js 2011-08-18 12:01:44 +0000
@@ -50,12 +50,12 @@
target.append( '<option value="' + item.id + '">' + item.name + '</option>' );
} );
}
- }
+ };
this.loadAllDataElements = function( jQuerySelectionString )
{
this.loadDataElementsByGroup( '0', jQuerySelectionString );
- }
+ };
this.loadDataElementsByGroup = function( id, jQuerySelectionString )
{
@@ -88,7 +88,7 @@
target.append( '<option value="' + item.id + '">' + item.name + '</option>' );
} );
}
- }
+ };
this.loadIndicatorGroups = function( jQuerySelectionString )
{
@@ -115,12 +115,12 @@
target.append( '<option value="' + item.id + '">' + item.name + '</option>' );
} );
}
- }
+ };
this.loadAllIndicators = function( jQuerySelectionString )
{
this.loadIndicatorsByGroup( ALL_KEY, jQuerySelectionString );
- }
+ };
this.loadIndicatorsByGroup = function( id, jQuerySelectionString )
{
@@ -153,7 +153,7 @@
target.append( '<option value="' + item.id + '">' + item.name + '</option>' );
} );
}
- }
+ };
this.loadCategoryOptionComboByDE = function( id, jQuerySelectionString )
{
@@ -186,19 +186,19 @@
target.append( '<option value="' + item.id + '">' + item.name + '</option>' );
} );
}
- }
+ };
this.reloadOperands = function( currentpage )
{
this.params.currentPage = currentpage;
this.loadOperands( this.jQuerySelectionString, this.params );
- }
+ };
this.changeOperandsPageSize = function( pagesize )
{
this.params.pageSize = pagesize;
this.loadOperands( this.jQuerySelectionString, this.params );
- }
+ };
this.loadOperands = function( jQuerySelectionString, params )
{
@@ -230,7 +230,6 @@
{
var numberOfPages = json.paging.numberOfPages;
var currentPage = json.paging.currentPage;
- var baseLink = json.paging.baseLink;
var pageSize = json.paging.pageSize;
var startPage = json.paging.startPage;
@@ -273,7 +272,7 @@
jQuery( html ).insertAfter( target );
}
} );
- }
+ };
}
var dataDictionary = new DataDictionary();
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js 2011-08-16 13:48:25 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.availability.js 2011-08-18 12:01:44 +0000
@@ -83,7 +83,7 @@
// use 500ms for initial check
_availableTimeoutHandler = setTimeout( _checkAvailability, 500 );
-}
+};
/**
* Stop checking for availability.
@@ -91,4 +91,4 @@
dhis2.availability.stopAvailabilityCheck = function()
{
clearTimeout( dhis2.availability._availableTimeoutHandler );
-}
+};
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.comparator.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.comparator.js 2011-06-01 08:19:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.comparator.js 2011-08-18 12:01:44 +0000
@@ -42,7 +42,7 @@
}
return (a > b) ? 1 : -1;
-}
+};
/**
* Case sensitive compare of two jQuery objects (based on their innerHTML).
@@ -55,7 +55,7 @@
dhis2.comparator.htmlComparator = function( a, b )
{
return dhis2.comparator.defaultComparator( a.html(), b.html() );
-}
+};
/**
* Case insensitive compare of two jQuery objects (based on their innerHTML).
@@ -74,4 +74,4 @@
b = !!b ? b.toLowerCase() : b;
return dhis2.comparator.defaultComparator( a, b );
-}
+};
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2011-06-19 11:30:00 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/dhis2/dhis2.util.js 2011-08-18 12:01:44 +0000
@@ -49,7 +49,7 @@
}
return parent;
-}
+};
/**
* adds ':containsNoCase' to filtering.
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
