aboutsummaryrefslogtreecommitdiff
path: root/js/lib
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2012-07-11 21:19:14 +0200
committerSem <sembrestels@riseup.net>2012-07-11 21:19:14 +0200
commitb83574ae1b8ada2bb9c2247492806473df920259 (patch)
tree30f9010da3cab12bda4921f079cfe86fcef2e7a4 /js/lib
parent46bd104bd523c08ff2f6bc0342be9ae1251259e8 (diff)
parent4d42fd0263948eee4a7c7a26ceca0647c01cce32 (diff)
downloadelgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.gz
elgg-b83574ae1b8ada2bb9c2247492806473df920259.tar.bz2
Merge tag '1.8.8' of git://github.com/Elgg/Elgg into lorea-preprod
Elgg 1.8.8 release Conflicts: js/lib/languages.js
Diffstat (limited to 'js/lib')
-rw-r--r--js/lib/languages.js4
-rw-r--r--js/lib/ui.widgets.js5
2 files changed, 6 insertions, 3 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js
index 439df3e27..a8ba72c31 100644
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -4,8 +4,6 @@
*/
elgg.provide('elgg.config.translations');
-elgg.config.language = "<?php echo elgg_get_config('language'); ?>" || 'en';
-
/**
* Analagous to the php version. Merges translations for a
* given language into the current translations map.
@@ -94,4 +92,4 @@ elgg.config.translations.init = function() {
elgg.reload_all_translations();
};
-elgg.register_hook_handler('boot', 'system', elgg.config.translations.init);
+elgg.register_hook_handler('boot', 'system', elgg.config.translations.init); \ No newline at end of file
diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index d897564b4..b7d4b2fe4 100644
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -107,6 +107,11 @@ elgg.ui.widgets.move = function(event, ui) {
* @return void
*/
elgg.ui.widgets.remove = function(event) {
+ if (confirm(elgg.echo('deleteconfirm')) == false) {
+ event.preventDefault();
+ return;
+ }
+
var $widget = $(this).closest('.elgg-module-widget');
// if widget type is single instance type, enable the add buton