From 7e04c0e841f99633240b115ae0242a8b7d42cf25 Mon Sep 17 00:00:00 2001 From: Miguel Rodríguez Pérez Date: Thu, 31 May 2012 12:06:08 +0200 Subject: Respect site default language from javascript elgg_echo The current implementation hardcoded 'en' as the site default language. This patch uses the site's configure default language as the default one. --- js/lib/languages.js | 2 -- 1 file changed, 2 deletions(-) (limited to 'js/lib') diff --git a/js/lib/languages.js b/js/lib/languages.js index bfa858364..a8ba72c31 100644 --- a/js/lib/languages.js +++ b/js/lib/languages.js @@ -4,8 +4,6 @@ */ elgg.provide('elgg.config.translations'); -elgg.config.language = 'en'; - /** * Analagous to the php version. Merges translations for a * given language into the current translations map. -- cgit v1.2.3 From b804cd8dd082a8f8c2e495bbb5e465564351db84 Mon Sep 17 00:00:00 2001 From: Matt Beckett Date: Wed, 27 Jun 2012 16:00:09 -0600 Subject: Fixes #4607 - Adds confirmation on widget deletion --- js/lib/ui.widgets.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'js/lib') 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 -- cgit v1.2.3