diff --git a/dist/CommentCoreLibrary.js b/dist/CommentCoreLibrary.js
index 1e44f861..d36d8531 100644
--- a/dist/CommentCoreLibrary.js
+++ b/dist/CommentCoreLibrary.js
@@ -528,14 +528,11 @@ var CoreComment = (function () {
 else {
 this.dom = document.createElement('div');
 }
- this.dom.className = this.parent.options.global.className;
- if (this._className !== "") {
- this.dom.className += " " + this._className;
- }
 this.dom.appendChild(document.createTextNode(this.text));
 this.dom.textContent = this.text;
 this.dom.innerText = this.text;
 this.size = this._size;
+ this.className = this._className;
 if (this._color != 0xffffff) {
 this.color = this._color;
 }
@@ -660,7 +657,7 @@ var CoreComment = (function () {
 });
 Object.defineProperty(CoreComment.prototype, "width", {
 get: function () {
- if (this._width === null || this._width === undefined) {
+ if (typeof this._width === 'undefined' || this._width === null) {
 this._width = this.dom.offsetWidth;
 }
 return this._width;
@@ -674,7 +671,7 @@ var CoreComment = (function () {
 });
 Object.defineProperty(CoreComment.prototype, "height", {
 get: function () {
- if (this._height === null || this._height === undefined) {
+ if (typeof this._height === 'undefined' || this._height === null) {
 this._height = this.dom.offsetHeight;
 }
 return this._height;
@@ -719,7 +716,8 @@ var CoreComment = (function () {
 },
 set: function (a) {
 this._alpha = a;
- this.dom.style.opacity = Math.min(this._alpha, this.parent.options.global.opacity) + '';
+ this.dom.style.opacity =
+ Math.min(this._alpha, this.parent.options.global.opacity) + '';
 },
 enumerable: true,
 configurable: true
@@ -782,6 +780,17 @@ var CoreComment = (function () {
 enumerable: true,
 configurable: true
 });
+ Object.defineProperty(CoreComment.prototype, "className", {
+ get: function () {
+ return this._className;
+ },
+ set: function (className) {
+ this._className = className;
+ this.dom.className = this.parent.options.global.className + ' ' + className;
+ },
+ enumerable: true,
+ configurable: true
+ });
 CoreComment.prototype.time = function (time) {
 this.ttl -= time;
 if (this.ttl < 0) { @@ -1152,7 +1161,7 @@ var CommentUtils; get: function () { return this._internalArray.slice(0); }, - set: function (array) { + set: function (_array) { throw new Error('Not permitted. Matrices are immutable.'); }, enumerable: true, @@ -1198,18 +1207,19 @@ var CommentUtils; return new Matrix3D([xscale, 0, 0, 0, 0, yscale, 0, 0, 0, 0, zscale, 0, 0, 0, 0, 1]); }; Matrix3D.createRotationMatrix = function (xrot, yrot, zrot) { + var COS = Math.cos; + var SIN = Math.sin; var DEG2RAD = Math.PI / 180; + var xr = xrot * DEG2RAD; var yr = yrot * DEG2RAD; var zr = zrot * DEG2RAD; - var COS = Math.cos; - var SIN = Math.sin; var matrix = [ - COS(yr) * COS(zr), COS(yr) * SIN(zr), SIN(yr), 0, - (-SIN(zr)), COS(zr), 0, 0, - (-SIN(yr) * COS(zr)), (-SIN(yr) * SIN(zr)), COS(yr), 0, + COS(yr) * COS(zr), COS(yr) * SIN(zr), -SIN(yr), 0, + SIN(xr) * SIN(yr) * COS(zr) - COS(xr) * SIN(zr), SIN(xr) * SIN(yr) * SIN(zr) + COS(xr) * COS(zr), SIN(xr) * COS(yr), 0, + COS(xr) * SIN(yr) * COS(zr) + SIN(xr) * SIN(zr), COS(xr) * SIN(yr) * SIN(zr) - SIN(xr) * COS(zr), COS(xr) * COS(yr), 0, 0, 0, 0, 1 ]; - return new Matrix3D(matrix.map(function (v) { return Math.round(v * 1e10) * 1e-10; })); + return new Matrix3D(matrix); }; return Matrix3D; }()); @@ -1226,17 +1236,6 @@ var __extends = (this && this.__extends) &#124;&#124; (function () { d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); }; })(); -var CssCompatLayer = (function () { - function CssCompatLayer() { - } - CssCompatLayer.transform = function (dom, trans) { - dom.style.transform = trans; - dom.style["webkitTransform"] = trans; - dom.style["msTransform"] = trans; - dom.style["oTransform"] = trans; - }; - return CssCompatLayer; -}()); var CssScrollComment = (function (_super) { __extends(CssScrollComment, _super); function CssScrollComment() { @@ -1249,30 +1248,29 @@ var CssScrollComment = (function (_super) { _super.prototype.init.call(this, recycle); this._toggleClass('css-optimize', true); }; + CssScrollComment.prototype._calculateX = function () { + var width = (typeof this._width === 'undefined') ? 0 : this.width; + var x = (this.ttl / this.dur) * (this.parent.width + width) - width; + return (!this.absolute) ? (x / this.parent.width) : x; + }; Object.defineProperty(CssScrollComment.prototype, "x", { get: function () { - return (this.ttl / this.dur) * (this.parent.width + this.width) - this.width; + return this._calculateX(); }, set: function (x) { - if (this._x !== null && typeof this._x === "number") { - var dx = x - this._x; - this._x = x; - CssCompatLayer.transform(this.dom, "translateX(" + - (this.axis % 2 === 0 ? dx : -dx) + "px)"); + if (!this.absolute) { + x *= this.parent.width; + } + var dx = x - this._calculateX(); + this.dom.style.transform = + "translateX(" + (this.axis % 2 === 0 ? dx : -dx) + "px)" + + (this._transform === null &#124;&#124; this._transform.isIdentity() ? + '' : (' ' + this._transform.toCss())); + if (this.axis % 2 === 0) { + this.dom.style.left = this._calculateX() + 'px'; } else { - this._x = x; - if (!this.absolute) { - this._x *= this.parent.width; - } - if (this.axis % 2 === 0) { - this.dom.style.left = - (this._x + (this.align % 2 === 0 ? 0 : -this.width)) + 'px'; - } - else { - this.dom.style.right = - (this._x + (this.align % 2 === 0 ? -this.width : 0)) + 'px'; - } + this.dom.style.right = this._calculateX() + 'px'; } }, enumerable: true, @@ -1281,21 +1279,24 @@ var CssScrollComment = (function (_super) { CssScrollComment.prototype.update = function () { if (this._dirtyCSS) { this.dom.style.transition = "transform " + this.ttl + "ms linear"; - this.x = -this.width; + this.x = -this.dom.offsetWidth; this._dirtyCSS = false; } }; CssScrollComment.prototype.invalidate = function () { _super.prototype.invalidate.call(this); this._dirtyCSS = true; + if (!this.dom) { + return; + } + else { + this.dom.style.transition = ''; + this.x = this.x; + } }; CssScrollComment.prototype.stop = function () { _super.prototype.stop.call(this); - this.dom.style.transition = ''; - this.x = this._x; - this._x = null; - this.x = this.x; - this._dirtyCSS = true; + this.invalidate(); }; return CssScrollComment; }(ScrollComment)); diff --git a/dist/CommentCoreLibrary.min.js b/dist/CommentCoreLibrary.min.js index d1872c04..bb9c1a7b 100644 --- a/dist/CommentCoreLibrary.min.js +++ b/dist/CommentCoreLibrary.min.js @@ -1,2 +1,2 @@ /*!Copyright(c) CommentCoreLibrary v0.11.1 (//github.com/jabbany/CommentCoreLibrary) - Licensed under the MIT License */ -var CommentUtils,BinArray=function(){var n={bsearch:function(t,e,r){if(!Array.isArray(t))throw new Error("Bsearch can only be run on arrays");if(0===t.length)return 0;if(r(e,t[0])<0)return 0;if(0<=r(e,t[t.length-1]))return t.length;for(var i=0,n=0,o=0,s=t.length-1;i<=s;){if(o++,0<=r(e,t[(n=math.floor((s+i+1)/2))-1])&&r(e,t[n])<0)return n;if(r(e,t[n-1])<0)s=n-1;else{if(!(0<=r(e,t[n])))throw new Error("Program Error. Inconsistent comparator or unsorted array!");i=n}if(1500<o)throw new Error("Iteration depth exceeded. Inconsistent comparator or astronomical dataset!")}return-1},binsert:function(t,e,r){var i=n.bsearch(t,e,r);return t.splice(i,0,e),i}};return n}(),CommentManager=function(){var e=function(t,e){return t.stime>e.stime?2:t.stime<e.stime?-2:t.date>e.date?1:t.date<e.date?-1:null!=t.dbid&&null!=e.dbid?t.dbid>e.dbid?1:t.dbid<e.dbid?-1:0:0};function t(t){var i=0;this._listeners={},this._lastPosition=0,this.stage=t,this.options={global:{opacity:1,scale:1,className:"cmt"},scroll:{opacity:1,scale:1},limit:0,seekTrigger:2e3},this.timeline=[],this.runline=[],this.position=0,this.factory=null,this.filter=null,this.csa={scroll:new CommentSpaceAllocator(0,0),top:new AnchorCommentSpaceAllocator(0,0),bottom:new AnchorCommentSpaceAllocator(0,0),reverse:new CommentSpaceAllocator(0,0),scrollbtm:new CommentSpaceAllocator(0,0)},this. e=(new Date).getTime(),r=this;i=window.setInterval(function(){var t=(new Date).getTime()-e;e=(new Date).getTime(),r.onTimerEvent(t,r)},10)}},this._stopTimer=function(){window.clearInterval(i),i=0}}return t.prototype.stop=function(){this._stopTimer(),this.runline.forEach(function(t){t.stop()})},t.prototype.start=function(){this._startTimer()},t.prototype.seek=function(t){this.position=BinArray.bsearch(this.timeline,t,function(t,e){return t<e.stime?-1:t>e.stime?1:0})},t.prototype.validate=function(t){return null!=t&&this.filter.doValidate(t)},t.prototype.load=function(t){this.timeline=t,this.timeline.sort(e),this.dispatchEvent("load")},t.prototype.insert=function(t){BinArray.binsert(this.timeline,t,e)<=this.position&&this.position++,this.dispatchevent("insert")},t.prototype.clear=function(){for(;0<this.runline.length;)this.runline[0].finish();this.dispatchevent("clear")},t.prototype.setbounds=function(){for(var t in this.resize"),this.csa)this.csa[t].setBounds(this.width,this.height);this.stage.style.perspective=this.width/Math.tan(55*Math.PI/180)/2+"px",this.stage.style.webkitPerspective=this.width/Math.tan(55*Math.PI/180)/2+"px"},t.prototype.init=function(t){if(this.setBounds(),null==this.filter&&(this.filter=new" CommentFilter),null==this.factory)switch(t){case"legacy":this.factory=CommentFactory.defaultFactory();break;default:case"css":this.factory=CommentFactory.defaultCssRenderFactory()}},t.prototype.time=function(t){if(t-=1,this.position>=this.timeline.length&#124;&#124;Math.abs(this._lastPosition-t)>=this.options.seekTrigger){if(this.seek(t),this._lastPosition=t,this.timeline.length<=this.position)return}else this._lastPosition=t;for(var e=[];this.position<this.timeline.length&&this.timeline[this.position].stime<=t;this.position++)0<this.options.limit&&this.runline.length+e.length>=this.options.limit&#124;&#124;this.validate(this.timeline[this.position])&&e.push(this.timeline[this.position]);0<e.length&&this.send(e)},t.prototype.rescale=function(){},t.prototype._preprocess=function(t){return 8===t.mode?(console.log(t),this.scripting&&console.log(this.scripting.eval(t.code)),null):(null!=this.filter&&(t=this.filter.doModify(t)),t)},t.prototype._allocateSpace=function(t){switch(t.mode){default:case 1:this.csa.scroll.add(t);break;case 2:this.csa.scrollbtm.add(t);break;case 4:this.csa.bottom.add(t);break;case 5:this.csa.top.add(t);break;case 6:this.csa.reverse.add(t);break;case 7:case 17:}},t.prototype.send=function(t){Array.isArray(t)&#124;&#124;(t=[t]),0!==(t=t.map(this._preprocess.bind(this)).filter(function(t){return null!==t})).length&&t.map(function(t){return this.factory.create(this,t)}.bind(this)).map(function(t){return this._allocateSpace(t),t}.bind(this)).forEach(function(t){t.y=t.y,this.dispatchEvent("enterComment",t),this.runline.push(t)}.bind(this))},t.prototype.finish=function(t){this.dispatchEvent("exitComment",t),this.stage.removeChild(t.dom);var e=this.runline.indexOf(t);switch(0<=e&&this.runline.splice(e,1),t.mode){default:case 1:this.csa.scroll.remove(t);break;case 2:this.csa.scrollbtm.remove(t);break;case 4:this.csa.bottom.remove(t);break;case 5:this.csa.top.remove(t);break;case 6:this.csa.reverse.remove(t);break;case 7:}},t.prototype.addEventListener=function(t,e){void 0!==this._listeners[t]?this._listeners[t].push(e):this._listeners[t]=[e]},t.prototype.dispatchEvent=function(t,e){if(void 0!==this._listeners[t])for(var r=0;r<this._listeners[t].length;r++)try{this._listeners[t][r](e)}catch(t){console.error(t.stack)}},t.prototype.ontimerevent=function(t,e){for(var r=0;r<e.runline.length;r++){e.runline[r].time(t)}},t}(),__extends=this&&this.__extends&#124;&#124;function(){var i=Object.setPrototypeOf&#124;&#124;{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}&#124;&#124;function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};return function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}}(),CoreComment=function(){function a(t,e){if(void 0===e&&(e={}),this.mode=1,this.stime=0,this.,this.ttl=4e3,this.dur=4e3,this.cindex=-1,this.motion=[],this.movable=!0,this._alphaMotion=null,this.absolute=!0,this. new Error("Comment not bound to comment manager.");if(this.parent=t,e.hasOwnProperty("stime")&&(this.stime=e.stime),e.hasOwnProperty("mode")?this.mode=e.mode:this.mode=1,e.hasOwnProperty("dur")&&(this.dur=e.dur,this.ttl=this.dur),this.dur*=this.parent.options.global.scale,this.ttl*=this.parent.options.global.scale,e.hasOwnProperty("text")&&(this.motion")){this._motionStart=[],this._motionEnd=[],this.motion=e.motion;for(var" r=0,i=0;i<e.motion.length;i++){this._motionstart.push(r);var n=0;for(var o in e.motion[i]){var s=e.motion[i][o];n=Math.max(s.dur+s.delay,n),null!==s.easing&&void 0!==s.easing&#124;&#124;(e.motion[i][o].easing=a.LINEAR)}r+=n,this._motionEnd.push(r)}this._curMotion=0}e.hasOwnProperty("color")&&(this._color=e.color),e.hasOwnProperty("size")&&(this._size=e.size),e.hasOwnProperty("border")&&(this._ CommentUtils.Matrix3D(e.transform)),e.hasOwnProperty("position")&&"relative"===e.position&&(this.absolute=!1,this.mode<7&&console.warn("using relative position for CSA comment.")),e.hasOwnProperty("className")&&(this._className=e.className)}return a.prototype._toggleClass=function(t,e){if(void 0===e&&(e=!1),this.dom)if(this.dom.classList)this.dom.classList.toggle(t,e);else{var r=this.dom.className.split(" "),i=r.indexOf(t);0<=i&&!e?(r.splice(i,1),this.dom.classname=r.join(" ")):i<0&&e&&(r.push(t),this.dom.classname=r.join(" "))}},a.prototype.init=function(t){void 0===t&&(t=null),this.dom=null!==t?t.dom:document.createElement("div"),this.dom.className=this.parent.options.global.className,""!==this._className&&(this.dom.className+=" "+this._className),this.dom.appendChild(document.createTextNode(this.text)),this.dom.textContent=this.text,this.dom.inner"!==this._font&&(this.font=this._font),void" 0!==this._x&&(this.x=this._x),void 0!==this._y&&(this.y=this._y),(1!==this._alpha&#124;&#124;this.parent.options.global.opacity<1)&&(this.alpha=this._alpha),null===this._transform&#124;&#124;this._transform.isidentity()&#124;&#124;(this.transform=this._transform.flatarray),0<this.motion.length&&this.animate()},object.defineproperty(a.prototype,"x",{get:function(){return null!==this._x&&void 0!==this._x&#124;&#124;(this.axis%2==0?this.align%2==0?this._x=this.dom.offsetLeft:this._x=this.dom.offsetLeft+this.width:this.align%2==0?this._x=this.parent.width-this.dom.offsetLeft:this._x=this.parent.width-this.dom.offsetLeft-this.width),this.absolute?this._x:this._x/this.parent.width},set:function(t){this._x=t,this.absolute&#124;&#124;(this._x*=this.parent.width),this.axis%2==0?this.dom.style.left=this._x+(this.align%2==0?0:-this.width)+"px":this.dom.style.right=this._x+(this.align%2==0?-this.width:0)+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"y",{get:function(){return null!==this._y&&void 0!==this._y&#124;&#124;(this.axis<2?this.align<2?this._y=this.dom.offsettop:this._y=this.dom.offsettop+this.height:this.align<2?this._y=this.parent.height-this.dom.offsettop:this._y=this.parent.height-this.dom.offsettop-this.height),this.absolute?this._y:this._y/this.parent.height},set:function(t){this._y=t,this.absolute&#124;&#124;(this._y*=this.parent.height),this.axis<2?this.dom.style.top=this._y+(this.align<2?0:-this.height)+"px":this.dom.style.bottom=this._y+(this.align<2?-this.height:0)+"px"},enumerable:!0,configurable:!0}),object.defineproperty(a.prototype,"bottom",{get:function(){var t=Math.floor(this.axis/2)===Math.floor(this.align/2);return this.y+(t?this.height:0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"right",{get:function(){var t=this.axis%2==this.align%2;return this.x+(t?this.width:0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"this.dom.offsetWidth),this._width},set:function(t){this._width=t,this.dom.style.width=this._width+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"height",{get:function(){return" null!==this._height&&void 0!==this._height&#124;&#124;(this._height="this.dom.offsetHeight),this._height},set:function(t){this._height=t,this.dom.style.height=this._height+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"size",{get:function(){return" this._size},set:function(t){this._size=t,this.dom.style.fontSize=this._size+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"color",{get:function(){return this._color},set:function(t){var e=(this._color=t).toString(16);e=6<=e.length?e:new Array(6-e.length+1).join("0")+e,this.dom.style.color="#"+e,0===this._color&&this._toggleClass("reverse-shadow",!0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"alpha",{get:function(){return this._alpha},set:function(t){this._alpha=t,this.dom.style.opacity=Math.min(this._alpha,this.parent.options.global.opacity)+""},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"border",{get:function(){return this._border},set:function(t){this._ this._shadow},set:function(t){this._shadow=t,this._shadow&#124;&#124;this._toggleClass("no-shadow",!0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"font",{get:function(){return this._font},set:function(t){this._font=t,0<this._font.length?this.dom.style.fontfamily=this._font:this.dom.style.fontfamily=""},enumerable:!0,configurable:!0}),object.defineproperty(a.prototype,"transform",{get:function(){return this._transform.flatArray},set:function(t){this._transform=new CommentUtils.Matrix3D(t),null!==this.dom&&(this.dom.style.transform=this._transform.toCss())},enumerable:!0,configurable:!0}),a.prototype.time=function(t){this.ttl-=t,this.ttl<0&&(this.ttl=0),this.movable&&this.update(),this.ttl<=0&&this.finish()},a.prototype.update=function(){this.animate()},a.prototype.invalidate=function(){this._x=null,this._y=null,this._ r in t)if(t.hasOwnProperty(r)){var i=t[r];this[r]=i.easing(Math.min(Math.max(e-i.delay,0),i.dur),i.from,i.to-i.from,i.dur)}},a.prototype.animate=function(){if(this._alphaMotion&&(this.alpha=(this.dur-this.ttl)*(this._alphaMotion.to-this._alphaMotion.from)/this.dur+this._alphaMotion.from),0!==this.motion.length){var t=Math.max(this.ttl,0),e=this.dur-t-this._motionStart[this._curMotion];return this._execMotion(this.motion[this._curMotion],e),this.dur-t>this._motionEnd[this._curMotion]?(this._curMotion++,void(this._curMotion>=this.motion.length&&(this._curMotion=this.motion.length-1))):void 0}},a.prototype.stop=function(){},a.prototype.finish=function(){this.parent.finish(this)},a.prototype.toString=function(){return["[",this.stime,"&#124;",this.ttl,"/",this.dur,"]","(",this.mode,")",this.text].join("")},a.LINEAR=function(t,e,r,i){return t*r/i+e},a}(),ScrollComment=function(i){function t(t,e){var r=i.call(this,t,e)&#124;&#124;this;return r.dur*=r.parent.options.scroll.scale,r.ttl*=r.parent.options.scroll.scale,r}return __extends(t,i),Object.defineProperty(t.prototype,"alpha",{set:function(t){this._alpha=t,this.dom.style.opacity=Math.min(Math.min(this._alpha,this.parent.options.global.opacity),this.parent.options.scroll.opacity)+""},enumerable:!0,configurable:!0}),t.prototype.init=function(t){void 0===t&&(t=null),i.prototype.init.call(this,t),this.x=this.parent.width,this.parent.options.scroll.opacity<1&&(this.alpha=this._alpha),this.absolute=!0},t.prototype.update=function(){this.x=this.ttl/this.dur*(this.parent.width+this.width)-this.width},t}(corecomment),commentfactory=function(){function e(){this._bindings={}}return e._simpleCssScrollingInitializer=function(t,e){var r=new CssScrollComment(t,e);switch(r.mode){case 1:r. 2:r. 6:r. r.init(),t.stage.appendChild(r.dom),r},e._simpleScrollingInitializer=function(t,e){var r=new ScrollComment(t,e);switch(r.mode){case 1:r. 2:r. 6:r. r.init(),t.stage.appendChild(r.dom),r},e._simpleAnchoredInitializer=function(t,e){var r=new CoreComment(t,e);switch(r.mode){case 4:r. 5:r. r.init(),t.stage.appendChild(r.dom),r},e._advancedCoreInitializer=function(t,e){var r=new CoreComment(t,e);return r.init(),r.transform=CommentUtils.Matrix3D.createRotationMatrix(0,e.rY,e.rZ).flatArray,t.stage.appendChild(r.dom),r},e.defaultFactory=function(){var t=new e;return t.bind(1,e._simpleScrollingInitializer),t.bind(2,e._simpleScrollingInitializer),t.bind(6,e._simpleScrollingInitializer),t.bind(4,e._simpleAnchoredInitializer),t.bind(5,e._simpleAnchoredInitializer),t.bind(7,e._advancedCoreInitializer),t.bind(17,e._advancedCoreInitializer),t},e.defaultCssRenderFactory=function(){var t=new e;return t.bind(1,e._simpleCssScrollingInitializer),t.bind(2,e._simpleCssScrollingInitializer),t.bind(6,e._simpleCssScrollingInitializer),t.bind(4,e._simpleAnchoredInitializer),t.bind(5,e._simpleAnchoredInitializer),t.bind(7,e._advancedCoreInitializer),t.bind(17,e._advancedCoreInitializer),t},e.defaultCanvasRenderFactory=function(){throw new Error("Not implemented")},e.defaultSvgRenderFactory=function(){throw new Error("Not implemented")},e.prototype.bind=function(t,e){this._bindings[t]=e},e.prototype.canCreate=function(t){return this._bindings.hasOwnProperty(t.mode)},e.prototype.create=function(t,e){if(null===e&#124;&#124;!e.hasOwnProperty("mode"))throw new Error("Comment format incorrect");if(!this._bindings.hasOwnProperty(e.mode))throw new Error("No binding for comment type "+e.mode);return this._bindings[e.mode](t,e)},e}(),CommentSpaceAllocator=(__extends=this&&this.__extends&#124;&#124;function(){var i=Object.setPrototypeOf&#124;&#124;{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}&#124;&#124;function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};return function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}}(),function(){function t(t,e){void 0===t&&(t=0),void 0===e&&(e=0),this._pools=[[]],this.avoid=1,this._ t.prototype.willCollide=function(t,e){return t.stime+t.ttl>=e.stime+e.ttl/2},t.prototype.pathCheck=function(t,e,r){for(var i=t+e.height,n=e.right,o=0;o<r.length;o++)if(!(r[o].y>i&#124;&#124;r[o].bottom<t)){if(!(r[o].right<e.x&#124;&#124;r[o].x>n))return!1;if(this.willCollide(r[o],e))return!1}return!0},t.prototype.assign=function(t,e){for(;this._pools.length<=e;)this._pools.push([]);var r=this._pools[e];if(0===r.length)return t.cindex=e,0;if(this.pathCheck(0,t,r))return t.cindex=e,0;for(var i=0,n=0;n<r.length&&!((i=r[n].bottom+this.avoid)+t.height>this._height);n++)if(this.pathCheck(i,t,r))return t.cindex=e,i;return this.assign(t,e+1)},t.prototype.add=function(t){t.height>this._height?(t.cindex=-2,t.y=0):(t.y=this.assign(t,0),BinArray.binsert(this._pools[t.cindex],t,function(t,e){return t.bottom<e.bottom?-1:t.bottom>e.bottom?1:0}))},t.prototype.remove=function(t){if(!(t.cindex<0)){if(t.cindex>=this._pools.length)throw new Error("cindex out of bounds");var e=this._pools[t.cindex].indexOf(t);e<0&#124;&#124;this._pools[t.cindex].splice(e,1)}},t.prototype.setbounds=function(t,e){this._ t(){return null!==e&&e.apply(this,arguments)&#124;&#124;this}return __extends(t,e),t.prototype.add=function(t){e.prototype.add.call(this,t),t.x=(this._width-t.width)/2},t.prototype.willCollide=function(t,e){return!0},t.prototype.pathCheck=function(t,e,r){for(var i=t+e.height,n=0;n<r.length;n++)if(!(r[n].y>i&#124;&#124;r[n].bottom<t))return!1;return!0},t}(commentspaceallocator);!function(t){var e=function(){function h(t){if(this._internalArray=null,!Array.isArray(t))throw new Error("Not an array. Cannot construct matrix.");if(16!=t.length)throw new Error("Illegal Dimensions. Matrix3D should be 4x4 matrix.");this._internalArray=t}return Object.defineProperty(h.prototype,"flatArray",{get:function(){return this._internalArray.slice(0)},set:function(t){throw new Error("Not permitted. Matrices are immutable.")},enumerable:!0,configurable:!0}),h.prototype.isIdentity=function(){return this.equals(h.identity())},h.prototype.dot=function(t){for(var e=this._internalArray.slice(0),r=t._internalArray.slice(0),i=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],n=0;n<4;n++)for(var o=0;o<4;o++)for(var s=0;s<4;s++)i[4*n+o]+=e[4*n+s]*r[4*s+o];return new h(i)},h.prototype.equals=function(t){for(var e=0;e<16;e++)if(this._internalarray[e]!==t._internalarray[e])return!1;return!0},h.prototype.tocss=function(){for(var t=this._internalArray.slice(0),e=0;e<t.length;e++)math.abs(t[e])<1e-6&&(t[e]=0);return"matrix3d("+t.join(",")+")"},h.identity=function(){return new h([1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1])},h.createScaleMatrix=function(t,e,r){return new h([t,0,0,0,0,e,0,0,0,0,r,0,0,0,0,1])},h.createRotationMatrix=function(t,e,r){var i=Math.PI/180,n=e*i,o=r*i,s=Math.cos,a=Math.sin;return new h([s(n)*s(o),s(n)*a(o),a(n),0,-a(o),s(o),0,0,-a(n)*s(o),-a(n)*a(o),s(n),0,0,0,0,1].map(function(t){return 1e-10*Math.round(1e10*t)}))},h}();t.Matrix3D=e}(CommentUtils&#124;&#124;(CommentUtils={}));__extends=this&&this.__extends&#124;&#124;function(){var i=Object.setPrototypeOf&#124;&#124;{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}&#124;&#124;function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};return function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}}();var CssCompatLayer=function(){function t(){}return t.transform=function(t,e){t.style.transform=e,t.style.webkitTransform=e,t.style.msTransform=e,t.style.oTransform=e},t}(),CssScrollComment=function(e){function t(){var t=null!==e&&e.apply(this,arguments)&#124;&#124;this;return t._dirtyCSS=!0,t}return __extends(t,e),t.prototype.init=function(t){void 0===t&&(t=null),e.prototype.init.call(this,t),this._toggleClass("css-optimize",!0)},Object.defineProperty(t.prototype,"x",{get:function(){return this.ttl/this.dur*(this.parent.width+this.width)-this.width},set:function(t){if(null!==this._x&&"number"==typeof this._x){var e=t-this._x;this._x=t,CssCompatLayer.transform(this.dom,"translateX("+(this.axis%2==0?e:-e)+"px)")}else this._x=t,this.absolute&#124;&#124;(this._x*=this.parent.width),this.axis%2==0?this.dom.style.left=this._x+(this.align%2==0?0:-this.width)+"px":this.dom.style.right=this._x+(this.align%2==0?-this.width:0)+"px"},enumerable:!0,configurable:!0}),t.prototype.update=function(){this._dirtyCSS&&(this.dom.style.transition="transform "+this.ttl+"ms linear",this.x=-this.width,this._dirtyCSS=!1)},t.prototype.invalidate=function(){e.prototype.invalidate.call(this),this._dirtyCSS=!0},t.prototype.stop=function(){e.prototype.stop.call(this),this.dom.style.transition="",this.x=this._x,this._x=null,this.x=this.x,this._dirtyCSS=!0},t}(ScrollComment),CommentFilter=function(){function t(){this.rules=[],this.modifiers=[],this.allowUnknownTypes=!0,this.allowTypes={1:!0,2:!0,4:!0,5:!0,6:!0,7:!0,8:!0,17:!0}}return t.prototype.doModify=function(t){return this.modifiers.reduce(function(t,e){return e(t)},t)},t.prototype.beforeSend=function(t){return t},t.prototype.doValidate=function(r){return!!r.hasOwnProperty("mode")&&(!((!this.allowUnknownTypes&#124;&#124;r.mode.toString()in this.allowTypes)&&!this.allowTypes[r.mode.toString()])&&this.rules.every(function(t){try{var e=function e(t,r){for(var i=t.subject.split("."),n=r;0<i.length;){var o=i.shift();if(""!==o&&(n.hasOwnProperty(o)&&(n=n[o]),null==n)){n=null;break}}if(null===n)return!0;switch(t.op){case"<":return n<t.value;case">":return n>t.value;case"~":case"regexp":return new RegExp(t.value).test(n.toString());case"=":case"eq":return t.value===("number"==typeof n?n:n.toString());case"!":case"not":return!e(t.value,n);case"&&":case"and":return!!Array.isArray(t.value)&&t.value.every(function(t){return e(t,n)});case"&#124;&#124;":case"or":return!!Array.isArray(t.value)&&t.value.some(function(t){return e(t,n)});default:return!1}}(t,r)}catch(t){e=!1}return"accept"===t.mode?e:!e}))},t.prototype.addRule=function(t){if("accept"!==t.mode&&"reject"!==t.mode)throw new Error("Rule must be of accept type or reject type.");this.rules.push(t)},t.prototype.removeRule=function(t){var e=this.rules.indexOf(t);return 0<=e&&(this.rules.splice(e,1),!0)},t.prototype.addmodifier=function(t){if("function"!=typeof t)throw new Error("Modifiers need to be functions.");this.modifiers.push(t)},t}(),CommentProvider=function(){function n(){this._started=!1,this._destroyed=!1,this._staticSources={},this._dynamicSources={},this._parsers={},this._targets=[]}return n.SOURCE_JSON="JSON",n.SOURCE_XML="XML",n.SOURCE_,n.BaseHttpProvider=function(s,a,h,l,c){return new Promise(function(t,e){var r=new XMLHttpRequest,i=a;if(l&&("POST"===s&#124;&#124;"PUT"===s)){i+="?";var n=[];for(var o in l)l.hasOwnProperty(o)&&n.push(encodeURIComponent(o)+"="+encodeURIComponent(l[o]));i+=n.join("&")}r. Error(this.status+" "+this.statusText))},r.onerror=function(){e(new Error(this.status+" "+this.statusText))},r.open(s,i),r.responseType="string"==typeof h?h:"",void 0!==c?r.send(c):r.send()})},n.JSONProvider=function(t,e,r,i){return n.BaseHttpProvider(t,e,"json",r,i).then(function(t){return t})},n.XMLProvider=function(t,e,r,i){return n.BaseHttpProvider(t,e,"document",r,i).then(function(t){return t})},n.TextProvider=function(t,e,r,i){return n.BaseHttpProvider(t,e,"text",r,i).then(function(t){return t})},n.prototype.addStaticSource=function(t,e){if(this._destroyed)throw new Error("Comment provider has been destroyed, cannot attach more sources.");return e in this._staticSources&#124;&#124;(this._staticSources[e]=[]),this._staticSources[e].push(t),this},n.prototype.addDynamicSource=function(t,e){if(this._destroyed)throw new Error("Comment provider has been destroyed, cannot attach more sources.");return e in this._dynamicSources&#124;&#124;(this._dynamicSources[e]=[]),this._dynamicSources[e].push(t),this},n.prototype.add new Error("Comment provider has been destroyed, cannot attach more targets.");if(!(t instanceof CommentManager))throw new Error("Expected the target to be an instance of CommentManager.");return this._targets.push(t),this},n.prototype.addParser=function(t,e){if(this._destroyed)throw new Error("Comment provider has been destroyed, cannot attach more parsers.");return e in this._parsers&#124;&#124;(this._parsers[e]=[]),this._parsers[e].unshift(t),this},n.prototype.applyParsersOne=function(n,o){return new Promise(function(t,e){if(o in this._parsers){for(var r=0;r<this._parsers[o].length;r++){var i=null;try{i=this._parsers[o][r].parseOne(n)}catch(t){console.error(t)}if(null!==i)return void t(i)}e(new Error("Ran out of parsers for they target type"))}else e(new Error('No parsers defined for "'+o+'"'))}.bind(this))},n.prototype.applyParsersList=function(n,o){return new Promise(function(t,e){if(o in this._parsers){for(var r=0;r<this._parsers[o].length;r++){var i=null;try{i=this._parsers[o][r].parseMany(n)}catch(t){console.error(t)}if(null!==i)return void t(i)}e(new Error("Ran out of parsers for the target type"))}else e(new Error('No parsers defined for "'+o+'"'))}.bind(this))},n.prototype.load=function(){if(this._destroyed)throw new Error("Cannot load sources on a destroyed provider.");var t=[];for(var e in this._staticSources)t.push(Promises.any(this._staticSources[e]).then(function(t){return this.applyParsersList(t,e)}.bind(this)));return 0===t.length?Promise.resolve([]):Promises.any(t).then(function(t){for(var e=0;e<this._targets.length;e++)this._targets[e].load(t);return Promise.resolve(t)}.bind(this))},n.prototype.start=function(){if(this._destroyed)throw new Error("Cannot start a provider that has been destroyed.");return this._started=!0,this.load().then(function(t){for(var r in this._dynamicSources)this._dynamicSources[r].forEach(function(t){t.addEventListener("receive",function(t){for(var e=0;e<this._targets.length;e++)this._targets[e].send(this.applyparserone(t,r))}.bind(this))}.bind(this));return Promise.resolve(t)}.bind(this))},n.prototype.send=function(t,e){throw new Error("Not implemented")},n.prototype.destroy=function(){return this._destroyed&#124;&#124;(this._destroyed=!0),Promise.resolve()},n}(),Promises=function(){var t={any:function(s){return Array.isArray(s)?0===s.length?Promise.reject():new Promise(function(e,r){for(var i=!1,n=0,o=[],t=0;t<s.length;t++)s[t].then(function(t){n++,i&#124;&#124;(i=!0,e(t))}).catch(function(e){return function(t){n++,o[e]=t,n===s.length&&(i&#124;&#124;r(o))}}(t))}):Promise.resolve(s)}};return t}(),BilibiliFormat=function(){var e={},y=function(t){if("["!==t.charAt(0))return t;switch(t.charAt(t.length-1)){case"]":return t;case'"':return t+"]";case",":return t.substring(0,t.length-1)+'"]';default:return y(t.substring(0,t.length-1))}},o=function(t){return t=(t=(t=(t=t.replace(new RegExp("</([^d])","g"),"</disabled 1ドル")).replace(new RegExp("</(s{2,})","g"),"</disabled 1ドル")).replace(new RegExp("<([^d/]w*?)","g"),"<disabled 1ドル")).replace(new RegExp("<([^/ ]{2,}W*?)","g"),"<disabled 1ドル")};return e.XMLParser=function(t){this._attemptFix=!0,this._logBadComments=!0,"object"==typeof t&&(this._attemptFix=!1!==t.attemptFix,this._logBadComments=!1!==t.logBadComments)},e.XMLParser.prototype.parseOne=function(t){try{var e=t.getAttribute("p").split(",")}catch(t){return null}var r=t.textContent,i={};if(i.stime=Math.round(1e3*parseFloat(e[0])),i.size=parseInt(e[2]),i.color=parseInt(e[3]),i.mode=parseInt(e[1]),i.date=parseInt(e[4]),i.pool=parseInt(e[5]),i.position="absolute",null!=e[7]&&(i.dbid=parseInt(e[7])),i.hash=e[6],i. if(7===i.mode)try{this._attemptFix&&(r=y(r).replace(/\t/,"\\t"));var n=JSON.parse(r);if(i.shadow=!0,i.x=parseFloat(n[0]),i.y=parseFloat(n[1]),(Math.floor(i.x)<i.x&#124;&#124;math.floor(i.y)<i.y)&&(i.position="relative"),i.\n"),i.rz=0,i.ry=0,7<=n.length&&(i.rz=parseint(n[5],10),i.ry=parseint(n[6],10)),i.motion=[],i.movable=!1,11<=n.length){i.movable=!0;var" o=500,s={x:{from:i.x,to:parseFloat(n[7]),dur:o,delay:0},y:{from:i.y,to:parseFloat(n[8]),dur:o,delay:0}};if(""!==n[9]&&(o=parseInt(n[9],10),s.x.dur=o,s.y.dur=o),""!==n[10]&&(s.x.delay=parseInt(n[10],10),s.y.delay=parseInt(n[10],10)),11<n.length&&(i.shadow="false"!==n[11]&&!1!==n[11],null!=n[12]&&(i.font=n[12]),14<n.length)){"relative"===i.position&&(this._logbadcomments&&console.warn("cannot mix relative and absolute positioning!"),i.position="absolute");for(var a=n[14],h={x:s.x.from,y:s.y.from},l=[],c=new RegExp("([a-zA-Z])\\s*(\\d+)[, ](\\d+)","g"),p=a.split(/[a-zA-Z]/).length-1,u=c.exec(a);null!==u;){switch(u[1]){case"M":h.x=parseInt(u[2],10),h.y=parseInt(u[3],10);break;case"L":l.push({x:{from:h.x,to:parseInt(u[2],10),dur:o/p,delay:0},y:{from:h.y,to:parseInt(u[3],10),dur:o/p,delay:0}}),h.x=parseInt(u[2],10),h.y=parseInt(u[3],10)}u=c.exec(a)}s=null,i.motion=l}null!==s&&i.motion.push(s)}i.dur=2500,n[3]<12&&(i.dur=1e3*n[3]);var d=n[2].split("-");if(null!=d&&1<d.length){var f=parseFloat(d[0]),m=parseFloat(d[1]);(i.opacity=f)!==m&&(i.alpha={from:f,to:m})}}catch(t){this._logBadComments&&(console.warn("Error occurred in JSON parsing. Could not parse comment."),console.log("[DEBUG] "+r))}else 8===i.mode?i.code=r:this._logBadComments&&(console.warn("Unknown comment type : "+i.mode+". Not doing further parsing."),console.log("[DEBUG] "+r));return null!==i.text&&"string"==typeof i.text&&(i.█")),i},e.XMLParser.prototype.parseMany=function(t){var" e=[];try{e=t.getElementsByTagName("d")}catch(t){return null}for(var r=[],i=0;i<e.length;i++){var n=this.parseOne(e[i]);null!==n&&r.push(n)}return r},e.TextParser=function(t){this._allowInsecureDomParsing=!0,this._attemptEscaping=!0,this._canSecureNativeParse=!1,"object"==typeof t&&(this._allowInsecureDomParsing=!1!==t.allowInsecureDomParsing,this._attemptEscaping=!1!==t.attemptEscaping),"undefined"!=typeof document&&document&&document.createElement&#124;&#124;(this._allowInsecureDomParsing=!1),"undefined"!=typeof DOMParser&&null!==DOMParser&&(this._canSecureNativeParse=!0),(this._allowInsecureDomParsing&#124;&#124;this._canSecureNativeParse)&&(this._xmlParser=new e.XMLParser(t))},e.TextParser.prototype.parseOne=function(t){if(this._allowInsecureDomParsing){var e=t;this._attemptEscaping&&(e=o(e));var r=document.createElement("div");r.innerHTML=e;var i=r.getElementsByTagName("d");return 1!==i.length?null:this._xmlParser.parseOne(i[0])}if(this._canSecureNativeParse){var n=new DOMParser;return this._xmlParser.parseOne(n.parseFromString(t,"application/xml"))}throw new Error("Secure native js parsing not implemented yet.")},e.TextParser.prototype.parseMany=function(t){if(this._allowInsecureDomParsing){var e=t;this._attemptEscaping&&(e=o(e));var r=document.createElement("div");return r.innerHTML=e,this._xmlParser.parseMany(r)}if(this._canSecureNativeParse){var i=new DOMParser;return this._xmlParser.parseMany(i.parseFromString(t,"application/xml"))}throw new Error("Secure native js parsing not implemented yet.")},e}(),AcfunFormat=function(){var e={JSONParser:function(t){this._logBadComments=!0,this._logNotImplemented=!1,"object"==typeof t&&(this._logBadComments=!1!==t.logBadComments,this._logNotImplemented=!0===t.logNotImplemented)}};return e.JSONParser.prototype.parseOne=function(t){var e={};if("object"!=typeof t&#124;&#124;null==t&#124;&#124;!t.hasOwnProperty("c"))return null;var r=t.c.split(",");if(6<=r.length){if(e.stime=1e3*parsefloat(r[0]),e.color=parseint(r[1]),e.mode=parseint(r[2]),e.size=parseint(r[3]),e.hash=r[4],e.date=parseint(r[5]),e.position="absolute",7!==e.mode)e.\n"),e.text=e.text.replace(/\r/g,"\n"),e.text=e.text.replace(/\s/g," ");else{try{var" i=JSON.parse(t.m)}catch(t){return this._logBadComments&&(console.warn("Error parsing internal data for comment"),console.log("[Dbg] "+e.text)),null}if(e.position="relative",e. /g," "),"number"==typeof i.a?e.opacity=i.a:e.opacity=1,"object"==typeof i.p?(e.x=i.p.x/1e3,e.y=i.p.y/1e3):(e.x=0,e.y=0),"number"==typeof i.c)switch(i.c){case 0:e. 2:e. 6:e. 8:e. handle aligning to center! AlignMode="+i.c)}if(e.axis=0,e.shadow=i.b,e.dur=4e3,"number"==typeof i.l&&(e.dur=1e3*i.l),null!=i.z&&0<i.z.length){e.movable=!0,e.motion=[];for(var n=0,o={x:e.x,y:e.y,alpha:e.opacity,color:e.color},s=0;s<i.z.length;s++){var a=null!=i.z[s].l?1e3*i.z[s].l:500;n+=a;var h={};i.z[s].hasOwnProperty("rx")&&"number"==typeof i.z[s].rx&&this._logNotImplemented&&console.log("Encountered animated x-axis rotation. Ignoring."),i.z[s].hasOwnProperty("e")&&"number"==typeof i.z[s].e&&this._logNotImplemented&&console.log("Encountered animated y-axis rotation. Ignoring."),i.z[s].hasOwnProperty("d")&&"number"==typeof i.z[s].d&&this._logNotImplemented&&console.log("Encountered animated z-axis rotation. Ignoring."),i.z[s].hasOwnProperty("x")&&"number"==typeof i.z[s].x&&(h.x={from:o.x,to:i.z[s].x/1e3,dur:a,delay:0}),i.z[s].hasOwnProperty("y")&&"number"==typeof i.z[s].y&&(h.y={from:o.y,to:i.z[s].y/1e3,dur:a,delay:0}),o.x=h.hasOwnProperty("x")?h.x.to:o.x,o.y=h.hasOwnProperty("y")?h.y.to:o.y,i.z[s].hasOwnProperty("t")&&"number"==typeof i.z[s].t&&i.z[s].t!==o.alpha&&(h.alpha={from:o.alpha,to:i.z[s].t,dur:a,delay:0},o.alpha=h.alpha.to),i.z[s].hasOwnProperty("c")&&"number"==typeof i.z[s].c&&i.z[s].c!==o.color&&(h.color={from:o.color,to:i.z[s].c,dur:a,delay:0},o.color=h.color.to),e.motion.push(h)}e.dur=n+(e.moveDelay?e.moveDelay:0)}i.hasOwnProperty("w")&&(i.w.hasOwnProperty("f")&&(e.font=i.w.f),i.w.hasOwnProperty("l")&&Array.isArray(i.w.l)&&0<i.w.l.length&&this._lognotimplemented&&console.log("[dbg] Filters not supported! "+JSON.stringify(i.w.l))),null!=i.r&&null!=i.k&&(e.rX=i.r,e.rY=i.k)}return e}return this._logBadComments&&(console.warn("Dropping this comment due to insufficient parameters. Got: "+r.length),console.log("[Dbg] "+t.c)),null},e.JSONParser.prototype.parseMany=function(t){if(!Array.isArray(t))return null;for(var e=[],r=0;r<t.length;r++){var i=this.parseOne(t[r]);null!==i&&e.push(i)}return e},e.TextParser=function(t){this._jsonParser=new e.JSONParser(t)},e.TextParser.prototype.parseOne=function(t){try{return this._jsonParser.parseOne(JSON.parse(t))}catch(t){return console.warn(t),null}},e.TextParser.prototype.parseMany=function(t){try{return this._jsonParser.parseMany(JSON.parse(t))}catch(t){return console.warn(t),null}},e}(),CommonDanmakuFormat=function(){var t={},e=function(t){return"number"==typeof t.mode&&"number"==typeof t.stime&&((8!==t.mode&#124;&#124;"string"==typeof t.code)&&"string"==typeof t.text)};return t.JSONParser=function(){},t.JSONParser.prototype.parseOne=function(t){return e(t)?t:null},t.JSONParser.prototype.parseMany=function(t){return t.every(e)?t:null},t.XMLParser=function(){},t.XMLParser.prototype.parseOne=function(t){var e={};try{e.stime=parseInt(t.getAttribute("stime")),e.mode=parseInt(t.getAttribute("mode")),e.size=parseInt(t.getAttribute("size")),e.color=parseInt(t.getAttribute("color")),e. null}return e},t.XMLParser.prototype.parseMany=function(t){try{var e=t.getElementsByTagName("comment")}catch(t){return null}for(var r=[],i=0;i<e.length;i++){var n=this.parseOne(e[i]);null!==n&&r.push(n)}return r},t}(); \ No newline at end of file +var CommentUtils,BinArray=function(){var n={bsearch:function(t,e,r){if(!Array.isArray(t))throw new Error("Bsearch can only be run on arrays");if(0===t.length)return 0;if(r(e,t[0])<0)return 0;if(0<=r(e,t[t.length-1]))return t.length;for(var i=0,n=0,o=0,s=t.length-1;i<=s;){if(o++,0<=r(e,t[(n=math.floor((s+i+1)/2))-1])&&r(e,t[n])<0)return n;if(r(e,t[n-1])<0)s=n-1;else{if(!(0<=r(e,t[n])))throw new Error("Program Error. Inconsistent comparator or unsorted array!");i=n}if(1500<o)throw new Error("Iteration depth exceeded. Inconsistent comparator or astronomical dataset!")}return-1},binsert:function(t,e,r){var i=n.bsearch(t,e,r);return t.splice(i,0,e),i}};return n}(),CommentManager=function(){var e=function(t,e){return t.stime>e.stime?2:t.stime<e.stime?-2:t.date>e.date?1:t.date<e.date?-1:null!=t.dbid&&null!=e.dbid?t.dbid>e.dbid?1:t.dbid<e.dbid?-1:0:0};function t(t){var i=0;this._listeners={},this._lastPosition=0,this.stage=t,this.options={global:{opacity:1,scale:1,className:"cmt"},scroll:{opacity:1,scale:1},limit:0,seekTrigger:2e3},this.timeline=[],this.runline=[],this.position=0,this.factory=null,this.filter=null,this.csa={scroll:new CommentSpaceAllocator(0,0),top:new AnchorCommentSpaceAllocator(0,0),bottom:new AnchorCommentSpaceAllocator(0,0),reverse:new CommentSpaceAllocator(0,0),scrollbtm:new CommentSpaceAllocator(0,0)},this. e=(new Date).getTime(),r=this;i=window.setInterval(function(){var t=(new Date).getTime()-e;e=(new Date).getTime(),r.onTimerEvent(t,r)},10)}},this._stopTimer=function(){window.clearInterval(i),i=0}}return t.prototype.stop=function(){this._stopTimer(),this.runline.forEach(function(t){t.stop()})},t.prototype.start=function(){this._startTimer()},t.prototype.seek=function(t){this.position=BinArray.bsearch(this.timeline,t,function(t,e){return t<e.stime?-1:t>e.stime?1:0})},t.prototype.validate=function(t){return null!=t&&this.filter.doValidate(t)},t.prototype.load=function(t){this.timeline=t,this.timeline.sort(e),this.dispatchEvent("load")},t.prototype.insert=function(t){BinArray.binsert(this.timeline,t,e)<=this.position&&this.position++,this.dispatchevent("insert")},t.prototype.clear=function(){for(;0<this.runline.length;)this.runline[0].finish();this.dispatchevent("clear")},t.prototype.setbounds=function(){for(var t in this.resize"),this.csa)this.csa[t].setBounds(this.width,this.height);this.stage.style.perspective=this.width/Math.tan(55*Math.PI/180)/2+"px",this.stage.style.webkitPerspective=this.width/Math.tan(55*Math.PI/180)/2+"px"},t.prototype.init=function(t){if(this.setBounds(),null==this.filter&&(this.filter=new" CommentFilter),null==this.factory)switch(t){case"legacy":this.factory=CommentFactory.defaultFactory();break;default:case"css":this.factory=CommentFactory.defaultCssRenderFactory()}},t.prototype.time=function(t){if(t-=1,this.position>=this.timeline.length&#124;&#124;Math.abs(this._lastPosition-t)>=this.options.seekTrigger){if(this.seek(t),this._lastPosition=t,this.timeline.length<=this.position)return}else this._lastPosition=t;for(var e=[];this.position<this.timeline.length&&this.timeline[this.position].stime<=t;this.position++)0<this.options.limit&&this.runline.length+e.length>=this.options.limit&#124;&#124;this.validate(this.timeline[this.position])&&e.push(this.timeline[this.position]);0<e.length&&this.send(e)},t.prototype.rescale=function(){},t.prototype._preprocess=function(t){return 8===t.mode?(console.log(t),this.scripting&&console.log(this.scripting.eval(t.code)),null):(null!=this.filter&&(t=this.filter.doModify(t)),t)},t.prototype._allocateSpace=function(t){switch(t.mode){default:case 1:this.csa.scroll.add(t);break;case 2:this.csa.scrollbtm.add(t);break;case 4:this.csa.bottom.add(t);break;case 5:this.csa.top.add(t);break;case 6:this.csa.reverse.add(t);break;case 7:case 17:}},t.prototype.send=function(t){Array.isArray(t)&#124;&#124;(t=[t]),0!==(t=t.map(this._preprocess.bind(this)).filter(function(t){return null!==t})).length&&t.map(function(t){return this.factory.create(this,t)}.bind(this)).map(function(t){return this._allocateSpace(t),t}.bind(this)).forEach(function(t){t.y=t.y,this.dispatchEvent("enterComment",t),this.runline.push(t)}.bind(this))},t.prototype.finish=function(t){this.dispatchEvent("exitComment",t),this.stage.removeChild(t.dom);var e=this.runline.indexOf(t);switch(0<=e&&this.runline.splice(e,1),t.mode){default:case 1:this.csa.scroll.remove(t);break;case 2:this.csa.scrollbtm.remove(t);break;case 4:this.csa.bottom.remove(t);break;case 5:this.csa.top.remove(t);break;case 6:this.csa.reverse.remove(t);break;case 7:}},t.prototype.addEventListener=function(t,e){void 0!==this._listeners[t]?this._listeners[t].push(e):this._listeners[t]=[e]},t.prototype.dispatchEvent=function(t,e){if(void 0!==this._listeners[t])for(var r=0;r<this._listeners[t].length;r++)try{this._listeners[t][r](e)}catch(t){console.error(t.stack)}},t.prototype.ontimerevent=function(t,e){for(var r=0;r<e.runline.length;r++){e.runline[r].time(t)}},t}(),__extends=this&&this.__extends&#124;&#124;function(){var i=Object.setPrototypeOf&#124;&#124;{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}&#124;&#124;function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};return function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}}(),CoreComment=function(){function a(t,e){if(void 0===e&&(e={}),this.mode=1,this.stime=0,this.,this.ttl=4e3,this.dur=4e3,this.cindex=-1,this.motion=[],this.movable=!0,this._alphaMotion=null,this.absolute=!0,this. new Error("Comment not bound to comment manager.");if(this.parent=t,e.hasOwnProperty("stime")&&(this.stime=e.stime),e.hasOwnProperty("mode")?this.mode=e.mode:this.mode=1,e.hasOwnProperty("dur")&&(this.dur=e.dur,this.ttl=this.dur),this.dur*=this.parent.options.global.scale,this.ttl*=this.parent.options.global.scale,e.hasOwnProperty("text")&&(this.motion")){this._motionStart=[],this._motionEnd=[],this.motion=e.motion;for(var" r=0,i=0;i<e.motion.length;i++){this._motionstart.push(r);var n=0;for(var o in e.motion[i]){var s=e.motion[i][o];n=Math.max(s.dur+s.delay,n),null!==s.easing&&void 0!==s.easing&#124;&#124;(e.motion[i][o].easing=a.LINEAR)}r+=n,this._motionEnd.push(r)}this._curMotion=0}e.hasOwnProperty("color")&&(this._color=e.color),e.hasOwnProperty("size")&&(this._size=e.size),e.hasOwnProperty("border")&&(this._ CommentUtils.Matrix3D(e.transform)),e.hasOwnProperty("position")&&"relative"===e.position&&(this.absolute=!1,this.mode<7&&console.warn("using relative position for CSA comment.")),e.hasOwnProperty("className")&&(this._className=e.className)}return a.prototype._toggleClass=function(t,e){if(void 0===e&&(e=!1),this.dom)if(this.dom.classList)this.dom.classList.toggle(t,e);else{var r=this.dom.className.split(" "),i=r.indexOf(t);0<=i&&!e?(r.splice(i,1),this.dom.classname=r.join(" ")):i<0&&e&&(r.push(t),this.dom.classname=r.join(" "))}},a.prototype.init=function(t){void 0===t&&(t=null),this.dom=null!==t?t.dom:document.createElement("div"),this.dom.appendChild(document.createTextNode(this.text)),this.dom.textContent=this.text,this.dom.inner"!==this._font&&(this.font=this._font),void" 0!==this._x&&(this.x=this._x),void 0!==this._y&&(this.y=this._y),(1!==this._alpha&#124;&#124;this.parent.options.global.opacity<1)&&(this.alpha=this._alpha),null===this._transform&#124;&#124;this._transform.isidentity()&#124;&#124;(this.transform=this._transform.flatarray),0<this.motion.length&&this.animate()},object.defineproperty(a.prototype,"x",{get:function(){return null!==this._x&&void 0!==this._x&#124;&#124;(this.axis%2==0?this.align%2==0?this._x=this.dom.offsetLeft:this._x=this.dom.offsetLeft+this.width:this.align%2==0?this._x=this.parent.width-this.dom.offsetLeft:this._x=this.parent.width-this.dom.offsetLeft-this.width),this.absolute?this._x:this._x/this.parent.width},set:function(t){this._x=t,this.absolute&#124;&#124;(this._x*=this.parent.width),this.axis%2==0?this.dom.style.left=this._x+(this.align%2==0?0:-this.width)+"px":this.dom.style.right=this._x+(this.align%2==0?-this.width:0)+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"y",{get:function(){return null!==this._y&&void 0!==this._y&#124;&#124;(this.axis<2?this.align<2?this._y=this.dom.offsettop:this._y=this.dom.offsettop+this.height:this.align<2?this._y=this.parent.height-this.dom.offsettop:this._y=this.parent.height-this.dom.offsettop-this.height),this.absolute?this._y:this._y/this.parent.height},set:function(t){this._y=t,this.absolute&#124;&#124;(this._y*=this.parent.height),this.axis<2?this.dom.style.top=this._y+(this.align<2?0:-this.height)+"px":this.dom.style.bottom=this._y+(this.align<2?-this.height:0)+"px"},enumerable:!0,configurable:!0}),object.defineproperty(a.prototype,"bottom",{get:function(){var t=Math.floor(this.axis/2)===Math.floor(this.align/2);return this.y+(t?this.height:0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"right",{get:function(){var t=this.axis%2==this.align%2;return this.x+(t?this.width:0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"this.dom.offsetWidth),this._width},set:function(t){this._width=t,this.dom.style.width=this._width+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"height",{get:function(){return" void 0!==this._height&&null!==this._height&#124;&#124;(this._height="this.dom.offsetHeight),this._height},set:function(t){this._height=t,this.dom.style.height=this._height+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"size",{get:function(){return" this._size},set:function(t){this._size=t,this.dom.style.fontSize=this._size+"px"},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"color",{get:function(){return this._color},set:function(t){var e=(this._color=t).toString(16);e=6<=e.length?e:new Array(6-e.length+1).join("0")+e,this.dom.style.color="#"+e,0===this._color&&this._toggleClass("reverse-shadow",!0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"alpha",{get:function(){return this._alpha},set:function(t){this._alpha=t,this.dom.style.opacity=Math.min(this._alpha,this.parent.options.global.opacity)+""},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"border",{get:function(){return this._border},set:function(t){this._ this._shadow},set:function(t){this._shadow=t,this._shadow&#124;&#124;this._toggleClass("no-shadow",!0)},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"font",{get:function(){return this._font},set:function(t){this._font=t,0<this._font.length?this.dom.style.fontfamily=this._font:this.dom.style.fontfamily=""},enumerable:!0,configurable:!0}),object.defineproperty(a.prototype,"transform",{get:function(){return this._transform.flatArray},set:function(t){this._transform=new CommentUtils.Matrix3D(t),null!==this.dom&&(this.dom.style.transform=this._transform.toCss())},enumerable:!0,configurable:!0}),Object.defineProperty(a.prototype,"className",{get:function(){return this._className},set:function(t){this._className=t,this.dom.className=this.parent.options.global.className+" "+t},enumerable:!0,configurable:!0}),a.prototype.time=function(t){this.ttl-=t,this.ttl<0&&(this.ttl=0),this.movable&&this.update(),this.ttl<=0&&this.finish()},a.prototype.update=function(){this.animate()},a.prototype.invalidate=function(){this._x=null,this._y=null,this._ r in t)if(t.hasOwnProperty(r)){var i=t[r];this[r]=i.easing(Math.min(Math.max(e-i.delay,0),i.dur),i.from,i.to-i.from,i.dur)}},a.prototype.animate=function(){if(this._alphaMotion&&(this.alpha=(this.dur-this.ttl)*(this._alphaMotion.to-this._alphaMotion.from)/this.dur+this._alphaMotion.from),0!==this.motion.length){var t=Math.max(this.ttl,0),e=this.dur-t-this._motionStart[this._curMotion];return this._execMotion(this.motion[this._curMotion],e),this.dur-t>this._motionEnd[this._curMotion]?(this._curMotion++,void(this._curMotion>=this.motion.length&&(this._curMotion=this.motion.length-1))):void 0}},a.prototype.stop=function(){},a.prototype.finish=function(){this.parent.finish(this)},a.prototype.toString=function(){return["[",this.stime,"&#124;",this.ttl,"/",this.dur,"]","(",this.mode,")",this.text].join("")},a.LINEAR=function(t,e,r,i){return t*r/i+e},a}(),ScrollComment=function(i){function t(t,e){var r=i.call(this,t,e)&#124;&#124;this;return r.dur*=r.parent.options.scroll.scale,r.ttl*=r.parent.options.scroll.scale,r}return __extends(t,i),Object.defineProperty(t.prototype,"alpha",{set:function(t){this._alpha=t,this.dom.style.opacity=Math.min(Math.min(this._alpha,this.parent.options.global.opacity),this.parent.options.scroll.opacity)+""},enumerable:!0,configurable:!0}),t.prototype.init=function(t){void 0===t&&(t=null),i.prototype.init.call(this,t),this.x=this.parent.width,this.parent.options.scroll.opacity<1&&(this.alpha=this._alpha),this.absolute=!0},t.prototype.update=function(){this.x=this.ttl/this.dur*(this.parent.width+this.width)-this.width},t}(corecomment),commentfactory=function(){function e(){this._bindings={}}return e._simpleCssScrollingInitializer=function(t,e){var r=new CssScrollComment(t,e);switch(r.mode){case 1:r. 2:r. 6:r. r.init(),t.stage.appendChild(r.dom),r},e._simpleScrollingInitializer=function(t,e){var r=new ScrollComment(t,e);switch(r.mode){case 1:r. 2:r. 6:r. r.init(),t.stage.appendChild(r.dom),r},e._simpleAnchoredInitializer=function(t,e){var r=new CoreComment(t,e);switch(r.mode){case 4:r. 5:r. r.init(),t.stage.appendChild(r.dom),r},e._advancedCoreInitializer=function(t,e){var r=new CoreComment(t,e);return r.init(),r.transform=CommentUtils.Matrix3D.createRotationMatrix(0,e.rY,e.rZ).flatArray,t.stage.appendChild(r.dom),r},e.defaultFactory=function(){var t=new e;return t.bind(1,e._simpleScrollingInitializer),t.bind(2,e._simpleScrollingInitializer),t.bind(6,e._simpleScrollingInitializer),t.bind(4,e._simpleAnchoredInitializer),t.bind(5,e._simpleAnchoredInitializer),t.bind(7,e._advancedCoreInitializer),t.bind(17,e._advancedCoreInitializer),t},e.defaultCssRenderFactory=function(){var t=new e;return t.bind(1,e._simpleCssScrollingInitializer),t.bind(2,e._simpleCssScrollingInitializer),t.bind(6,e._simpleCssScrollingInitializer),t.bind(4,e._simpleAnchoredInitializer),t.bind(5,e._simpleAnchoredInitializer),t.bind(7,e._advancedCoreInitializer),t.bind(17,e._advancedCoreInitializer),t},e.defaultCanvasRenderFactory=function(){throw new Error("Not implemented")},e.defaultSvgRenderFactory=function(){throw new Error("Not implemented")},e.prototype.bind=function(t,e){this._bindings[t]=e},e.prototype.canCreate=function(t){return this._bindings.hasOwnProperty(t.mode)},e.prototype.create=function(t,e){if(null===e&#124;&#124;!e.hasOwnProperty("mode"))throw new Error("Comment format incorrect");if(!this._bindings.hasOwnProperty(e.mode))throw new Error("No binding for comment type "+e.mode);return this._bindings[e.mode](t,e)},e}(),CommentSpaceAllocator=(__extends=this&&this.__extends&#124;&#124;function(){var i=Object.setPrototypeOf&#124;&#124;{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}&#124;&#124;function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};return function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}}(),function(){function t(t,e){void 0===t&&(t=0),void 0===e&&(e=0),this._pools=[[]],this.avoid=1,this._ t.prototype.willCollide=function(t,e){return t.stime+t.ttl>=e.stime+e.ttl/2},t.prototype.pathCheck=function(t,e,r){for(var i=t+e.height,n=e.right,o=0;o<r.length;o++)if(!(r[o].y>i&#124;&#124;r[o].bottom<t)){if(!(r[o].right<e.x&#124;&#124;r[o].x>n))return!1;if(this.willCollide(r[o],e))return!1}return!0},t.prototype.assign=function(t,e){for(;this._pools.length<=e;)this._pools.push([]);var r=this._pools[e];if(0===r.length)return t.cindex=e,0;if(this.pathCheck(0,t,r))return t.cindex=e,0;for(var i=0,n=0;n<r.length&&!((i=r[n].bottom+this.avoid)+t.height>this._height);n++)if(this.pathCheck(i,t,r))return t.cindex=e,i;return this.assign(t,e+1)},t.prototype.add=function(t){t.height>this._height?(t.cindex=-2,t.y=0):(t.y=this.assign(t,0),BinArray.binsert(this._pools[t.cindex],t,function(t,e){return t.bottom<e.bottom?-1:t.bottom>e.bottom?1:0}))},t.prototype.remove=function(t){if(!(t.cindex<0)){if(t.cindex>=this._pools.length)throw new Error("cindex out of bounds");var e=this._pools[t.cindex].indexOf(t);e<0&#124;&#124;this._pools[t.cindex].splice(e,1)}},t.prototype.setbounds=function(t,e){this._ t(){return null!==e&&e.apply(this,arguments)&#124;&#124;this}return __extends(t,e),t.prototype.add=function(t){e.prototype.add.call(this,t),t.x=(this._width-t.width)/2},t.prototype.willCollide=function(t,e){return!0},t.prototype.pathCheck=function(t,e,r){for(var i=t+e.height,n=0;n<r.length;n++)if(!(r[n].y>i&#124;&#124;r[n].bottom<t))return!1;return!0},t}(commentspaceallocator);!function(t){var e=function(){function l(t){if(this._internalArray=null,!Array.isArray(t))throw new Error("Not an array. Cannot construct matrix.");if(16!=t.length)throw new Error("Illegal Dimensions. Matrix3D should be 4x4 matrix.");this._internalArray=t}return Object.defineProperty(l.prototype,"flatArray",{get:function(){return this._internalArray.slice(0)},set:function(t){throw new Error("Not permitted. Matrices are immutable.")},enumerable:!0,configurable:!0}),l.prototype.isIdentity=function(){return this.equals(l.identity())},l.prototype.dot=function(t){for(var e=this._internalArray.slice(0),r=t._internalArray.slice(0),i=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0],n=0;n<4;n++)for(var o=0;o<4;o++)for(var s=0;s<4;s++)i[4*n+o]+=e[4*n+s]*r[4*s+o];return new l(i)},l.prototype.equals=function(t){for(var e=0;e<16;e++)if(this._internalarray[e]!==t._internalarray[e])return!1;return!0},l.prototype.tocss=function(){for(var t=this._internalArray.slice(0),e=0;e<t.length;e++)math.abs(t[e])<1e-6&&(t[e]=0);return"matrix3d("+t.join(",")+")"},l.identity=function(){return new l([1,0,0,0,0,1,0,0,0,0,1,0,0,0,0,1])},l.createScaleMatrix=function(t,e,r){return new l([t,0,0,0,0,e,0,0,0,0,r,0,0,0,0,1])},l.createRotationMatrix=function(t,e,r){var i=Math.cos,n=Math.sin,o=Math.PI/180,s=t*o,a=e*o,h=r*o;return new l([i(a)*i(h),i(a)*n(h),-n(a),0,n(s)*n(a)*i(h)-i(s)*n(h),n(s)*n(a)*n(h)+i(s)*i(h),n(s)*i(a),0,i(s)*n(a)*i(h)+n(s)*n(h),i(s)*n(a)*n(h)-n(s)*i(h),i(s)*i(a),0,0,0,0,1])},l}();t.Matrix3D=e}(CommentUtils&#124;&#124;(CommentUtils={}));__extends=this&&this.__extends&#124;&#124;function(){var i=Object.setPrototypeOf&#124;&#124;{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}&#124;&#124;function(t,e){for(var r in e)e.hasOwnProperty(r)&&(t[r]=e[r])};return function(t,e){function r(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(r.prototype=e.prototype,new r)}}();var CssScrollComment=function(e){function t(){var t=null!==e&&e.apply(this,arguments)&#124;&#124;this;return t._dirtyCSS=!0,t}return __extends(t,e),t.prototype.init=function(t){void 0===t&&(t=null),e.prototype.init.call(this,t),this._toggleClass("css-optimize",!0)},t.prototype._calculateX=function(){var t=void 0===this._width?0:this.width,e=this.ttl/this.dur*(this.parent.width+t)-t;return this.absolute?e:e/this.parent.width},Object.defineProperty(t.prototype,"x",{get:function(){return this._calculateX()},set:function(t){this.absolute&#124;&#124;(t*=this.parent.width);var e=t-this._calculateX();this.dom.style.transform="translateX("+(this.axis%2==0?e:-e)+"px)"+(null===this._transform&#124;&#124;this._transform.isIdentity()?"":" "+this._transform.toCss()),this.axis%2==0?this.dom.style.left=this._calculateX()+"px":this.dom.style.right=this._calculateX()+"px"},enumerable:!0,configurable:!0}),t.prototype.update=function(){this._dirtyCSS&&(this.dom.style.transition="transform "+this.ttl+"ms linear",this.x=-this.dom.offsetWidth,this._dirtyCSS=!1)},t.prototype.invalidate=function(){e.prototype.invalidate.call(this),this._dirtyCSS=!0,this.dom&&(this.dom.style.transition="",this.x=this.x)},t.prototype.stop=function(){e.prototype.stop.call(this),this.invalidate()},t}(ScrollComment),CommentFilter=function(){function t(){this.rules=[],this.modifiers=[],this.allowUnknownTypes=!0,this.allowTypes={1:!0,2:!0,4:!0,5:!0,6:!0,7:!0,8:!0,17:!0}}return t.prototype.doModify=function(t){return this.modifiers.reduce(function(t,e){return e(t)},t)},t.prototype.beforeSend=function(t){return t},t.prototype.doValidate=function(r){return!!r.hasOwnProperty("mode")&&(!((!this.allowUnknownTypes&#124;&#124;r.mode.toString()in this.allowTypes)&&!this.allowTypes[r.mode.toString()])&&this.rules.every(function(t){try{var e=function e(t,r){for(var i=t.subject.split("."),n=r;0<i.length;){var o=i.shift();if(""!==o&&(n.hasOwnProperty(o)&&(n=n[o]),null==n)){n=null;break}}if(null===n)return!0;switch(t.op){case"<":return n<t.value;case">":return n>t.value;case"~":case"regexp":return new RegExp(t.value).test(n.toString());case"=":case"eq":return t.value===("number"==typeof n?n:n.toString());case"!":case"not":return!e(t.value,n);case"&&":case"and":return!!Array.isArray(t.value)&&t.value.every(function(t){return e(t,n)});case"&#124;&#124;":case"or":return!!Array.isArray(t.value)&&t.value.some(function(t){return e(t,n)});default:return!1}}(t,r)}catch(t){e=!1}return"accept"===t.mode?e:!e}))},t.prototype.addRule=function(t){if("accept"!==t.mode&&"reject"!==t.mode)throw new Error("Rule must be of accept type or reject type.");this.rules.push(t)},t.prototype.removeRule=function(t){var e=this.rules.indexOf(t);return 0<=e&&(this.rules.splice(e,1),!0)},t.prototype.addmodifier=function(t){if("function"!=typeof t)throw new Error("Modifiers need to be functions.");this.modifiers.push(t)},t}(),CommentProvider=function(){function n(){this._started=!1,this._destroyed=!1,this._staticSources={},this._dynamicSources={},this._parsers={},this._targets=[]}return n.SOURCE_JSON="JSON",n.SOURCE_XML="XML",n.SOURCE_,n.BaseHttpProvider=function(s,a,h,l,c){return new Promise(function(t,e){var r=new XMLHttpRequest,i=a;if(l&&("POST"===s&#124;&#124;"PUT"===s)){i+="?";var n=[];for(var o in l)l.hasOwnProperty(o)&&n.push(encodeURIComponent(o)+"="+encodeURIComponent(l[o]));i+=n.join("&")}r. Error(this.status+" "+this.statusText))},r.onerror=function(){e(new Error(this.status+" "+this.statusText))},r.open(s,i),r.responseType="string"==typeof h?h:"",void 0!==c?r.send(c):r.send()})},n.JSONProvider=function(t,e,r,i){return n.BaseHttpProvider(t,e,"json",r,i).then(function(t){return t})},n.XMLProvider=function(t,e,r,i){return n.BaseHttpProvider(t,e,"document",r,i).then(function(t){return t})},n.TextProvider=function(t,e,r,i){return n.BaseHttpProvider(t,e,"text",r,i).then(function(t){return t})},n.prototype.addStaticSource=function(t,e){if(this._destroyed)throw new Error("Comment provider has been destroyed, cannot attach more sources.");return e in this._staticSources&#124;&#124;(this._staticSources[e]=[]),this._staticSources[e].push(t),this},n.prototype.addDynamicSource=function(t,e){if(this._destroyed)throw new Error("Comment provider has been destroyed, cannot attach more sources.");return e in this._dynamicSources&#124;&#124;(this._dynamicSources[e]=[]),this._dynamicSources[e].push(t),this},n.prototype.add new Error("Comment provider has been destroyed, cannot attach more targets.");if(!(t instanceof CommentManager))throw new Error("Expected the target to be an instance of CommentManager.");return this._targets.push(t),this},n.prototype.addParser=function(t,e){if(this._destroyed)throw new Error("Comment provider has been destroyed, cannot attach more parsers.");return e in this._parsers&#124;&#124;(this._parsers[e]=[]),this._parsers[e].unshift(t),this},n.prototype.applyParsersOne=function(n,o){return new Promise(function(t,e){if(o in this._parsers){for(var r=0;r<this._parsers[o].length;r++){var i=null;try{i=this._parsers[o][r].parseOne(n)}catch(t){console.error(t)}if(null!==i)return void t(i)}e(new Error("Ran out of parsers for they target type"))}else e(new Error('No parsers defined for "'+o+'"'))}.bind(this))},n.prototype.applyParsersList=function(n,o){return new Promise(function(t,e){if(o in this._parsers){for(var r=0;r<this._parsers[o].length;r++){var i=null;try{i=this._parsers[o][r].parseMany(n)}catch(t){console.error(t)}if(null!==i)return void t(i)}e(new Error("Ran out of parsers for the target type"))}else e(new Error('No parsers defined for "'+o+'"'))}.bind(this))},n.prototype.load=function(){if(this._destroyed)throw new Error("Cannot load sources on a destroyed provider.");var t=[];for(var e in this._staticSources)t.push(Promises.any(this._staticSources[e]).then(function(t){return this.applyParsersList(t,e)}.bind(this)));return 0===t.length?Promise.resolve([]):Promises.any(t).then(function(t){for(var e=0;e<this._targets.length;e++)this._targets[e].load(t);return Promise.resolve(t)}.bind(this))},n.prototype.start=function(){if(this._destroyed)throw new Error("Cannot start a provider that has been destroyed.");return this._started=!0,this.load().then(function(t){for(var r in this._dynamicSources)this._dynamicSources[r].forEach(function(t){t.addEventListener("receive",function(t){for(var e=0;e<this._targets.length;e++)this._targets[e].send(this.applyparserone(t,r))}.bind(this))}.bind(this));return Promise.resolve(t)}.bind(this))},n.prototype.send=function(t,e){throw new Error("Not implemented")},n.prototype.destroy=function(){return this._destroyed&#124;&#124;(this._destroyed=!0),Promise.resolve()},n}(),Promises=function(){var t={any:function(s){return Array.isArray(s)?0===s.length?Promise.reject():new Promise(function(e,r){for(var i=!1,n=0,o=[],t=0;t<s.length;t++)s[t].then(function(t){n++,i&#124;&#124;(i=!0,e(t))}).catch(function(e){return function(t){n++,o[e]=t,n===s.length&&(i&#124;&#124;r(o))}}(t))}):Promise.resolve(s)}};return t}(),BilibiliFormat=function(){var e={},y=function(t){if("["!==t.charAt(0))return t;switch(t.charAt(t.length-1)){case"]":return t;case'"':return t+"]";case",":return t.substring(0,t.length-1)+'"]';default:return y(t.substring(0,t.length-1))}},o=function(t){return t=(t=(t=(t=t.replace(new RegExp("</([^d])","g"),"</disabled 1ドル")).replace(new RegExp("</(s{2,})","g"),"</disabled 1ドル")).replace(new RegExp("<([^d/]w*?)","g"),"<disabled 1ドル")).replace(new RegExp("<([^/ ]{2,}W*?)","g"),"<disabled 1ドル")};return e.XMLParser=function(t){this._attemptFix=!0,this._logBadComments=!0,"object"==typeof t&&(this._attemptFix=!1!==t.attemptFix,this._logBadComments=!1!==t.logBadComments)},e.XMLParser.prototype.parseOne=function(t){try{var e=t.getAttribute("p").split(",")}catch(t){return null}var r=t.textContent,i={};if(i.stime=Math.round(1e3*parseFloat(e[0])),i.size=parseInt(e[2]),i.color=parseInt(e[3]),i.mode=parseInt(e[1]),i.date=parseInt(e[4]),i.pool=parseInt(e[5]),i.position="absolute",null!=e[7]&&(i.dbid=parseInt(e[7])),i.hash=e[6],i. if(7===i.mode)try{this._attemptFix&&(r=y(r).replace(/\t/,"\\t"));var n=JSON.parse(r);if(i.shadow=!0,i.x=parseFloat(n[0]),i.y=parseFloat(n[1]),(Math.floor(i.x)<i.x&#124;&#124;math.floor(i.y)<i.y)&&(i.position="relative"),i.\n"),i.rz=0,i.ry=0,7<=n.length&&(i.rz=parseint(n[5],10),i.ry=parseint(n[6],10)),i.motion=[],i.movable=!1,11<=n.length){i.movable=!0;var" o=500,s={x:{from:i.x,to:parseFloat(n[7]),dur:o,delay:0},y:{from:i.y,to:parseFloat(n[8]),dur:o,delay:0}};if(""!==n[9]&&(o=parseInt(n[9],10),s.x.dur=o,s.y.dur=o),""!==n[10]&&(s.x.delay=parseInt(n[10],10),s.y.delay=parseInt(n[10],10)),11<n.length&&(i.shadow="false"!==n[11]&&!1!==n[11],null!=n[12]&&(i.font=n[12]),14<n.length)){"relative"===i.position&&(this._logbadcomments&&console.warn("cannot mix relative and absolute positioning!"),i.position="absolute");for(var a=n[14],h={x:s.x.from,y:s.y.from},l=[],c=new RegExp("([a-zA-Z])\\s*(\\d+)[, ](\\d+)","g"),p=a.split(/[a-zA-Z]/).length-1,u=c.exec(a);null!==u;){switch(u[1]){case"M":h.x=parseInt(u[2],10),h.y=parseInt(u[3],10);break;case"L":l.push({x:{from:h.x,to:parseInt(u[2],10),dur:o/p,delay:0},y:{from:h.y,to:parseInt(u[3],10),dur:o/p,delay:0}}),h.x=parseInt(u[2],10),h.y=parseInt(u[3],10)}u=c.exec(a)}s=null,i.motion=l}null!==s&&i.motion.push(s)}i.dur=2500,n[3]<12&&(i.dur=1e3*n[3]);var d=n[2].split("-");if(null!=d&&1<d.length){var f=parseFloat(d[0]),m=parseFloat(d[1]);(i.opacity=f)!==m&&(i.alpha={from:f,to:m})}}catch(t){this._logBadComments&&(console.warn("Error occurred in JSON parsing. Could not parse comment."),console.log("[DEBUG] "+r))}else 8===i.mode?i.code=r:this._logBadComments&&(console.warn("Unknown comment type : "+i.mode+". Not doing further parsing."),console.log("[DEBUG] "+r));return null!==i.text&&"string"==typeof i.text&&(i.█")),i},e.XMLParser.prototype.parseMany=function(t){var" e=[];try{e=t.getElementsByTagName("d")}catch(t){return null}for(var r=[],i=0;i<e.length;i++){var n=this.parseOne(e[i]);null!==n&&r.push(n)}return r},e.TextParser=function(t){this._allowInsecureDomParsing=!0,this._attemptEscaping=!0,this._canSecureNativeParse=!1,"object"==typeof t&&(this._allowInsecureDomParsing=!1!==t.allowInsecureDomParsing,this._attemptEscaping=!1!==t.attemptEscaping),"undefined"!=typeof document&&document&&document.createElement&#124;&#124;(this._allowInsecureDomParsing=!1),"undefined"!=typeof DOMParser&&null!==DOMParser&&(this._canSecureNativeParse=!0),(this._allowInsecureDomParsing&#124;&#124;this._canSecureNativeParse)&&(this._xmlParser=new e.XMLParser(t))},e.TextParser.prototype.parseOne=function(t){if(this._allowInsecureDomParsing){var e=t;this._attemptEscaping&&(e=o(e));var r=document.createElement("div");r.innerHTML=e;var i=r.getElementsByTagName("d");return 1!==i.length?null:this._xmlParser.parseOne(i[0])}if(this._canSecureNativeParse){var n=new DOMParser;return this._xmlParser.parseOne(n.parseFromString(t,"application/xml"))}throw new Error("Secure native js parsing not implemented yet.")},e.TextParser.prototype.parseMany=function(t){if(this._allowInsecureDomParsing){var e=t;this._attemptEscaping&&(e=o(e));var r=document.createElement("div");return r.innerHTML=e,this._xmlParser.parseMany(r)}if(this._canSecureNativeParse){var i=new DOMParser;return this._xmlParser.parseMany(i.parseFromString(t,"application/xml"))}throw new Error("Secure native js parsing not implemented yet.")},e}(),AcfunFormat=function(){var e={JSONParser:function(t){this._logBadComments=!0,this._logNotImplemented=!1,"object"==typeof t&&(this._logBadComments=!1!==t.logBadComments,this._logNotImplemented=!0===t.logNotImplemented)}};return e.JSONParser.prototype.parseOne=function(t){var e={};if("object"!=typeof t&#124;&#124;null==t&#124;&#124;!t.hasOwnProperty("c"))return null;var r=t.c.split(",");if(6<=r.length){if(e.stime=1e3*parsefloat(r[0]),e.color=parseint(r[1]),e.mode=parseint(r[2]),e.size=parseint(r[3]),e.hash=r[4],e.date=parseint(r[5]),e.position="absolute",7!==e.mode)e.\n"),e.text=e.text.replace(/\r/g,"\n"),e.text=e.text.replace(/\s/g," ");else{try{var" i=JSON.parse(t.m)}catch(t){return this._logBadComments&&(console.warn("Error parsing internal data for comment"),console.log("[Dbg] "+e.text)),null}if(e.position="relative",e. /g," "),"number"==typeof i.a?e.opacity=i.a:e.opacity=1,"object"==typeof i.p?(e.x=i.p.x/1e3,e.y=i.p.y/1e3):(e.x=0,e.y=0),"number"==typeof i.c)switch(i.c){case 0:e. 2:e. 6:e. 8:e. handle aligning to center! AlignMode="+i.c)}if(e.axis=0,e.shadow=i.b,e.dur=4e3,"number"==typeof i.l&&(e.dur=1e3*i.l),null!=i.z&&0<i.z.length){e.movable=!0,e.motion=[];for(var n=0,o={x:e.x,y:e.y,alpha:e.opacity,color:e.color},s=0;s<i.z.length;s++){var a=null!=i.z[s].l?1e3*i.z[s].l:500;n+=a;var h={};i.z[s].hasOwnProperty("rx")&&"number"==typeof i.z[s].rx&&this._logNotImplemented&&console.log("Encountered animated x-axis rotation. Ignoring."),i.z[s].hasOwnProperty("e")&&"number"==typeof i.z[s].e&&this._logNotImplemented&&console.log("Encountered animated y-axis rotation. Ignoring."),i.z[s].hasOwnProperty("d")&&"number"==typeof i.z[s].d&&this._logNotImplemented&&console.log("Encountered animated z-axis rotation. Ignoring."),i.z[s].hasOwnProperty("x")&&"number"==typeof i.z[s].x&&(h.x={from:o.x,to:i.z[s].x/1e3,dur:a,delay:0}),i.z[s].hasOwnProperty("y")&&"number"==typeof i.z[s].y&&(h.y={from:o.y,to:i.z[s].y/1e3,dur:a,delay:0}),o.x=h.hasOwnProperty("x")?h.x.to:o.x,o.y=h.hasOwnProperty("y")?h.y.to:o.y,i.z[s].hasOwnProperty("t")&&"number"==typeof i.z[s].t&&i.z[s].t!==o.alpha&&(h.alpha={from:o.alpha,to:i.z[s].t,dur:a,delay:0},o.alpha=h.alpha.to),i.z[s].hasOwnProperty("c")&&"number"==typeof i.z[s].c&&i.z[s].c!==o.color&&(h.color={from:o.color,to:i.z[s].c,dur:a,delay:0},o.color=h.color.to),e.motion.push(h)}e.dur=n+(e.moveDelay?e.moveDelay:0)}i.hasOwnProperty("w")&&(i.w.hasOwnProperty("f")&&(e.font=i.w.f),i.w.hasOwnProperty("l")&&Array.isArray(i.w.l)&&0<i.w.l.length&&this._lognotimplemented&&console.log("[dbg] Filters not supported! "+JSON.stringify(i.w.l))),null!=i.r&&null!=i.k&&(e.rX=i.r,e.rY=i.k)}return e}return this._logBadComments&&(console.warn("Dropping this comment due to insufficient parameters. Got: "+r.length),console.log("[Dbg] "+t.c)),null},e.JSONParser.prototype.parseMany=function(t){if(!Array.isArray(t))return null;for(var e=[],r=0;r<t.length;r++){var i=this.parseOne(t[r]);null!==i&&e.push(i)}return e},e.TextParser=function(t){this._jsonParser=new e.JSONParser(t)},e.TextParser.prototype.parseOne=function(t){try{return this._jsonParser.parseOne(JSON.parse(t))}catch(t){return console.warn(t),null}},e.TextParser.prototype.parseMany=function(t){try{return this._jsonParser.parseMany(JSON.parse(t))}catch(t){return console.warn(t),null}},e}(),CommonDanmakuFormat=function(){var t={},e=function(t){return"number"==typeof t.mode&&"number"==typeof t.stime&&((8!==t.mode&#124;&#124;"string"==typeof t.code)&&"string"==typeof t.text)};return t.JSONParser=function(){},t.JSONParser.prototype.parseOne=function(t){return e(t)?t:null},t.JSONParser.prototype.parseMany=function(t){return t.every(e)?t:null},t.XMLParser=function(){},t.XMLParser.prototype.parseOne=function(t){var e={};try{e.stime=parseInt(t.getAttribute("stime")),e.mode=parseInt(t.getAttribute("mode")),e.size=parseInt(t.getAttribute("size")),e.color=parseInt(t.getAttribute("color")),e. null}return e},t.XMLParser.prototype.parseMany=function(t){try{var e=t.getElementsByTagName("comment")}catch(t){return null}for(var r=[],i=0;i<e.length;i++){var n=this.parseOne(e[i]);null!==n&&r.push(n)}return r},t}(); \ No newline at end of file diff --git a/docs/PoweredByCCL.md b/docs/PoweredByCCL.md index 1ff925e1..5d887e10 100644 --- a/docs/PoweredByCCL.md +++ b/docs/PoweredByCCL.md @@ -11,7 +11,11 @@ - [AcFun HTML5弹幕播放器](http://www.acfun.tv) AcFun的HTML5弹幕播放器弹幕呈现库采用CCL - + +- [阿里云播放器SDK AliyunPlayer Web](https://github.com/aliyunvideo/AliyunPlayer_Web/blob/master/customComponents/src/components/AliplayerDanmuComponent/) + + 阿里云视频点播(ApsaraVideo VoD)是集音视频采集、编辑、上传、自动化转码处理、媒体资源管理、高效云剪辑处理、分发加速、视频播放于一体的一站式音视频点播解决方案。 + - [Missevan M站 弹幕音频](http://www.missevan.cn) 采用CCL为音频(而非视频)配上弹幕轨道,在开放页面上滚动弹幕 diff --git a/package-lock.json b/package-lock.json index 189f0fb6..ae8e9825 100644 --- a/package-lock.json +++ b/package-lock.json @@ -113,15 +113,23 @@ } }, "ajv": { - "version": "6.10.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz", - "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==", + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", + "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" + }, + "dependencies": { + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + } } }, "amdefine": { @@ -214,7 +222,7 @@ "array-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", + "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", "dev": true }, "array-from": { @@ -275,9 +283,9 @@ "dev": true }, "async": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/async/-/async-3.2.0.tgz", - "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.3.tgz", + "integrity": "sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==", "dev": true }, "async-each": { @@ -470,6 +478,12 @@ "caniuse-db": "^1.0.30000153" } }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", + "dev": true + }, "buffer-from": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", @@ -532,6 +546,15 @@ "requires": { "yallist": "^3.0.2" } + }, + "mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "requires": { + "minimist": "^1.2.6" + } } } }, @@ -791,6 +814,17 @@ "mkdirp": "^0.5.1", "rimraf": "^2.5.4", "run-queue": "^1.0.0" + }, + "dependencies": { + "mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "requires": { + "minimist": "^1.2.6" + } + } } }, "copy-descriptor": { @@ -889,9 +923,9 @@ } }, "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz", + "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==", "dev": true }, "deep-is": { @@ -1193,6 +1227,15 @@ "path-is-absolute": "^1.0.0" } }, + "mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "requires": { + "minimist": "^1.2.6" + } + }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -1451,15 +1494,15 @@ } }, "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.7.0.tgz", + "integrity": "sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==", "dev": true, "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" + "concat-stream": "^1.6.2", + "debug": "^2.6.9", + "mkdirp": "^0.5.4", + "yauzl": "^2.10.0" }, "dependencies": { "debug": { @@ -1471,11 +1514,39 @@ "ms": "2.0.0" } }, + "fd-slicer": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", + "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, + "mkdirp": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", + "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, + "requires": { + "minimist": "^1.2.6" + } + }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "dev": true + }, + "yauzl": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", + "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", + "dev": true, + "requires": { + "buffer-crc32": "~0.2.3", + "fd-slicer": "~1.1.0" + } } } }, @@ -1485,12 +1556,6 @@ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", "dev": true }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -1512,15 +1577,6 @@ "websocket-driver": ">=0.5.1"
 }
 },
- "fd-slicer": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
- "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
- "dev": true,
- "requires": {
- "pend": "~1.2.0"
- }
- },
 "figgy-pudding": {
 "version": "3.5.1",
 "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
@@ -1696,15 +1752,6 @@
 "readable-stream": "^2.0.0"
 }
 },
- "fs-minipass": {
- "version": "1.2.6",
- "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz",
- "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==",
- "dev": true,
- "requires": {
- "minipass": "^2.2.1"
- }
- },
 "fs-write-stream-atomic": {
 "version": "1.0.10",
 "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
@@ -1770,15 +1817,12 @@
 "version": "1.0.0",
 "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
 "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
- "dev": true,
 "optional": true
 },
 "brace-expansion": {
 "version": "1.1.11",
 "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
 "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
- "dev": true,
- "optional": true,
 "requires": {
 "balanced-match": "^1.0.0",
 "concat-map": "0.0.1"
@@ -1800,7 +1844,6 @@
 "version": "0.0.1",
 "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
- "dev": true,
 "optional": true
 },
 "console-control-strings": {
@@ -1940,13 +1983,6 @@
 "dev": true,
 "optional": true
 },
- "ini": {
- "version": "1.3.5",
- "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
- "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
- "dev": true,
- "optional": true
- },
 "is-fullwidth-code-point": {
 "version": "1.0.0",
 "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
@@ -1964,23 +2000,6 @@
 "dev": true,
 "optional": true
 },
- "minimatch": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
- "dev": true,
- "optional": true,
- "requires": {
- "brace-expansion": "^1.1.7"
- }
- },
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true,
- "optional": true
- },
 "minipass": {
 "version": "2.3.5",
 "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
@@ -2000,13 +2019,13 @@
 }
 },
 "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
 "dev": true,
 "optional": true,
 "requires": {
- "minimist": "0.0.8"
+ "minimist": "^1.2.6"
 }
 },
 "ms": {
@@ -2163,15 +2182,6 @@
 "ini": "~1.3.0",
 "minimist": "^1.2.0",
 "strip-json-comments": "~2.0.1"
- },
- "dependencies": {
- "minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
- "dev": true,
- "optional": true
- }
 }
 },
 "readable-stream": {
@@ -2312,6 +2322,12 @@
 }
 }
 },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "dev": true
+ },
 "functional-red-black-tree": {
 "version": "1.0.1",
 "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
@@ -2355,9 +2371,9 @@
 "dev": true
 },
 "getobject": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.0.tgz",
- "integrity": "sha512-tbUz6AKKKr2YiMB+fLWIgq5ZeBOobop9YMMAU9dC54/ot2ksMXt3DOFyBuhZw6ptcVszEykgByK20j7W9jHFag==",
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/getobject/-/getobject-1.0.2.tgz",
+ "integrity": "sha512-2zblDBaFcb3rB4rF77XVnuINOE2h2k/OnqXAiy0IrTxUfV1iFp3la33oAQVY9pCpWU268WFYVt2t71hlMuLsOg==",
 "dev": true
 },
 "getpass": {
@@ -2474,9 +2490,9 @@
 "dev": true
 },
 "grunt": {
- "version": "1.3.0",
- "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.3.0.tgz",
- "integrity": "sha512-6ILlMXv11/4cxuhSMfSU+SfvbxrPuqZrAtLN64+tZpQ3DAKfSQPQHRbTjSbdtxfyQhGZPtN0bDZJ/LdCM5WXXA==",
+ "version": "1.5.3",
+ "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.5.3.tgz",
+ "integrity": "sha512-mKwmo4X2d8/4c/BmcOETHek675uOqw0RuA/zy12jaspWqvTp4+ZeQF1W+OTpcbncnaBsfbQJ6l0l4j+Sn/GmaQ==",
 "dev": true,
 "requires": {
 "dateformat": "~3.0.3",
@@ -2484,10 +2500,10 @@
 "exit": "~0.1.2",
 "findup-sync": "~0.3.0",
 "glob": "~7.1.6",
- "grunt-cli": "~1.3.2",
- "grunt-known-options": "~1.1.0",
+ "grunt-cli": "~1.4.3",
+ "grunt-known-options": "~2.0.0",
 "grunt-legacy-log": "~3.0.0",
- "grunt-legacy-util": "~2.0.0",
+ "grunt-legacy-util": "~2.0.1",
 "iconv-lite": "~0.4.13",
 "js-yaml": "~3.14.0",
 "minimatch": "~3.0.4",
@@ -2497,16 +2513,16 @@
 },
 "dependencies": {
 "grunt-cli": {
- "version": "1.3.2",
- "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.3.2.tgz",
- "integrity": "sha512-8OHDiZZkcptxVXtMfDxJvmN7MVJNE8L/yIcPb4HB7TlyFD1kDvjHrb62uhySsU14wJx9ORMnTuhRMQ40lH/orQ==",
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz",
+ "integrity": "sha512-9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==",
 "dev": true,
 "requires": {
- "grunt-known-options": "~1.1.0",
+ "grunt-known-options": "~2.0.0",
 "interpret": "~1.1.0",
- "liftoff": "~2.5.0",
+ "liftup": "~3.0.1",
 "nopt": "~4.0.1",
- "v8flags": "~3.1.1"
+ "v8flags": "~3.2.0"
 },
 "dependencies": {
 "nopt": {
@@ -2531,12 +2547,6 @@
 "esprima": "^4.0.0"
 }
 },
- "mkdirp": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
- "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
- "dev": true
- },
 "rimraf": {
 "version": "3.0.2",
 "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
@@ -2598,12 +2608,12 @@
 },
 "dependencies": {
 "async": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
- "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
 "dev": true,
 "requires": {
- "lodash": "^4.17.11"
+ "lodash": "^4.17.14"
 }
 }
 }
@@ -2803,15 +2813,6 @@
 "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
 "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
 "dev": true
- },
- "ws": {
- "version": "6.2.1",
- "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
- "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
- "dev": true,
- "requires": {
- "async-limiter": "~1.0.0"
- }
 }
 }
 },
