3 files changed, 21 insertions, 21 deletions
diff --git a/js/lib/languages.js b/js/lib/languages.js
index ae7ba63e2..bfa858364 100644
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -26,16 +26,22 @@ elgg.add_translation = function(lang, translations) {
 elgg.reload_all_translations = function(language) {
 	var lang = language || elgg.get_language();
 
-	elgg.getJSON('ajax/view/js/languages', {
-		data: {
-			language: lang
-		},
-		success: function(json) {
-			elgg.add_translation(lang, json);
-			elgg.config.languageReady = true;
-			elgg.initWhenReady();
-		}
-	});
+	var url, options;
+	if (elgg.config.simplecache_enabled) {
+		url = 'cache/js/default/languages/' + lang + '.' + elgg.config.lastcache + '.js';
+		options = {};
+	} else {
+		url = 'ajax/view/js/languages';
+		options = {data: {language: lang}};
+	}
+
+	options['success'] = function(json) {
+		elgg.add_translation(lang, json);
+		elgg.config.languageReady = true;
+		elgg.initWhenReady();
+	};
+
+	elgg.getJSON(url, options);
 };
 
 /**
diff --git a/js/lib/ui.userpicker.js b/js/lib/ui.userpicker.js
index 8287ba91c..7298da114 100644
--- a/js/lib/ui.userpicker.js
+++ b/js/lib/ui.userpicker.js
@@ -93,7 +93,7 @@ elgg.userpicker.viewUser = function(info) {
 	html += "<div class='elgg-image'>" + info.icon + "</div>";
 	html += "<div class='elgg-image-alt'>" + deleteLink + "</div>";
 	html += "<div class='elgg-body'>" + info.name + "</div>";
-	html += "</div";
+	html += "</div>";
 	
 	return html;
 };
diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js
index 6435d2147..47e43c876 100644
--- a/js/lib/ui.widgets.js
+++ b/js/lib/ui.widgets.js
@@ -107,7 +107,7 @@ elgg.ui.widgets.move = function(event, ui) {
  * @return void
  */
 elgg.ui.widgets.remove = function(event) {
-	var $widget = $(this).parent().parent();
+	var $widget = $(this).closest('.elgg-module-widget');
 
 	// if widget type is single instance type, enable the add buton
 	var type = $widget.attr('class');
@@ -124,15 +124,9 @@ elgg.ui.widgets.remove = function(event) {
 
 	$widget.remove();
 
-	// elgg-widget-delete-button-<guid>
-	var id = $(this).attr('id');
-	id = id.substr(id.indexOf('elgg-widget-delete-button-') + "elgg-widget-delete-button-".length);
+	// delete the widget through ajax
+	elgg.action($(this).attr('href'));
 
-	elgg.action('widgets/delete', {
-		data: {
-			widget_guid: id
-		}
-	});
 	event.preventDefault();
 };
 
@@ -196,7 +190,7 @@ elgg.ui.widgets.equalHeight = function(selector) {
 			maxHeight = $(this).height();
 		}
 	})
-	$(selector).css('min-height', maxHeight);
+	$(selector).css('min-height', maxHeight + 'px');
 };
 
 elgg.register_hook_handler('init', 'system', elgg.ui.widgets.init);