diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb index f7ae832d1..2d6c4f4d8 100644 --- a/app/views/users/user_resource_create.js.erb +++ b/app/views/users/user_resource_create.js.erb @@ -2,4 +2,6 @@ closeModal(); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); //这里不能将翻页的更新 -$("#res_all_count").html(parseInt($("#res_all_count").html())+1); \ No newline at end of file +$("#res_all_count").html(parseInt($("#res_all_count").html())+1); +$("#res_count").html(0); +$("#checkboxAll").attr('checked',false); \ No newline at end of file diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index bc45cd91f..e8c28f678 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -264,10 +264,10 @@ K.options = { minHeight : 100, minChangeSize : 50, zIndex : 811213, - items : ['code', 'emoticons', - 'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', - 'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', - 'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'media',"more" + items : ['code', 'emoticons','fontname', + 'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|', + 'formatblock', 'fontsize', '|','indent', 'outdent', + '|','imagedirectupload','table', 'media', 'preview',"more" ], noDisableItems : ['source', 'fullscreen'], colorTable : [ @@ -4987,16 +4987,16 @@ KEditor.prototype = { htmlList.push('') var htmlListFull = []; var fullItems = ['code', - 'emoticons', - 'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', - 'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', - 'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'media', "less", + 'emoticons','fontname', + 'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter', 'insertorderedlist', 'insertunorderedlist', '|', + 'formatblock', 'fontsize', '|', 'indent', 'outdent', + '|','imagedirectupload','table', 'media', 'preview', "less", '/', - 'undo', 'redo', '|', 'preview', 'print', 'template', - 'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript', - 'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/ 'fontname', + 'italic', 'underline', 'undo', 'redo', '|', 'removeformat', + 'justifyright','justifyfull', 'source','plainpaste', 'wordpaste', 'subscript', + 'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/ 'strikethrough', 'lineheight', 'hr', 'pagebreak', - 'anchor' , 'link','unlink' + 'link','unlink', 'print' ] K.each(fullItems, function(i, name) { if (name == '|') {