@@ -2851,12 +2852,12 @@
 },
 "dependencies": {
 "async": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/async/-/async-2.6.2.tgz",
- "integrity": "sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==",
+ "version": "2.6.4",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz",
+ "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==",
 "dev": true,
 "requires": {
- "lodash": "^4.17.11"
+ "lodash": "^4.17.14"
 }
 }
 }
@@ -2872,9 +2873,9 @@
 }
 },
 "grunt-known-options": {
- "version": "1.1.1",
- "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.1.tgz",
- "integrity": "sha512-cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-2.0.0.tgz",
+ "integrity": "sha512-GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==",
 "dev": true
 },
 "grunt-legacy-log": {
@@ -2909,9 +2910,9 @@
 }
 },
 "chalk": {
- "version": "4.1.1",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.1.tgz",
- "integrity": "sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg==",
+ "version": "4.1.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+ "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 "dev": true,
 "requires": {
 "ansi-styles": "^4.1.0",
@@ -2965,12 +2966,6 @@
 "which": "~2.0.2"
 },
 "dependencies": {
- "lodash": {
- "version": "4.17.21",
- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
- "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
- "dev": true
- },
 "which": {
 "version": "2.0.2",
 "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -3040,6 +3035,15 @@
 "har-schema": "^2.0.0"
 }
 },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dev": true,
+ "requires": {
+ "function-bind": "^1.1.1"
+ }
+ },
 "has-ansi": {
 "version": "1.0.3",
 "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz",
@@ -3104,9 +3108,9 @@
 "dev": true
 },
 "hosted-git-info": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.7.1.tgz",
