Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
x649585723
incubator-echarts
提交
17b08bb9
I
incubator-echarts
项目概览
x649585723
/
incubator-echarts
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
incubator-echarts
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
17b08bb9
编写于
6月 29, 2016
作者:
L
lang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use pendingAction instead of setTimeout
上级
0cdda2e6
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
33 addition
and
15 deletion
+33
-15
src/component/brush/visualEncoding.js
src/component/brush/visualEncoding.js
+2
-6
src/echarts.js
src/echarts.js
+31
-9
未找到文件。
src/component/brush/visualEncoding.js
浏览文件 @
17b08bb9
...
...
@@ -216,12 +216,8 @@ define(function (require) {
}
var
fn
=
throttle
.
createOrUpdate
(
zr
,
DISPATCH_METHOD
,
throttleDelay
,
throttleType
);
// If throttleDelay is 0 or null or undefined, dispatchAction will also be
// called asynchronously, otherwise break the rule that main process should
// not be nested.
setTimeout
(
function
()
{
fn
(
api
,
brushSelected
);
},
0
);
fn
(
api
,
brushSelected
);
}
function
doDispatch
(
api
,
brushSelected
)
{
...
...
src/echarts.js
浏览文件 @
17b08bb9
...
...
@@ -174,7 +174,8 @@ define(function (require) {
// In case some people write `window.onresize = chart.resize`
this
.
resize
=
zrUtil
.
bind
(
this
.
resize
,
this
);
// Can't dispatch action during rendering procedure
this
.
_pendingActions
=
[];
// Sort on demand
function
prioritySortFunc
(
a
,
b
)
{
return
a
.
prio
-
b
.
prio
;
...
...
@@ -221,9 +222,11 @@ define(function (require) {
updateMethods
.
prepareAndUpdate
.
call
(
this
);
!
notRefreshImmediately
&&
this
.
_zr
.
refreshImmediately
();
this
[
IN_MAIN_PROCESS
]
=
false
;
this
.
_flushPendingActions
();
!
notRefreshImmediately
&&
this
.
_zr
.
refreshImmediately
();
};
/**
...
...
@@ -392,6 +395,7 @@ define(function (require) {
var
updateMethods
=
{
/**
* @param {Object} payload
* @private
...
...
@@ -609,6 +613,8 @@ define(function (require) {
this
.
_loadingFX
&&
this
.
_loadingFX
.
resize
();
this
[
IN_MAIN_PROCESS
]
=
false
;
this
.
_flushPendingActions
();
};
var
defaultLoadingEffect
=
require
(
'
./loading/default
'
);
...
...
@@ -663,12 +669,18 @@ define(function (require) {
var
actionInfo
=
actionWrap
.
actionInfo
;
var
updateMethod
=
actionInfo
.
update
||
'
update
'
;
if
(
__DEV__
)
{
zrUtil
.
assert
(
!
this
[
IN_MAIN_PROCESS
],
'
`dispatchAction` should not be called during main process.
'
+
'
unless updateMathod is "none".
'
);
// if (__DEV__) {
// zrUtil.assert(
// !this[IN_MAIN_PROCESS],
// '`dispatchAction` should not be called during main process.'
// + 'unless updateMathod is "none".'
// );
// }
// May dispatchAction in rendering procedure
if
(
this
[
IN_MAIN_PROCESS
])
{
this
.
_pendingActions
.
push
(
payload
);
return
;
}
this
[
IN_MAIN_PROCESS
]
=
true
;
...
...
@@ -718,9 +730,19 @@ define(function (require) {
this
[
IN_MAIN_PROCESS
]
=
false
;
this
.
_flushPendingActions
();
!
silent
&&
this
.
_messageCenter
.
trigger
(
eventObj
.
type
,
eventObj
);
};
echartsProto
.
_flushPendingActions
=
function
()
{
var
pendingActions
=
this
.
_pendingActions
;
while
(
pendingActions
.
length
)
{
var
payload
=
pendingActions
.
shift
();
this
.
dispatchAction
(
payload
);
}
};
/**
* Register event
* @method
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录