Skip to content

Commit

Permalink
Formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
jabbany committed Nov 7, 2016
1 parent 06730b3 commit 16eafd6
Show file tree
Hide file tree
Showing 5 changed files with 153 additions and 137 deletions.
8 changes: 4 additions & 4 deletions Gruntfile.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ module.exports = (grunt) ->
'src/core/Comment.js'
'src/CommentManager.js'
]
SRC_MODULES =

SRC_MODULES =
'filter': ['src/filter/SimpleFilter.js']
'provider': ['src/CommentProvider.js', 'src/Promises.js']
'format-bilibili': ['src/parsers/BilibiliFormat.js']
Expand Down Expand Up @@ -68,7 +68,7 @@ module.exports = (grunt) ->
out: 'dist/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'

# Append Typescript Tasks
ts_config =
ts_config =
options:
target: 'es5'
for key,value of CMP_CORE_TS
Expand Down Expand Up @@ -128,7 +128,7 @@ module.exports = (grunt) ->

# Minify JS
uglify:
options:
options:
banner: LICENSE
all:
files:
Expand Down
241 changes: 123 additions & 118 deletions dist/scripting/OOAPI.js
Original file line number Diff line number Diff line change
@@ -1,131 +1,136 @@
/**
* Out-of API
* This is the definition bridge for OOAPI methods.
* Please always include it
**/
* Out-of-API Methods
* @license MIT
* @description This is the definition bridge for OOAPI methods.
* Please always include it
**/
var __OOAPI = new function () {
var channels = {};

var __OOAPI = new function(){
var channels = {};
function dispatchMessage(msg){
if(channels[msg.channel]){
for(var i = 0; i < channels[msg.channel].listeners.length; i++){
try{
channels[msg.channel].listeners[i](msg.payload);
}catch(e){
if(e.stack){
__trace(e.stack.toString(), 'err');
}else{
__trace(e.toString(), 'err');
}
}
}
}
};

self.addEventListener("message",function(event){
if(!event)
return;
try{
var msg = JSON.parse(event.data);
}catch(e){
__trace(e, "err");
}
if(msg && msg.channel){
dispatchMessage(msg);
}else{
console.log(msg);
}
});

this.listChannels = function(){
var chl = {};
for(var chan in channels){
chl[chan] = {
"max":channels[chan].max,
"listeners":channels[chan].listeners.length
};
}
return chl;
};

this.deleteChannel = function(channelId, authToken){
if(!channels[channelId])
return true;
if(authToken || channels[channelId].auth){
if(authToken === channels[channelId].auth){
delete channels[channelId];
return true;
}
return false;
}else{
delete channels[channelId];
return true;
}
};

this.createChannel = function(channelId, maximum, authToken){
if(!channels[channelId]){
channels[channelId] = {
"max": maximum ? maximum : 0,
"auth": authToken,
"listeners":[]
};
return true;
}
return false;
};

this.addListenerChannel = function(channel, listener){
if(!channels[channel]){
channels[channel] = {
"max":0,
"listeners":[]
};
}
if(channels[channel].max > 0){
if(channels[channel].listeners.length >= channels[channel].max){
return false;
}
}
channels[channel].listeners.push(listener);
return true;
};
function dispatchMessage (msg) {
if (channels[msg.channel]) {
for(var i = 0; i < channels[msg.channel].listeners.length; i++) {
try {
channels[msg.channel].listeners[i](msg.payload);
} catch(e) {
if (e.stack) {
__trace(e.stack.toString(), 'err');
} else {
__trace(e.toString(), 'err');
}
}
}
}
};

self.addEventListener('message', function (event) {
if (!event) {
return;
}
try {
var msg = JSON.parse(event.data);
} catch (e) {
__trace(e, 'err');
return;
}
if (msg && msg.channel) {
dispatchMessage(msg);
} else {
_trace(msg, 'warn');
}
});

this.listChannels = function () {
var chl = {};
for (var chan in channels) {
chl[chan] = {
'max': channels[chan].max,
'listeners': channels[chan].listeners.length
};
}
return chl;
};

this.deleteChannel = function (channelId, authToken){
if (!(channelId in channels)) {
return true;
}
if (authToken || channels[channelId].auth) {
if (authToken === channels[channelId].auth) {
delete channels[channelId];
return true;
}
return false;
} else {
delete channels[channelId];
return true;
}
};

this.createChannel = function (channelId, maximum, authToken) {
if (!(channelId in channels)) {
channels[channelId] = {
'max': maximum ? maximum : 0,
'auth': authToken,
'listeners': []
};
return true;
}
return false;
};

this.addListenerChannel = function (channel, listener) {
if (!(channel in channels)) {
channels[channel] = {
'max': 0,
'listeners': []
};
}
if (channels[channel].max > 0) {
if (channels[channel].listeners.length >=
channels[channel].max) {
return false;
}
}
channels[channel].listeners.push(listener);
return true;
};
};

function __trace(obj, traceMode){
self.postMessage(JSON.stringify({
"channel":"",
"obj":obj,
"mode": (traceMode ? traceMode : "log")
}));
function __trace (obj, traceMode) {
self.postMessage(JSON.stringify({
'channel': '',
'obj': obj,
'mode': (traceMode ? traceMode : 'log')
}));
};

function __channel(id, payload, callback){
self.postMessage(JSON.stringify({
"channel":id,
"payload":payload,
"callback":true
}));
__OOAPI.addListenerChannel(id, callback, true);
function __channel (id, payload, callback) {
self.postMessage(JSON.stringify({
'channel': id,
'payload': payload,
'callback': true
}));
__OOAPI.addListenerChannel(id, callback, true);
};

function __schannel(id, callback){
__OOAPI.addListenerChannel(id, callback);
function __schannel (id, callback) {
__OOAPI.addListenerChannel(id, callback);
};

function __pchannel(id, payload){
self.postMessage(JSON.stringify({
"channel":id,
"payload":payload,
"callback":false
}));
function __pchannel (id, payload) {
self.postMessage(JSON.stringify({
'channel': id,
'payload': payload,
'callback': false
}));
};

function __achannel(id, auth, payload){
self.postMessage(JSON.stringify({
"channel":id,
"auth":auth,
"payload":payload,
"callback":false
}));
function __achannel (id, auth, payload) {
self.postMessage(JSON.stringify({
'channel': id,
'auth': auth,
'payload': payload,
'callback': false
}));
};
25 changes: 14 additions & 11 deletions dist/scripting/api/Global.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
var Global = new function(){
var kvstore = {};
this._set = function(key, val){
kvstore[key] = val;
};
this._get = function(key){
return kvstore[key];
};
this._ = function(key){
return this._get(key);
};
var Global = new function () {
var kvstore = {};

this._set = function (key, val) {
kvstore[key] = val;
};

this._get = function (key) {
return kvstore[key];
};

this._ = function (key) {
return this._get(key);
};
};

var $G = Global;
5 changes: 1 addition & 4 deletions src/core/CommentFactory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@
* different underlying abstractions.
*/
/// <reference path="Core.d.ts" />
interface ICommentFactory {
(comment:Object):IComment;
}
class CommentFactory {
class CommentFactory implements ICommentFactory {
private _bindings:{[key:number]:ICommentFactory;} = {};

public bind (mode:number, factory:ICommentFactory):void {
Expand Down
11 changes: 11 additions & 0 deletions src/core/Core.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
* @description Definitions file for interfaces used in CCL
*/

/**
* Definintions for binary array tools
*/
interface IBinArray {
/**
* Binary insert into array
Expand Down Expand Up @@ -35,6 +38,10 @@ interface CCLOptions {
}
}

interface ICommentFactory {
(comment:Object):IComment;
}

interface ICommentManager {
width:number;
height:number;
Expand All @@ -46,6 +53,9 @@ interface ICommentManager {
finish(c:IComment):void;
}

/**
* Easable motion on a certain parameter
*/
interface IMotion {
from:number;
to:number;
Expand All @@ -62,6 +72,7 @@ interface IComment {
ttl:number;
cindex:number;
align:number;
axis:number;
x:number;
y:number;
bottom:number;
Expand Down

0 comments on commit 16eafd6

Please sign in to comment.