- "integrity": "sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==",
+ "version": "2.8.9",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+ "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
 "dev": true
 },
 "htmlparser2": {
@@ -3409,6 +3413,15 @@
 "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
 "dev": true
 },
+ "is-core-module": {
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz",
+ "integrity": "sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==",
+ "dev": true,
+ "requires": {
+ "has": "^1.0.3"
+ }
+ },
 "is-data-descriptor": {
 "version": "0.1.4",
 "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -3659,9 +3672,9 @@
 "dev": true
 },
 "json-schema": {
- "version": "0.2.3",
- "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
- "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
+ "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
 "dev": true
 },
 "json-schema-traverse": {
@@ -3689,14 +3702,14 @@
 "dev": true
 },
 "jsprim": {
- "version": "1.4.1",
- "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
- "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.2.tgz",
+ "integrity": "sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==",
 "dev": true,
 "requires": {
 "assert-plus": "1.0.0",
 "extsprintf": "1.3.0",
- "json-schema": "0.2.3",
+ "json-schema": "0.4.0",
 "verror": "1.10.0"
 }
 },
@@ -3728,41 +3741,86 @@
 "type-check": "~0.3.2"
 }
 },
- "liftoff": {
- "version": "2.5.0",
- "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.5.0.tgz",
- "integrity": "sha1-IAkpG7Mc6oYbvxCnwVooyvdcMew=",
+ "liftup": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/liftup/-/liftup-3.0.1.tgz",
+ "integrity": "sha512-yRHaiQDizWSzoXk3APcA71eOI/UuhEkNN9DiW2Tt44mhYzX4joFoCZlxsSOF7RyeLlfqzFLQI1ngFq3ggMPhOw==",
 "dev": true,
 "requires": {
- "extend": "^3.0.0",
- "findup-sync": "^2.0.0",
- "fined": "^1.0.1",
- "flagged-respawn": "^1.0.0",
+ "extend": "^3.0.2",
+ "findup-sync": "^4.0.0",
+ "fined": "^1.2.0",
+ "flagged-respawn": "^1.0.1",
 "is-plain-object": "^2.0.4",
- "object.map": "^1.0.0",
- "rechoir": "^0.6.2",
- "resolve": "^1.1.7"
+ "object.map": "^1.0.1",
+ "rechoir": "^0.7.0",
+ "resolve": "^1.19.0"
 },
 "dependencies": {
+ "braces": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+ "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+ "dev": true,
+ "requires": {
+ "fill-range": "^7.0.1"
+ }
+ },
+ "fill-range": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+ "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+ "dev": true,
+ "requires": {
+ "to-regex-range": "^5.0.1"
+ }
+ },
 "findup-sync": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
