aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Sroka <srokap@gmail.com>2012-11-26 21:16:04 +0100
committerPaweł Sroka <srokap@gmail.com>2012-11-26 21:16:04 +0100
commit6c4e75b19ddadaadac9bc78423a837045fa90b15 (patch)
tree990c9b219f544f59722476758117d5971eeee94a
parent19c6da97ed0178592b9041946f3463f9008dd7ea (diff)
downloadelgg-6c4e75b19ddadaadac9bc78423a837045fa90b15.tar.gz
elgg-6c4e75b19ddadaadac9bc78423a837045fa90b15.tar.bz2
Fixes #4927 - Removes obsolete commas in JS code for IE7 compatibility
-rw-r--r--js/lib/ui.js2
-rw-r--r--js/tests/ElggLibTest.js2
-rw-r--r--views/default/js/walled_garden.php4
3 files changed, 4 insertions, 4 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]));
diff --git a/views/default/js/walled_garden.php b/views/default/js/walled_garden.php
index 13ec83c04..99d050505 100644
--- a/views/default/js/walled_garden.php
+++ b/views/default/js/walled_garden.php
@@ -47,10 +47,10 @@ elgg.walled_garden.load = function(view) {
$(id).find('input.elgg-button-submit').after('<?php echo $cancel_button; ?>');
$('#elgg-walledgarden-login').fadeToggle();
$(id).fadeToggle();
- },
+ }
});
event.preventDefault();
- };
+ };
};
elgg.register_hook_handler('init', 'system', elgg.walled_garden.init); \ No newline at end of file