Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kityminder-core
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
吴志俊
kityminder-core
Commits
419da45d
Commit
419da45d
authored
Jul 09, 2015
by
张博
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed bug: importData return promise
parent
02a4052e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
kityminder.core.js
dist/kityminder.core.js
+2
-2
kityminder.core.min.js
dist/kityminder.core.min.js
+3
-3
data.js
src/core/data.js
+1
-1
No files found.
dist/kityminder.core.js
View file @
419da45d
/*!
/*!
* ====================================================
* ====================================================
* kityminder - v1.4.1 - 2015-07-0
7
* kityminder - v1.4.1 - 2015-07-0
9
* 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
;
});
});
...
...
dist/kityminder.core.min.js
View file @
419da45d
This source diff could not be displayed because it is too large. You can
view the blob
instead.
src/core/data.js
View file @
419da45d
...
@@ -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
;
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment