Skip to content

Commit bbf3a52

Browse files
committed
update ueditor
1 parent 9b3ff5e commit bbf3a52

File tree

256 files changed

+41
-30794
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

256 files changed

+41
-30794
lines changed

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/attachment/attachment.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@
161161
label: lang.uploadSelectFile
162162
},
163163
server: actionUrl,
164+
headers: editor.getOpt('headers') || {},
164165
fileVal: editor.getOpt('fileFieldName'),
165166
duplicate: true,
166167
fileSingleSizeLimit: fileMaxSize,
@@ -488,7 +489,7 @@
488489

489490
uploader.on('uploadBeforeSend', function (file, data, header) {
490491
//这里可以通过data对象添加POST参数
491-
header['X_Requested_With'] = 'XMLHttpRequest';
492+
header['X-Requested-With'] = 'XMLHttpRequest';
492493
});
493494

494495
uploader.on('uploadProgress', function (file, percentage) {
@@ -635,14 +636,15 @@
635636
this.isLoadingData = true;
636637
ajax.request(editor.getActionUrl(editor.getOpt('fileManagerActionName')), {
637638
timeout: 100000,
639+
'headers': editor.options.headers || {},
638640
data: utils.extend({
639641
start: this.listIndex,
640642
size: this.listSize
641643
}, editor.queryCommandValue('serverparam')),
642644
method: 'get',
643645
onsuccess: function (r) {
644646
try {
645-
var json = eval('(' + r.responseText + ')');
647+
var json = utils.str2json(r.responseText);
646648
if (json.state == 'SUCCESS') {
647649
_this.pushData(json.list);
648650
_this.listIndex = parseInt(json.start) + parseInt(json.list.length);

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/charts/chart.config.js

Lines changed: 0 additions & 65 deletions
This file was deleted.

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/charts/charts.css

Lines changed: 0 additions & 165 deletions
This file was deleted.

publiccms-parent/publiccms/src/main/webapp/resource/plugins/ueditor/dialogs/charts/charts.html

Lines changed: 0 additions & 89 deletions
This file was deleted.

0 commit comments

Comments
 (0)