diff --git a/modules/admin/controllers/maintenance/Cleanup.php b/modules/admin/controllers/maintenance/Cleanup.php index 1ea397361..a8906dbe4 100644 --- a/modules/admin/controllers/maintenance/Cleanup.php +++ b/modules/admin/controllers/maintenance/Cleanup.php @@ -441,6 +441,7 @@ class Cleanup extends Base 'modules/install/tpl/js/install_admin.js' => 'deleted:xe', 'modules/integration_search/skins/default/trackback.html' => 'deleted', 'modules/member/skins/default/filter/find_member_account_by_question.xml' => 'deleted:xe', + 'modules/message/tpl/filter/' => 'deleted:xe', 'modules/module/schemas/site_admin.xml' => 'deleted', 'modules/module/tpl/css/module_admin.less' => 'deleted', 'modules/page/page.wap.php' => 'deleted:xe', diff --git a/modules/message/tpl/filter/insert_config.xml b/modules/message/tpl/filter/insert_config.xml deleted file mode 100644 index 5307f8b3b..000000000 --- a/modules/message/tpl/filter/insert_config.xml +++ /dev/null @@ -1,7 +0,0 @@ - -
- - - - - diff --git a/modules/message/tpl/js/config.js b/modules/message/tpl/js/config.js index aa304acd2..97004198d 100644 --- a/modules/message/tpl/js/config.js +++ b/modules/message/tpl/js/config.js @@ -5,41 +5,27 @@ function doGetSkinColorset(skin, type) { 'skin' : skin, 'type': type, }; - var response_tags = [ 'error', 'message', 'tpl' ]; - function on_complete(ret) { - var $container = jQuery('#colorset'); - - if(type == 'M'){ - $container = jQuery('#mcolorset'); - } - + Rhymix.ajax('message.getMessageAdminColorset', params).then(function(ret) { + var $container = type == 'M' ? $('#mcolorset') : $('#colorset'); var old_h = $container.is(':visible') ? $container.outerHeight() : 0; - if(ret.tpl == ''){ + if (ret.tpl == '') { $container.hide(); - }else{ + } else { $container.show(); - var $colorset = jQuery('#message_colorset'); - - if(type == 'M'){ - $colorset = jQuery('#message_mcolorset'); - } - + var $colorset = (type == 'M') ? $('#message_mcolorset') : $('#message_colorset'); $colorset.html(ret.tpl); } var new_h = $container.is(':visible') ? $container.outerHeight() : 0; - try { fixAdminLayoutFooter(new_h - old_h) } catch (e) {}; - } - - exec_xml('message', 'getMessageAdminColorset', params, on_complete, response_tags); + }); } -jQuery(function($){ +$(function() { doGetSkinColorset($('#skin').val()); doGetSkinColorset($('#mskin').val(), 'M'); -}); \ No newline at end of file +});