Merge pull request #1 from jabbany/master

merge Owner's changes

Author: dbFlower

.travis.yml

@@ -1,4 +1,5 @@
 language: node_js
+sudo: false
 node_js:
   - "0.10"
 before_install:

build/CommentCoreLibrary.js

@@ -824,23 +824,26 @@ var CommentManager = (function() {
 	};
 	CommentManager.prototype.init = function(){
 		this.setBounds();
-		if(this.filter == null)
+		if(this.filter == null) {
 			this.filter = new CommentFilter(); //Only create a filter if none exist
+		}
 	};
 	CommentManager.prototype.time = function(time){
 		time = time - 1;
 		if(this.position >= this.timeline.length || Math.abs(this.lastPos - time) >= 2000){
 			this.seek(time);
 			this.lastPos = time;
-			if(this.timeline.length <= this.position)
+			if(this.timeline.length <= this.position) {
 				return;
+			}
 		}else{
 			this.lastPos = time;
 		}
 		for(;this.position < this.timeline.length;this.position++){
-			if(this.options.limit > 0 && this.runline.length > this.limiter) break;
 			if(this.timeline[this.position]['stime']<=time){
-				if(this.validate(this.timeline[this.position])){
+				if(this.options.limit > 0 && this.runline.length > this.limiter) {
+					continue; // Skip comments but still move the position pointer
+				} else if(this.validate(this.timeline[this.position])){
 					this.send(this.timeline[this.position]);
 				}
 			}else{

build/CommentCoreLibrary.min.js

@@ -900,9 +900,9 @@ var CCLScripting = function(workerUrl){
 							cG = Math.floor((filter.params.color % 65536)/256), 
 							cB = filter.params.color % 256;
 						var cMatrix = [
-							0,0,0,cR,0,
-							0,0,0,cG,0,
-							0,0,0,cB,0,
+							0,0,0,cR/256,0,
+							0,0,0,cG/256,0,
+							0,0,0,cB/256,0,
 							0,0,0,1,0,
 						];
 						dFilter.appendChild(__("feColorMatrix",{

build/scripting/Host.js

@@ -19,6 +19,12 @@
 管理器的弹幕是否在运行。`false`表示没有在运行，`true`表示在运行。可以通过 start/stop 控制。这
 个参数只反映运行列表里面弹幕的运行状态，而不是视频的。
 
+### width <Number>
+舞台的长度像素值，用于计算弹幕位置。此数只有在 init 之后才有效。
+
+### height <Number>
+舞台的高度像素值，用于计算弹幕位置。此数只有在 init 之后才有效。
+
 ## Methods 方法
 
 ### init()

docs/CommentManager.md

@@ -159,23 +159,26 @@ var CommentManager = (function() {
 	};
 	CommentManager.prototype.init = function(){
 		this.setBounds();
-		if(this.filter == null)
+		if(this.filter == null) {
 			this.filter = new CommentFilter(); //Only create a filter if none exist
+		}
 	};
 	CommentManager.prototype.time = function(time){
 		time = time - 1;
 		if(this.position >= this.timeline.length || Math.abs(this.lastPos - time) >= 2000){
 			this.seek(time);
 			this.lastPos = time;
-			if(this.timeline.length <= this.position)
+			if(this.timeline.length <= this.position) {
 				return;
+			}
 		}else{
 			this.lastPos = time;
 		}
 		for(;this.position < this.timeline.length;this.position++){
-			if(this.options.limit > 0 && this.runline.length > this.limiter) break;
 			if(this.timeline[this.position]['stime']<=time){
-				if(this.validate(this.timeline[this.position])){
+				if(this.options.limit > 0 && this.runline.length > this.limiter) {
+					continue; // Skip comments but still move the position pointer
+				} else if(this.validate(this.timeline[this.position])){
 					this.send(this.timeline[this.position]);
 				}
 			}else{

src/CommentCoreLibrary.js

@@ -599,9 +599,9 @@
 							cG = Math.floor((filter.params.color % 65536)/256), 
 							cB = filter.params.color % 256;
 						var cMatrix = [
-							0,0,0,cR,0,
-							0,0,0,cG,0,
-							0,0,0,cB,0,
+							0,0,0,cR/256,0,
+							0,0,0,cG/256,0,
+							0,0,0,cB/256,0,
 							0,0,0,1,0,
 						];
 						dFilter.appendChild(__("feColorMatrix",{