- "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-4.0.0.tgz",
+ "integrity": "sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==",
 "dev": true,
 "requires": {
 "detect-file": "^1.0.0",
- "is-glob": "^3.1.0",
- "micromatch": "^3.0.4",
+ "is-glob": "^4.0.0",
+ "micromatch": "^4.0.2",
 "resolve-dir": "^1.0.1"
 }
 },
- "is-glob": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
- "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "is-number": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+ "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "4.0.5",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+ "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
 "dev": true,
 "requires": {
- "is-extglob": "^2.1.0"
+ "braces": "^3.0.2",
+ "picomatch": "^2.3.1"
+ }
+ },
+ "resolve": {
+ "version": "1.22.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
+ "integrity": "sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+ "dev": true,
+ "requires": {
+ "is-core-module": "^2.8.1",
+ "path-parse": "^1.0.7",
+ "supports-preserve-symlinks-flag": "^1.0.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+ "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+ "dev": true,
+ "requires": {
+ "is-number": "^7.0.0"
 }
 }
 }
@@ -3994,18 +4052,18 @@
 "dev": true
 },
 "minimatch": {
- "version": "3.0.4",
- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
- "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "version": "3.0.8",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz",
+ "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==",
 "dev": true,
 "requires": {
 "brace-expansion": "^1.1.7"
 }
 },
 "minimist": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
- "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "version": "1.2.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
 "dev": true
 },
 "minipass": {
@@ -4018,15 +4076,6 @@
 "yallist": "^3.0.0"
 }
 },
- "minizlib": {
- "version": "1.2.1",
- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
- "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
- "dev": true,
- "requires": {
- "minipass": "^2.2.1"
- }
- },
 "mississippi": {
 "version": "3.0.0",
 "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
@@ -4067,21 +4116,10 @@
 }
 },
 "mkdirp": {
- "version": "0.5.1",
- "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
- "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
- "dev": true,
- "requires": {
- "minimist": "0.0.8"
- },
- "dependencies": {
- "minimist": {
- "version": "0.0.8",
- "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
- "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
- "dev": true
- }
- }
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+ "dev": true
 },
 "move-concurrently": {
 "version": "1.0.1",
@@ -4095,6 +4133,17 @@
 "mkdirp": "^0.5.1",
 "rimraf": "^2.5.4",
 "run-queue": "^1.0.3"
+ },
+ "dependencies": {
+ "mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.6"
+ }
+ }
 }
 },
 "ms": {
@@ -4499,6 +4548,15 @@
 "once": "^1.3.0",
 "path-is-absolute": "^1.0.0"
 }
+ },
+ "mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.6"
+ }
 }
 }
 },
