diff options
author | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
---|---|---|
committer | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
commit | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch) | |
tree | 6f485b560f89331c65fad3993e055a1834b07177 /js/lib/ui.widgets.js | |
parent | 5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff) | |
parent | fea599f1653d7206e34ac33c0c0a668cb587bc20 (diff) | |
download | elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2 |
Merge branch '1.8' after 1.8.2 release
Conflicts:
version.php
Diffstat (limited to 'js/lib/ui.widgets.js')
-rw-r--r-- | js/lib/ui.widgets.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/lib/ui.widgets.js b/js/lib/ui.widgets.js index f12ae02c1..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'); @@ -190,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); |