Skip to content

Commit 16eafd6

Browse files
jabbanyjabbany
committed
Formatting
1 parent 06730b3 commit 16eafd6

5 files changed

Lines changed: 153 additions & 137 deletions

File tree

‎Gruntfile.coffee‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ module.exports = (grunt) ->
1919
'src/core/Comment.js'
2020
'src/CommentManager.js'
2121
]
22-
23-
SRC_MODULES =
22+
23+
SRC_MODULES =
2424
'filter': ['src/filter/SimpleFilter.js']
2525
'provider': ['src/CommentProvider.js', 'src/Promises.js']
2626
'format-bilibili': ['src/parsers/BilibiliFormat.js']
@@ -68,7 +68,7 @@ module.exports = (grunt) ->
6868
out: 'dist/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'
6969

7070
# Append Typescript Tasks
71-
ts_config =
71+
ts_config =
7272
options:
7373
target: 'es5'
7474
for key,value of CMP_CORE_TS
@@ -128,7 +128,7 @@ module.exports = (grunt) ->
128128

129129
# Minify JS
130130
uglify:
131-
options:
131+
options:
132132
banner: LICENSE
133133
all:
134134
files:

‎dist/scripting/OOAPI.js‎

Lines changed: 123 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -1,131 +1,136 @@
11
/**
2-
* Out-of API
3-
* This is the definition bridge for OOAPI methods.
4-
* Please always include it
5-
**/
2+
* Out-of-API Methods
3+
* @license MIT
4+
* @description This is the definition bridge for OOAPI methods.
5+
* Please always include it
6+
**/
7+
var __OOAPI = new function () {
8+
var channels = {};
69

7-
var __OOAPI = new function(){
8-
var channels = {};
9-
function dispatchMessage(msg){
10-
if(channels[msg.channel]){
11-
for(var i = 0; i < channels[msg.channel].listeners.length; i++){
12-
try{
13-
channels[msg.channel].listeners[i](msg.payload);
14-
}catch(e){
15-
if(e.stack){
16-
__trace(e.stack.toString(), 'err');
17-
}else{
18-
__trace(e.toString(), 'err');
19-
}
20-
}
21-
}
22-
}
23-
};
24-
25-
self.addEventListener("message",function(event){
26-
if(!event)
27-
return;
28-
try{
29-
var msg = JSON.parse(event.data);
30-
}catch(e){
31-
__trace(e, "err");
32-
}
33-
if(msg && msg.channel){
34-
dispatchMessage(msg);
35-
}else{
36-
console.log(msg);
37-
}
38-
});
39-
40-
this.listChannels = function(){
41-
var chl = {};
42-
for(var chan in channels){
43-
chl[chan] = {
44-
"max":channels[chan].max,
45-
"listeners":channels[chan].listeners.length
46-
};
47-
}
48-
return chl;
49-
};
50-
51-
this.deleteChannel = function(channelId, authToken){
52-
if(!channels[channelId])
53-
return true;
54-
if(authToken || channels[channelId].auth){
55-
if(authToken === channels[channelId].auth){
56-
delete channels[channelId];
57-
return true;
58-
}
59-
return false;
60-
}else{
61-
delete channels[channelId];
62-
return true;
63-
}
64-
};
65-
66-
this.createChannel = function(channelId, maximum, authToken){
67-
if(!channels[channelId]){
68-
channels[channelId] = {
69-
"max": maximum ? maximum : 0,
70-
"auth": authToken,
71-
"listeners":[]
72-
};
73-
return true;
74-
}
75-
return false;
76-
};
77-
78-
this.addListenerChannel = function(channel, listener){
79-
if(!channels[channel]){
80-
channels[channel] = {
81-
"max":0,
82-
"listeners":[]
83-
};
84-
}
85-
if(channels[channel].max > 0){
86-
if(channels[channel].listeners.length >= channels[channel].max){
87-
return false;
88-
}
89-
}
90-
channels[channel].listeners.push(listener);
91-
return true;
92-
};
10+
function dispatchMessage (msg) {
11+
if (channels[msg.channel]) {
12+
for(var i = 0; i < channels[msg.channel].listeners.length; i++) {
13+
try {
14+
channels[msg.channel].listeners[i](msg.payload);
15+
} catch(e) {
16+
if (e.stack) {
17+
__trace(e.stack.toString(), 'err');
18+
} else {
19+
__trace(e.toString(), 'err');
20+
}
21+
}
22+
}
23+
}
24+
};
25+
26+
self.addEventListener('message', function (event) {
27+
if (!event) {
28+
return;
29+
}
30+
try {
31+
var msg = JSON.parse(event.data);
32+
} catch (e) {
33+
__trace(e, 'err');
34+
return;
35+
}
36+
if (msg && msg.channel) {
37+
dispatchMessage(msg);
38+
} else {
39+
_trace(msg, 'warn');
40+
}
41+
});
42+
43+
this.listChannels = function () {
44+
var chl = {};
45+
for (var chan in channels) {
46+
chl[chan] = {
47+
'max': channels[chan].max,
48+
'listeners': channels[chan].listeners.length
49+
};
50+
}
51+
return chl;
52+
};
53+
54+
this.deleteChannel = function (channelId, authToken){
55+
if (!(channelId in channels)) {
56+
return true;
57+
}
58+
if (authToken || channels[channelId].auth) {
59+
if (authToken === channels[channelId].auth) {
60+
delete channels[channelId];
61+
return true;
62+
}
63+
return false;
64+
} else {
65+
delete channels[channelId];
66+
return true;
67+
}
68+
};
69+
70+
this.createChannel = function (channelId, maximum, authToken) {
71+
if (!(channelId in channels)) {
72+
channels[channelId] = {
73+
'max': maximum ? maximum : 0,
74+
'auth': authToken,
75+
'listeners': []
76+
};
77+
return true;
78+
}
79+
return false;
80+
};
81+
82+
this.addListenerChannel = function (channel, listener) {
83+
if (!(channel in channels)) {
84+
channels[channel] = {
85+
'max': 0,
86+
'listeners': []
87+
};
88+
}
89+
if (channels[channel].max > 0) {
90+
if (channels[channel].listeners.length >=
91+
channels[channel].max) {
92+
return false;
93+
}
94+
}
95+
channels[channel].listeners.push(listener);
96+
return true;
97+
};
9398
};
9499

95-
function __trace(obj, traceMode){
96-
self.postMessage(JSON.stringify({
97-
"channel":"",
98-
"obj":obj,
99-
"mode": (traceMode ? traceMode : "log")
100-
}));
100+
function __trace (obj, traceMode) {
101+
self.postMessage(JSON.stringify({
102+
'channel': '',
103+
'obj': obj,
104+
'mode': (traceMode ? traceMode : 'log')
105+
}));
101106
};
102107

103-
function __channel(id, payload, callback){
104-
self.postMessage(JSON.stringify({
105-
"channel":id,
106-
"payload":payload,
107-
"callback":true
108-
}));
109-
__OOAPI.addListenerChannel(id, callback, true);
108+
function __channel (id, payload, callback) {
109+
self.postMessage(JSON.stringify({
110+
'channel': id,
111+
'payload': payload,
112+
'callback': true
113+
}));
114+
__OOAPI.addListenerChannel(id, callback, true);
110115
};
111116

112-
function __schannel(id, callback){
113-
__OOAPI.addListenerChannel(id, callback);
117+
function __schannel (id, callback) {
118+
__OOAPI.addListenerChannel(id, callback);
114119
};
115120

116-
function __pchannel(id, payload){
117-
self.postMessage(JSON.stringify({
118-
"channel":id,
119-
"payload":payload,
120-
"callback":false
121-
}));
121+
function __pchannel (id, payload) {
122+
self.postMessage(JSON.stringify({
123+
'channel': id,
124+
'payload': payload,
125+
'callback': false
126+
}));
122127
};
123128

124-
function __achannel(id, auth, payload){
125-
self.postMessage(JSON.stringify({
126-
"channel":id,
127-
"auth":auth,
128-
"payload":payload,
129-
"callback":false
130-
}));
129+
function __achannel (id, auth, payload) {
130+
self.postMessage(JSON.stringify({
131+
'channel': id,
132+
'auth': auth,
133+
'payload': payload,
134+
'callback': false
135+
}));
131136
};

‎dist/scripting/api/Global.js‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
1-
var Global = new function(){
2-
var kvstore = {};
3-
this._set = function(key, val){
4-
kvstore[key] = val;
5-
};
6-
this._get = function(key){
7-
return kvstore[key];
8-
};
9-
this._ = function(key){
10-
return this._get(key);
11-
};
1+
var Global = new function () {
2+
var kvstore = {};
3+
4+
this._set = function (key, val) {
5+
kvstore[key] = val;
6+
};
7+
8+
this._get = function (key) {
9+
return kvstore[key];
10+
};
11+
12+
this._ = function (key) {
13+
return this._get(key);
14+
};
1215
};
1316

1417
var $G = Global;

‎src/core/CommentFactory.ts‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@
77
* different underlying abstractions.
88
*/
99
/// <reference path="Core.d.ts" />
10-
interface ICommentFactory {
11-
(comment:Object):IComment;
12-
}
13-
class CommentFactory {
10+
class CommentFactory implements ICommentFactory {
1411
private _bindings:{[key:number]:ICommentFactory;} = {};
1512

1613
public bind (mode:number, factory:ICommentFactory):void {

‎src/core/Core.d.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
* @description Definitions file for interfaces used in CCL
66
*/
77

8+
/**
9+
* Definintions for binary array tools
10+
*/
811
interface IBinArray {
912
/**
1013
* Binary insert into array
@@ -35,6 +38,10 @@ interface CCLOptions {
3538
}
3639
}
3740

41+
interface ICommentFactory {
42+
(comment:Object):IComment;
43+
}
44+
3845
interface ICommentManager {
3946
width:number;
4047
height:number;
@@ -46,6 +53,9 @@ interface ICommentManager {
4653
finish(c:IComment):void;
4754
}
4855

56+
/**
57+
* Easable motion on a certain parameter
58+
*/
4959
interface IMotion {
5060
from:number;
5161
to:number;
@@ -62,6 +72,7 @@ interface IComment {
6272
ttl:number;
6373
cindex:number;
6474
align:number;
75+
axis:number;
6576
x:number;
6677
y:number;
6778
bottom:number;

0 commit comments

Comments
 (0)