@@ -4619,6 +4677,12 @@
 "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
 "dev": true
 },
+ "picomatch": {
+ "version": "2.3.1",
+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+ "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+ "dev": true
+ },
 "pkg-up": {
 "version": "3.1.0",
 "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
@@ -4766,9 +4830,9 @@
 "dev": true
 },
 "qs": {
- "version": "6.5.2",
- "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
- "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.3.tgz",
+ "integrity": "sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==",
 "dev": true
 },
 "raw-body": {
@@ -4816,12 +4880,12 @@
 }
 },
 "rechoir": {
- "version": "0.6.2",
- "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
- "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz",
+ "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==",
 "dev": true,
 "requires": {
- "resolve": "^1.1.6"
+ "resolve": "^1.9.0"
 }
 },
 "regex-not": {
@@ -5057,9 +5121,9 @@
 "dev": true
 },
 "set-value": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz",
- "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==",
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
 "dev": true,
 "requires": {
 "extend-shallow": "^2.0.1",
@@ -5071,7 +5135,7 @@
 "extend-shallow": {
 "version": "2.0.1",
 "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
 "dev": true,
 "requires": {
 "is-extendable": "^0.1.0"
@@ -5507,6 +5571,12 @@
 "has-flag": "^3.0.0"
 }
 },
+ "supports-preserve-symlinks-flag": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+ "dev": true
+ },
 "table": {
 "version": "5.4.0",
 "resolved": "https://registry.npmjs.org/table/-/table-5.4.0.tgz",
@@ -5548,20 +5618,35 @@
 }
 },
 "tar": {
- "version": "4.4.15",
- "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.15.tgz",
- "integrity": "sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA==",
- "dev": true,
- "requires": {
- "chownr": "^1.1.1",
- "fs-minipass": "^1.2.5",
- "minipass": "^2.8.6",
- "minizlib": "^1.2.1",
- "mkdirp": "^0.5.0",
- "safe-buffer": "^5.1.2",
- "yallist": "^3.0.3"
+ "version": "4.4.19",
+ "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.19.tgz",
+ "integrity": "sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA==",
+ "dev": true,
+ "requires": {
+ "chownr": "^1.1.4",
+ "fs-minipass": "^1.2.7",
+ "minipass": "^2.9.0",
+ "minizlib": "^1.3.3",
+ "mkdirp": "^0.5.5",
+ "safe-buffer": "^5.2.1",
+ "yallist": "^3.1.1"
 },
 "dependencies": {
+ "chownr": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+ "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==",
+ "dev": true
+ },
+ "fs-minipass": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz",
+ "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==",
+ "dev": true,
+ "requires": {
+ "minipass": "^2.6.0"
+ }
+ },
 "minipass": {
 "version": "2.9.0",
 "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
@@ -5571,6 +5656,36 @@
 "safe-buffer": "^5.1.2",
 "yallist": "^3.0.0"
 }
+ },
+ "minizlib": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz",
+ "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==",
+ "dev": true,
+ "requires": {
+ "minipass": "^2.9.0"
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.6"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+ "dev": true
+ },
+ "yallist": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+ "dev": true
 }
 }
 },
