diff options
| author | Steve Clay <steve@mrclay.org> | 2012-11-26 16:28:52 -0500 |
|---|---|---|
| committer | Steve Clay <steve@mrclay.org> | 2012-11-26 16:28:52 -0500 |
| commit | de8c85e5d53cfcc7b9ae52ce2f481cff499ae915 (patch) | |
| tree | 12240e18b9f2df7ec97e05f32c46d2a89b39824d /js | |
| parent | 19c6da97ed0178592b9041946f3463f9008dd7ea (diff) | |
| parent | 1965e4d3642e3e8bcf53c83a85aa79765541a50e (diff) | |
| download | elgg-de8c85e5d53cfcc7b9ae52ce2f481cff499ae915.tar.gz elgg-de8c85e5d53cfcc7b9ae52ce2f481cff499ae915.tar.bz2 | |
Merge branch 'pr-445' into 1.8
Diffstat (limited to 'js')
| -rw-r--r-- | js/lib/ui.js | 2 | ||||
| -rw-r--r-- | js/tests/ElggLibTest.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/ui.js b/js/lib/ui.js index 616e71d54..2a4d269d6 100644 --- a/js/lib/ui.js +++ b/js/lib/ui.js @@ -283,7 +283,7 @@ elgg.ui.initDatePicker = function() { dataType: "script", cache: true, success: loadDatePicker, - error: loadDatePicker, // english language is already loaded. + error: loadDatePicker // english language is already loaded. }); } }; diff --git a/js/tests/ElggLibTest.js b/js/tests/ElggLibTest.js index a29ebf743..2a676e22a 100644 --- a/js/tests/ElggLibTest.js +++ b/js/tests/ElggLibTest.js @@ -99,7 +99,7 @@ ElggLibTest.prototype.testNormalizeUrl = function() { ['/mod/plugin/file.php', elgg.config.wwwroot + 'mod/plugin/file.php'], ['/mod/plugin/file.php?p=v&p2=v2', elgg.config.wwwroot + 'mod/plugin/file.php?p=v&p2=v2'], ['/rootfile.php', elgg.config.wwwroot + 'rootfile.php'], - ['/rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2'], + ['/rootfile.php?p=v&p2=v2', elgg.config.wwwroot + 'rootfile.php?p=v&p2=v2'] ].forEach(function(args) { assertEquals(args[1], elgg.normalize_url(args[0])); |