jianghe2nd/mota-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix bug

Browse Source
This commit is contained in:
YouWei Zhao 2018-03-22 17:01:22 +08:00
parent 5e706e1111
commit 28c8c89616
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
_server/editor_file.js
View File

@ -419,16 +419,17 @@ editor_file = function(editor, callback){
]
为[]时只查询不修改
*/
var data_obj = data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d;
if (!isset(callback)) {printe('未设置callback');throw('未设置callback')};
if (isset(actionList) && actionList.length > 0){
saveSetting('data',actionList,function (err) {
callback([
(function(){
//var locObj=Object.assign({'main':{}},editor.core.data);
var locObj=Object.assign({},data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d,{'main':{}});
var locObj=Object.assign({},data_obj,{'main':{}});
Object.keys(editor_file.dataComment._data.main._data).forEach(function(v){
if (isset(editor.main[v]))
locObj.main[v]=editor.main[v];
locObj.main[v]=data_obj.main[v];
else
locObj[v]=null;
});
@ -441,10 +442,10 @@ editor_file = function(editor, callback){
callback([
(function(){
//var locObj=Object.assign({'main':{}},editor.core.data);
var locObj=Object.assign({},data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d,{'main':{}});
var locObj=Object.assign({},data_obj,{'main':{}});
Object.keys(editor_file.dataComment._data.main._data).forEach(function(v){
if (isset(editor.main[v]))
locObj.main[v]=editor.main[v];
locObj.main[v]=data_obj.main[v];
else
locObj[v]=null;
});