@@ -5763,48 +5878,33 @@
 "dev": true
 },
 "underscore.string": {
- "version": "3.3.5",
- "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz",
- "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==",
+ "version": "3.3.6",
+ "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
+ "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
 "dev": true,
 "requires": {
- "sprintf-js": "^1.0.3",
+ "sprintf-js": "^1.1.1",
 "util-deprecate": "^1.0.2"
+ },
+ "dependencies": {
+ "sprintf-js": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+ "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
+ "dev": true
+ }
 }
 },
 "union-value": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz",
- "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=",
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
 "dev": true,
 "requires": {
 "arr-union": "^3.1.0",
 "get-value": "^2.0.6",
 "is-extendable": "^0.1.1",
- "set-value": "^0.4.3"
- },
- "dependencies": {
- "extend-shallow": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
- "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
- "dev": true,
- "requires": {
- "is-extendable": "^0.1.0"
- }
- },
- "set-value": {
- "version": "0.4.3",
- "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz",
- "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=",
- "dev": true,
- "requires": {
- "extend-shallow": "^2.0.1",
- "is-extendable": "^0.1.1",
- "is-plain-object": "^2.0.1",
- "to-object-path": "^0.3.0"
- }
- }
+ "set-value": "^2.0.1"
 }
 },
 "unique-filename": {
@@ -5911,9 +6011,9 @@
 "dev": true
 },
 "v8flags": {
- "version": "3.1.3",
- "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
- "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz",
+ "integrity": "sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==",
 "dev": true,
 "requires": {
 "homedir-polyfill": "^1.0.1"
@@ -5993,6 +6093,26 @@
 "dev": true,
 "requires": {
 "mkdirp": "^0.5.1"
+ },
+ "dependencies": {
+ "mkdirp": {
+ "version": "0.5.6",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+ "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+ "dev": true,
+ "requires": {
+ "minimist": "^1.2.6"
+ }
+ }
+ }
+ },
+ "ws": {
+ "version": "6.2.2",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz",
+ "integrity": "sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==",
+ "dev": true,
+ "requires": {
+ "async-limiter": "~1.0.0"
 }
 },
 "xml2js": {
@@ -6028,15 +6148,6 @@
 "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
 "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
 "dev": true
- },
- "yauzl": {
- "version": "2.4.1",
- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
- "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
- "dev": true,
- "requires": {
- "fd-slicer": "~1.0.1"
- }
 }
 }
 }
diff --git a/src/core/Comment.ts b/src/core/Comment.ts
index 7bbbbbae..4f9b1972 100644
--- a/src/core/Comment.ts
+++ b/src/core/Comment.ts
@@ -27,8 +27,7 @@ class CoreComment implements IComment {
 private _motionEnd:Array<number>;
 private _alphaMotion:Object = null;
 
- public _x:number;
- public _y:number;
+
 
 /**
 * Absolute coordinates. Use absolute coordinates if true otherwise use percentages.
@@ -46,22 +45,23 @@ class CoreComment implements IComment {
 */
 public axis:number = 0;
 
- public _alpha:number = 1;
- public _size:number = 25;
- private _width:number;
- private _height:number;
- private _color:number = 0xffffff;
- private _border:boolean = false;
- private _shadow:boolean = true;
- private _font:string = '';
- private _transform:CommentUtils.Matrix3D = null;
- private _className:string = '';
+ protected _x:number;
+ protected _y:number;
+
+ protected _alpha:number = 1;
+ protected _size:number = 25;
+ protected _width:number;
+ protected _height:number;
+ protected _color:number = 0xffffff;
+ protected _border:boolean = false;
+ protected _shadow:boolean = true;
+ protected _font:string = '';
+ protected _transform:CommentUtils.Matrix3D = null;
+ protected _className:string = '';
 
 public parent:ICommentManager;
 public dom:HTMLDivElement;
 
- public className:String;
-
 constructor(parent:ICommentManager, init:Object = {}) {
 if (!parent) {
 throw new Error('Comment not bound to comment manager.');
@@ -184,14 +184,14 @@ class CoreComment implements IComment {
 } else {
 this.dom = document.createElement('div');
 }
- this.dom.className = this.parent.options.global.className;
- if (this._className !== "") {
- this.dom.className += " " + this._className;
- }
+
 this.dom.appendChild(document.createTextNode(this.text));
 this.dom.textContent = this.text;
 this.dom.innerText = this.text;
+
 this.size = this._size;
+ this.className = this._className;
+
 if (this._color != 0xffffff) {
 this.color = this._color;
 }
@@ -275,14 +275,14 @@ class CoreComment implements IComment {
 }
 
 get width():number {
- if (this._width === null &#124;&#124; this._width === undefined) {
+ if (typeof this._width === 'undefined' &#124;&#124; this._width === null) {
 this._width = this.dom.offsetWidth;
 }
 return this._width;
 }
 
 get height():number {
- if (this._height === null &#124;&#124; this._height === undefined) {
+ if (typeof this._height === 'undefined' &#124;&#124; this._height === null) {
 this._height = this.dom.offsetHeight;
 }
 return this._height;
@@ -316,6 +316,10 @@ class CoreComment implements IComment {
 return this._transform.flatArray;
 }
 
+ get className():string {
+ return this._className;
+ }
+
 set x(x:number) {
 this._x = x;
 if (!this.absolute) {
@@ -367,7 +371,8 @@ class CoreComment implements IComment {
 
 set alpha(a:number) {
 this._alpha = a;
- this.dom.style.opacity = Math.min(this._alpha, this.parent.options.global.opacity) + '';
+ this.dom.style.opacity =
+ Math.min(this._alpha, this.parent.options.global.opacity) + '';
 }
 
 set border(b:boolean) {
@@ -402,6 +407,11 @@ class CoreComment implements IComment {
 }
 }
 
+ set className(className:string) {
+ this._className = className;
+ this.dom.className = this.parent.options.global.className + ' ' + className;
+ }
+
 /**
 * Moves the comment by a number of milliseconds. When
 * the given parameter is greater than 0 the comment moves
diff --git a/src/core/CommentUtils.ts b/src/core/CommentUtils.ts
index 65b20b1b..5e6ed429 100644
--- a/src/core/CommentUtils.ts
+++ b/src/core/CommentUtils.ts
@@ -17,22 +17,31 @@ module CommentUtils {
 return new Matrix3D([xscale, 0, 0, 0, 0, yscale, 0, 0, 0, 0, zscale, 0, 0, 0, 0, 1]);
 };
 
+ /**
+ * Create a 3d rotation matrix from degrees of rotation specified
+ * This uses eulerAngles as the orientation
+ *
+ * @param {number} xrot Rotate along x-axis
+ * @param {number} yrot Rotate along y-axis
+ * @param {number} zrot Rotate along z-axis
+ * @return {Matrix3D} Rotation matrix
+ */
 public static createRotationMatrix:Function = function (xrot:number, yrot:number, zrot:number):Matrix3D {
- // Courtesy of @StarBrilliant, re-adapted for general case
- // TODO: add support for xrot
- var DEG2RAD = Math.PI/180;
+ const COS = Math.cos;
+ const SIN = Math.sin;
+ const DEG2RAD = Math.PI/180;
+
+ var xr = xrot * DEG2RAD;
 var yr = yrot * DEG2RAD;
 var zr = zrot * DEG2RAD;
- var COS = Math.cos;
- var SIN = Math.sin;
+
 var matrix = [
- COS(yr) * COS(zr) , COS(yr) * SIN(zr) , SIN(yr) , 0,
- (-SIN(zr)) , COS(zr) , 0 , 0,
- (-SIN(yr) * COS(zr)) , (-SIN(yr) * SIN(zr)) , COS(yr) , 0,
- 0 , 0 , 0 , 1
+ COS(yr) * COS(zr) , COS(yr) * SIN(zr) , - SIN(yr) , 0,
+ SIN(xr) * SIN(yr) * COS(zr) - COS(xr) * SIN(zr) , SIN(xr) * SIN(yr) * SIN(zr) + COS(xr) * COS(zr) , SIN(xr) * COS(yr) , 0,
+ COS(xr) * SIN(yr) * COS(zr) + SIN(xr) * SIN(zr) , COS(xr) * SIN(yr) * SIN(zr) - SIN(xr) * COS(zr) , COS(xr) * COS(yr) , 0,
+ 0 , 0 , 0 , 1
 ];
- // Do some rounding
- return new Matrix3D(matrix.map(v => Math.round(v * 1e10) * 1e-10));
+ return new Matrix3D(matrix);
 };
 
 /**
@@ -54,7 +63,7 @@ module CommentUtils {
 return this._internalArray.slice(0);
 }
 
- set flatArray(array:Array<number>) {
+ set flatArray(_array:Array<number>) {
 throw new Error('Not permitted. Matrices are immutable.');
 }
 
diff --git a/src/core/css-renderer/CssComment.ts b/src/core/css-renderer/CssComment.ts
index 38bd28e6..3bf96bee 100644
--- a/src/core/css-renderer/CssComment.ts
+++ b/src/core/css-renderer/CssComment.ts
@@ -6,18 +6,7 @@
 * @description Comment abstraction based on CSS3 implementation
 */
 /// <reference path="../Comment.ts" />
-class CssCompatLayer {
- public static transform(dom:HTMLDivElement, trans:string):void{
- dom.style.transform = trans;
- dom.style["webkitTransform"] = trans;
- dom.style["msTransform"] = trans;
- dom.style["oTransform"] = trans;
- }
-}
 
-/**
- * An add-in class to support CSS-based scrolling comments
- */
 class CssScrollComment extends ScrollComment {
 // Marker for whether we need to re-create the CSS or not
 private _dirtyCSS:boolean = true;
@@ -27,40 +16,46 @@ class CssScrollComment extends ScrollComment {
 this._toggleClass('css-optimize', true);
 }
 
- set x(x:number) {
- if (this._x !== null && typeof this._x === "number") {
- // This is run when starting
- var dx:number = x - this._x;
- this._x = x;
- CssCompatLayer.transform(this.dom, "translateX(" +
- (this.axis % 2 === 0 ? dx : -dx) + "px)");
- } else {
- // This is run when stopping
- this._x = x;
- if (!this.absolute) {
- this._x *= this.parent.width;
- }
- // Got the x-value, now figure out where things are
- if (this.axis % 2 === 0) {
- // x-axis towards right
- this.dom.style.left =
- (this._x + (this.align % 2 === 0 ? 0 : -this.width)) + 'px';
- } else {
- // x-axis towards left
- this.dom.style.right =
- (this._x + (this.align % 2 === 0 ? -this.width : 0)) + 'px';
- }
- }
+ protected _calculateX():number {
+ var width = (typeof this._width === 'undefined') ? 0 : this.width;
+ var x = (this.ttl / this.dur) * (this.parent.width + width) - width;
+ return (!this.absolute) ? (x / this.parent.width) : x;
 }
 
 get x():number{
- // X always goes from {parent.width to -this.width}
- return (this.ttl / this.dur) * (this.parent.width + this.width) - this.width;
+ return this._calculateX();
+ }
+
+ set x(x:number) {
+ /*
+ Re-pivot x to animate from the current _x location.
+ */
+ // Convert to pixel space
+ if (!this.absolute) {
+ x *= this.parent.width;
+ }
+ var dx:number = x - this._calculateX();
+ this.dom.style.transform =
+ "translateX(" + (this.axis % 2 === 0 ? dx : -dx) + "px)" +
+ (this._transform === null &#124;&#124; this._transform.isIdentity() ?
+ '' : (' ' + this._transform.toCss()));
+
+ if (this.axis % 2 === 0) {
+ // x-axis towards right
+ this.dom.style.left = this._calculateX() + 'px';
+ } else {
+ // x-axis towards left
+ this.dom.style.right = this._calculateX() + 'px';
+ }
 }
 
 public update():void{
+ /*
+ This is called by the update manager
+ Since CSS updates are very different, super should not be called.
+ */
 if (this._dirtyCSS) {
- // Start moving
+ // Recreate the CSS
 this.dom.style.transition = "transform " + this.ttl + "ms linear";
 this.x = - this.width;
 this._dirtyCSS = false;
@@ -70,6 +65,14 @@ class CssScrollComment extends ScrollComment {
 public invalidate():void{
 super.invalidate();
 this._dirtyCSS = true;
+
+ if (!this.dom) {
+ return; // DOM not created yet, do nothing
+ } else {
+ // Clear the transition to prepare for a rewrite
+ this.dom.style.transition = '';
+ this.x = this.x;
+ }
 }
 
 /**
@@ -77,14 +80,6 @@ class CssScrollComment extends ScrollComment {
 */
 public stop():void{
 super.stop();
- this.dom.style.transition = '';
- // This clears translation (sets translate to 0px)
- this.x = this._x;
- // Set to null to force writing an absolute x position
- this._x = null;
- // Write down the current expected x as absolute
- this.x = this.x;
- // Make the CSS dirty so that next update will start the movement
- this._dirtyCSS = true;
+ this.invalidate();
 }
 }
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/bansers/CommentCoreLibrary/compare/master...jabbany:CommentCoreLibrary:master.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/bansers/CommentCoreLibrary/compare/master...jabbany:CommentCoreLibrary:master.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>