Skip to content

Commit 80145ca

Browse files
jabbanyjabbany
committed
Merge branch 'dev-new-loader' of github.com:jabbany/CommentCoreLibrary into dev-new-loader
2 parents 17961b5 + eacfb36 commit 80145ca

35 files changed

Lines changed: 719 additions & 466 deletions

‎bower.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"name": "comment-core-library",
33
"description": "Javascript library for organizing and displaying danmaku comments",
4-
"version": "0.10.0",
54
"license": "MIT",
65
"authors": [
76
"Jim Chen <knh.jabbany@gmail.com>"

‎demo/debugger.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ function bind(){
276276
}
277277
window._provider = new CommentProvider();
278278
cm.clear();
279-
dmf = "/" + dmf;
279+
dmf = "../" + dmf;
280280
window._provider.addTarget(cm);
281281
start = 0;
282282

‎demo/index.htm‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@
77
<link rel="stylesheet" href="default.css" />
88

99
<!-- CCL -->
10-
<link rel="stylesheet" href="../build/style.css" />
11-
<script type="text/javascript" src="../build/CommentCoreLibrary.js"></script>
10+
<link rel="stylesheet" href="../dist/css/style.css" />
11+
<script type="text/javascript" src="../dist/CommentCoreLibrary.js"></script>
1212
<!-- Base -->
1313
<script src="debugger.js"></script>
1414
<!-- Extensions -->
15-
<script src="../src/extend/fefx.js"></script>
1615
</head>
1716
<body>
1817
<div id="debugger">
@@ -59,8 +58,6 @@ <h3>AcFun (Experimental)</h3>
5958
<a id="test-ts-3" href="javascript:;">XSS</a>
6059
</p>
6160
<p>Filters: <br>
62-
<a onclick="cm.filter.setRuntimeFilter(fefx.center_dim);" href="javascript:;">Apply Center-Transparency</a><br>
63-
<a onclick="cm.filter.setRuntimeFilter(fefx.center_speedup);" href="javascript:;">Apply Center-Speedup</a><br>
6461
<a id="profiler-start" href="javascript:;">Profiler</a><br>
6562
<a onclick="cm.filter.setRuntimeFilter(null);" href="javascript:;">Clear Runtime Filters</a>
6663
</p>

‎demo/player-demo.htm‎

Lines changed: 63 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,70 @@
11
<!DOCTYPE html>
22
<html>
33
<head>
4-
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5-
<meta http-equiv="X-UA-Compatible" value="IE=9">
6-
<link rel="stylesheet" href="../default.css" />
7-
<link rel="stylesheet" href="../build/base.css" />
8-
<!-- Files Below May Be Combined/Concated into one on Deployment Servers -->
9-
<script src="../CommentFilter.js"></script>
10-
<script src="../CommentSpaceAllocator.js"></script>
11-
<script src="../CommentCoreLibrary.js"></script>
12-
<!-- A few helpers to do some decoding/fetching below-->
13-
<script src="../libxml.js"></script>
14-
<script src="../parsers/BilibiliFormat.js"></script>
15-
<title>Testrun Player</title>
4+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
5+
<meta http-equiv="X-UA-Compatible" value="IE=9">
6+
<link rel="stylesheet" href="default.css" />
7+
<link rel="stylesheet" href="../dist/css/style.css" />
8+
<script src="../dist/CommentCoreLibrary.js"></script>
9+
<title>Testrun Player</title>
1610
</head>
1711
<body>
18-
<div class="m20 abp" id="player">
19-
<div id="commentCanvas" class="container"></div>
20-
<video id="abpVideo" height="100%" width="100%" poster="http://content.bitsontherun.com/thumbs/bkaovAYt-720.jpg" controls="none">
21-
<source src="http://content.bitsontherun.com/videos/bkaovAYt-52qL9xLP.mp4" type="video/mp4">
22-
<source src="http://content.bitsontherun.com/videos/bkaovAYt-27m5HpIu.webm" type="video/webm">
23-
<p class="warning">Your browser does not support HTML5 video.</p>
24-
</video>
25-
</div>
26-
<script type="text/javascript">
27-
var cm = null;
28-
var timer = 0;
29-
function togglePlayback(){
30-
var videoPlayer = $('abpVideo');
31-
if (videoPlayer == null)
32-
return; //Called when not fully loaded
33-
if (videoPlayer.paused){
34-
if(cm != null){
35-
timer = setInterval(function(){
36-
cm.time(Math.round(videoPlayer.currentTime * 1000));
37-
},10);
38-
}
39-
cm.startTimer();
40-
videoPlayer.play();
41-
}else{
42-
if(cm != null){
43-
cm.stopTimer();
44-
clearTimeout(timer);
45-
}
46-
videoPlayer.pause();
47-
}
48-
}
49-
window.addEventListener("load",function(){
50-
//Hook basics
51-
cm = new CommentManager($('commentCanvas'));
52-
cm.init();
53-
cm.clear();
54-
try{
55-
clearTimeout(timer);
56-
}catch(e){}
57-
$('player').addEventListener("click",function(){
58-
togglePlayback();
59-
});
60-
CommentLoader("../tests/comment.xml",cm,'bilibili');
61-
cm.startTimer();
62-
});
63-
</script>
12+
<div class="m20 abp" id="player">
13+
<div id="commentCanvas" class="container"></div>
14+
<video id="abpVideo" height="100%" width="100%" poster="http://content.bitsontherun.com/thumbs/bkaovAYt-720.jpg" controls="none">
15+
<source src="http://content.bitsontherun.com/videos/bkaovAYt-52qL9xLP.mp4" type="video/mp4">
16+
<source src="http://content.bitsontherun.com/videos/bkaovAYt-27m5HpIu.webm" type="video/webm">
17+
<p class="warning">Your browser does not support HTML5 video.</p>
18+
</video>
19+
</div>
20+
<script type="text/javascript">
21+
var $ = function(e) {return document.getElementById(e);};
22+
var cm = null;
23+
var timer = 0;
24+
function togglePlayback () {
25+
var videoPlayer = $('abpVideo');
26+
if (videoPlayer == null) {
27+
return; //Called when not fully loaded
28+
}
29+
if (videoPlayer.paused){
30+
if(cm != null){
31+
timer = setInterval(function () {
32+
cm.time(Math.round(videoPlayer.currentTime * 1000));
33+
}, 10);
34+
}
35+
cm.startTimer();
36+
videoPlayer.play();
37+
}else{
38+
if(cm != null){
39+
cm.stopTimer();
40+
clearTimeout(timer);
41+
}
42+
videoPlayer.pause();
43+
}
44+
}
45+
window.addEventListener("load",function () {
46+
//Hook basics
47+
cm = new CommentManager($('commentCanvas'));
48+
cm.init();
49+
cm.start();
50+
try{
51+
clearTimeout(timer);
52+
}catch(e){
53+
// Foo
54+
}
55+
$('player').addEventListener("click",function(){
56+
togglePlayback();
57+
});
58+
var cp = (new CommentProvider()).addStaticSource(
59+
CommentProvider.XMLProvider("GET", "../test/comment.xml"),
60+
CommentProvider.SOURCE_XML).addParser(
61+
new BilibiliFormat.XMLParser(),
62+
CommentProvider.SOURCE_XML).addTarget(cm);
63+
cp.start().catch(function (e) {
64+
alert(e);
65+
});
66+
cm.clear();
67+
});
68+
</script>
6469
</body>
6570
</html>

‎demo/scripting/ccl.htm‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
55
<meta http-equiv="X-UA-Compatible" value="IE=9">
66
<link rel="stylesheet" href="../../demo/default.css" />
7-
<link rel="stylesheet" href="../../build/style.css" />
7+
<link rel="stylesheet" href="../../dist/css/style.css" />
88
<!-- Run 'make' to build the file -->
9-
<script src="../../build/CommentCoreLibrary.js"></script>
10-
11-
<!-- A few helpers to do some decoding/fetching below-->
12-
<script src="../../demo/libxml.js"></script>
9+
<script src="../../dist/CommentCoreLibrary.js"></script>
1310
<style>
1411
pre{margin:0;}
1512
pre.error{color:#f00;}
@@ -27,7 +24,7 @@
2724
.s-button:hover,.abp .button:hover{background:#f88; color:#000;}
2825
</style>
2926
<!-- Scripting Extensions -->
30-
<script src="../../build/scripting/Host.js"></script>
27+
<script src="../../dist/scripting/Host.js"></script>
3128

3229
<title>Testrun Sandbox For CCL /w Scripting Enabled</title>
3330
</head>

‎demo/scripting/index.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
pre.error{color:#f00;}
4949
pre.warning{color:#FFC500;}
5050
</style>
51-
<link rel="stylesheet" href="../../build/style.css" />
52-
<script src="../../build/scripting/Host.js" type="text/javascript"></script>
51+
<link rel="stylesheet" href="../../dist/css/style.css" />
52+
<script src="../../dist/scripting/Host.js" type="text/javascript"></script>
5353
<script src="sandbox.js" type="text/javascript" ></script>
5454
</head>
5555
<body style="background:#000;">

‎demo/scripting/sandbox.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var $ = function(e){return window.document.getElementById(e);}
22
window.addEventListener('load',function(){
3-
window.bscripter = new CCLScripting("../../build/scripting/Worker.js");
3+
window.bscripter = new CCLScripting("../../dist/scripting/Worker.js");
44
bscripter.logger = new function(){
55
this.log = function(t){
66
$("output").innerHTML = "<pre>" + t.toString() + "</pre>" + $("output").innerHTML;

demo/intro/index.htm renamed to demo/tutorial/index.htm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
<meta http-equiv="X-UA-Compatible" value="IE=9">
66
<title>This is a Sample of the Library</title>
77
<!-- 在这里载入CCL的基础库 -->
8-
<link rel="stylesheet" href="../../build/style.css" />
9-
<script type="text/javascript" src="../../build/CommentCoreLibrary.js"></script>
8+
<link rel="stylesheet" href="../../dist/style.css" />
9+
<script type="text/javascript" src="../../dist/CommentCoreLibrary.js"></script>
1010
<!-- 你还可以载入其他的库，比如jQuery之类的 -->
1111
<link rel="stylesheet" href="my-page-styles.css" />
1212
</head>

demo/intro/main.js renamed to demo/tutorial/main.js

File renamed without changes.

demo/intro/my-page-styles.css renamed to demo/tutorial/my-page-styles.css

File renamed without changes.

0 commit comments

Comments
 (0)