Commit 419da45d authored by 张博's avatar 张博

fixed bug: importData return promise

parent 02a4052e
/*! /*!
* ==================================================== * ====================================================
* kityminder - v1.4.1 - 2015-07-07 * kityminder - v1.4.1 - 2015-07-09
* https://github.com/fex-team/kityminder-core * https://github.com/fex-team/kityminder-core
* GitHub: https://github.com/fex-team/kityminder-core.git * GitHub: https://github.com/fex-team/kityminder-core.git
* Copyright (c) 2015 Baidu FEX; Licensed MIT * Copyright (c) 2015 Baidu FEX; Licensed MIT
...@@ -841,7 +841,7 @@ _p[11] = { ...@@ -841,7 +841,7 @@ _p[11] = {
}; };
// 导入前抛事件 // 导入前抛事件
this._fire(new MinderEvent("beforeimport", params)); this._fire(new MinderEvent("beforeimport", params));
return Promise.resolve(protocol.decode(data, this, option)).then(function(json) { return protocol.decode(data, this, option).then(function(json) {
minder.importJson(json); minder.importJson(json);
return json; return json;
}); });
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -194,7 +194,7 @@ define(function(require, exports, module) { ...@@ -194,7 +194,7 @@ define(function(require, exports, module) {
// 导入前抛事件 // 导入前抛事件
this._fire(new MinderEvent('beforeimport', params)); this._fire(new MinderEvent('beforeimport', params));
return Promise.resolve(protocol.decode(data, this, option)).then(function(json) { return protocol.decode(data, this, option).then(function(json) {
minder.importJson(json); minder.importJson(json);
return json; return json;
}); });
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment