diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2012-12-14 14:21:32 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2012-12-14 14:21:32 -0200 |
| commit | f9ca24a9407f294a9bb7305180f9f8e740ab6ec9 (patch) | |
| tree | 4c9a263b7fd770151e40940d6ddaa89d27e5053d /js | |
| parent | e15f0fce6940ee999cf5d6405ad1b16d00c38e4b (diff) | |
| parent | 3ed289b03fa3d851fd7fffbc0441ebc9b5e98310 (diff) | |
| download | elgg-f9ca24a9407f294a9bb7305180f9f8e740ab6ec9.tar.gz elgg-f9ca24a9407f294a9bb7305180f9f8e740ab6ec9.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/lorea/elgg into saravea
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])); |