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

public/assets/kindeditor/kindeditor.js

@@ -4972,13 +4972,13 @@ KEditor.prototype = {
             'emoticons',
             'source','plainpaste', 'wordpaste', '|', 'justifyleft', 'justifycenter', 'justifyright', 'insertorderedlist', '|',
             'formatblock', 'fontsize', '|', 'forecolor', 'hilitecolor', 'bold',
-            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link', 'fullscreen',"less",
+            'italic', 'underline', 'removeformat', '|','imagedirectupload','table',   'link', "less",
                 '/',
-             'undo', 'redo', '|', 'preview', 'print', 'template', 'code', 'cut',  'plainpaste',
+             'undo', 'redo', '|', 'preview', 'print', 'template',
             'justifyfull', 'insertunorderedlist', 'indent', 'outdent', 'subscript',
             'superscript', 'clearhtml', 'quickformat', 'selectall',  'fontname',
-            'strikethrough', 'lineheight', '|', 'imagedirectupload', 'hr', 'pagebreak',
+            'strikethrough', 'lineheight', 'hr', 'pagebreak',
-            'anchor', 'unlink'
+            'anchor' , 'unlink'
         ]
         K.each(fullItems, function(i, name) {
             if (name == '|') {