jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

This commit is contained in:
sw 2015-09-11 09:17:08 +08:00
parent 66636efda9 2beb85561a
commit 6730c4da84
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/users/user_resource_create.js.erb
View File

@ -2,4 +2,6 @@
closeModal(); closeModal();
$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>'); $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
//这里不能将翻页的更新 //这里不能将翻页的更新
$("#res_all_count").html(parseInt($("#res_all_count").html())+1); $("#res_all_count").html(parseInt($("#res_all_count").html())+1);
$("#res_count").html(0);
$("#checkboxAll").attr('checked',false);

24
public/assets/kindeditor/kindeditor.js
View File

@ -264,10 +264,10 @@ K.options = {
minHeight : 100, minHeight : 100,
minChangeSize : 50, minChangeSize : 50,
zIndex : 811213, zIndex : 811213,
items : ['code', 'emoticons', items : ['code', 'emoticons','fontname',
'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', 'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|',
'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', 'formatblock', 'fontsize', '|','indent', 'outdent',
'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'media',"more" '|','imagedirectupload','table', 'media', 'preview',"more"
], ],
noDisableItems : ['source', 'fullscreen'], noDisableItems : ['source', 'fullscreen'],
colorTable : [ colorTable : [
@ -4987,16 +4987,16 @@ KEditor.prototype = {
htmlList.push('</div>') htmlList.push('</div>')
var htmlListFull = []; var htmlListFull = [];
var fullItems = ['code', var fullItems = ['code',
'emoticons', 'emoticons','fontname',
'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|', 'forecolor', 'hilitecolor', 'bold','|', 'justifyleft', 'justifycenter', 'insertorderedlist', 'insertunorderedlist', '|',
'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold', 'formatblock', 'fontsize', '|', 'indent', 'outdent',
'italic', 'underline', 'removeformat', '|','imagedirectupload','table', 'media', "less", '|','imagedirectupload','table', 'media', 'preview', "less",
'/', '/',
'undo', 'redo', '|', 'preview', 'print', 'template', 'italic', 'underline', 'undo', 'redo', '|', 'removeformat',
'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript', 'justifyright','justifyfull', 'source','plainpaste', 'wordpaste', 'subscript',
'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/ 'fontname', 'superscript', 'clearhtml', 'quickformat', /* 'selectall',*/
'strikethrough', 'lineheight', 'hr', 'pagebreak', 'strikethrough', 'lineheight', 'hr', 'pagebreak',
'anchor' , 'link','unlink' 'link','unlink', 'print'
] ]
K.each(fullItems, function(i, name) { K.each(fullItems, function(i, name) {
if (name == '|') { if (name == '|') {