Skip to content

Commit d5d2397

Browse files
committed
Merge branch 'master' into dev-cssonly
Conflicts: build/CommentCoreLibrary.min.js
2 parents 0b230b6 + 1616657 commit d5d2397

4 files changed

Lines changed: 17 additions & 9 deletions

File tree

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ inside their own projects (whether web based or not) are encouraged to learn
1616
from and extend from the CommentCoreLibrary.
1717

1818
## Testing
19-
We have a live demo [here](http://jabbany.github.com/CommentCoreLibrary/demo).
19+
We have a live demo [here](http://jabbany.me/CommentCoreLibrary/demo).
2020
Feel free to [open tickets](CONTRIBUTING.md) if this demo test has bugs.
2121

2222
## License
@@ -66,7 +66,7 @@ implementation of a video player with CommentCoreLibrary.
6666
高级弹幕效果 (5) 基础格式解析 (6) 代码弹幕支持。
6767

6868
## 测试
69-
你可以在[这里](http://jabbany.github.com/CommentCoreLibrary/demo) 访问到测试页面。
69+
你可以在[这里](http://jabbany.me/CommentCoreLibrary/demo) 访问到测试页面。
7070
我们欢迎各种[BUG报告](CONTRIBUTING.md)
7171

7272
## 许可

build/CommentCoreLibrary.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,7 +1196,10 @@ var CommentManager = (function() {
11961196

11971197
function CommentManager(stageObject){
11981198
var __timer = 0;
1199+
11991200
this._listeners = {};
1201+
this._lastPosition = 0;
1202+
12001203
this.stage = stageObject;
12011204
this.options = {
12021205
global:{
@@ -1222,6 +1225,7 @@ var CommentManager = (function() {
12221225
reverse:new CommentSpaceAllocator(0,0),
12231226
scrollbtm:new CommentSpaceAllocator(0,0)
12241227
};
1228+
12251229
/** Precompute the offset width **/
12261230
this.width = this.stage.offsetWidth;
12271231
this.height = this.stage.offsetHeight;
@@ -1336,14 +1340,14 @@ var CommentManager = (function() {
13361340
};
13371341
CommentManager.prototype.time = function(time){
13381342
time = time - 1;
1339-
if(this.position >= this.timeline.length || Math.abs(this.lastPos - time) >= 2000){
1343+
if(this.position >= this.timeline.length || Math.abs(this.lastPosition - time) >= 2000){
13401344
this.seek(time);
1341-
this.lastPos = time;
1345+
this._lastPosition = time;
13421346
if(this.timeline.length <= this.position) {
13431347
return;
13441348
}
13451349
}else{
1346-
this.lastPos = time;
1350+
this._lastPosition = time;
13471351
}
13481352
for(;this.position < this.timeline.length;this.position++){
13491353
if(this.timeline[this.position]['stime']<=time){

0 commit comments

Comments
 (0)