Skip to content

Commit

Permalink
More enhancements
Browse files Browse the repository at this point in the history
- Removed files not being used (will migrate to alternate project) or not working (e.g. things in src/extend)
- Renamed demo/intro to demo/tutorial to reflect future renaming of Intro.md to Tutorial.md
- Fixed demo to use files in dist/ following change of compile target directory
- Figured out how to parse AcFun advanced mode comments.
- Separated the Comment object's .align into .align (align mode) and .axis (axis direction)
- Enhancements to CommonDanmakuFormat and AcfunFormat
  • Loading branch information
jabbany committed Oct 19, 2016
1 parent 25cb15e commit 903d4a9
Show file tree
Hide file tree
Showing 30 changed files with 728 additions and 474 deletions.
2 changes: 1 addition & 1 deletion demo/debugger.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ function bind(){
}
window._provider = new CommentProvider();
cm.clear();
dmf = "/" + dmf;
dmf = "../" + dmf;
window._provider.addTarget(cm);
start = 0;

Expand Down
7 changes: 2 additions & 5 deletions demo/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@
<link rel="stylesheet" href="default.css" />

<!-- CCL -->
<link rel="stylesheet" href="../build/style.css" />
<script type="text/javascript" src="../build/CommentCoreLibrary.js"></script>
<link rel="stylesheet" href="../dist/css/style.css" />
<script type="text/javascript" src="../dist/CommentCoreLibrary.js"></script>
<!-- Base -->
<script src="debugger.js"></script>
<!-- Extensions -->
<script src="../src/extend/fefx.js"></script>
</head>
<body>
<div id="debugger">
Expand Down Expand Up @@ -59,8 +58,6 @@ <h3>AcFun (Experimental)</h3>
<a id="test-ts-3" href="javascript:;">XSS</a>
</p>
<p>Filters: <br>
<a onclick="cm.filter.setRuntimeFilter(fefx.center_dim);" href="javascript:;">Apply Center-Transparency</a><br>
<a onclick="cm.filter.setRuntimeFilter(fefx.center_speedup);" href="javascript:;">Apply Center-Speedup</a><br>
<a id="profiler-start" href="javascript:;">Profiler</a><br>
<a onclick="cm.filter.setRuntimeFilter(null);" href="javascript:;">Clear Runtime Filters</a>
</p>
Expand Down
121 changes: 63 additions & 58 deletions demo/player-demo.htm
Original file line number Diff line number Diff line change
@@ -1,65 +1,70 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" value="IE=9">
<link rel="stylesheet" href="../default.css" />
<link rel="stylesheet" href="../build/base.css" />
<!-- Files Below May Be Combined/Concated into one on Deployment Servers -->
<script src="../CommentFilter.js"></script>
<script src="../CommentSpaceAllocator.js"></script>
<script src="../CommentCoreLibrary.js"></script>
<!-- A few helpers to do some decoding/fetching below-->
<script src="../libxml.js"></script>
<script src="../parsers/BilibiliFormat.js"></script>
<title>Testrun Player</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" value="IE=9">
<link rel="stylesheet" href="default.css" />
<link rel="stylesheet" href="../dist/css/style.css" />
<script src="../dist/CommentCoreLibrary.js"></script>
<title>Testrun Player</title>
</head>
<body>
<div class="m20 abp" id="player">
<div id="commentCanvas" class="container"></div>
<video id="abpVideo" height="100%" width="100%" poster="http://content.bitsontherun.com/thumbs/bkaovAYt-720.jpg" controls="none">
<source src="http://content.bitsontherun.com/videos/bkaovAYt-52qL9xLP.mp4" type="video/mp4">
<source src="http://content.bitsontherun.com/videos/bkaovAYt-27m5HpIu.webm" type="video/webm">
<p class="warning">Your browser does not support HTML5 video.</p>
</video>
</div>
<script type="text/javascript">
var cm = null;
var timer = 0;
function togglePlayback(){
var videoPlayer = $('abpVideo');
if (videoPlayer == null)
return; //Called when not fully loaded
if (videoPlayer.paused){
if(cm != null){
timer = setInterval(function(){
cm.time(Math.round(videoPlayer.currentTime * 1000));
},10);
}
cm.startTimer();
videoPlayer.play();
}else{
if(cm != null){
cm.stopTimer();
clearTimeout(timer);
}
videoPlayer.pause();
}
}
window.addEventListener("load",function(){
//Hook basics
cm = new CommentManager($('commentCanvas'));
cm.init();
cm.clear();
try{
clearTimeout(timer);
}catch(e){}
$('player').addEventListener("click",function(){
togglePlayback();
});
CommentLoader("../tests/comment.xml",cm,'bilibili');
cm.startTimer();
});
</script>
<div class="m20 abp" id="player">
<div id="commentCanvas" class="container"></div>
<video id="abpVideo" height="100%" width="100%" poster="http://content.bitsontherun.com/thumbs/bkaovAYt-720.jpg" controls="none">
<source src="http://content.bitsontherun.com/videos/bkaovAYt-52qL9xLP.mp4" type="video/mp4">
<source src="http://content.bitsontherun.com/videos/bkaovAYt-27m5HpIu.webm" type="video/webm">
<p class="warning">Your browser does not support HTML5 video.</p>
</video>
</div>
<script type="text/javascript">
var $ = function(e) {return document.getElementById(e);};
var cm = null;
var timer = 0;
function togglePlayback () {
var videoPlayer = $('abpVideo');
if (videoPlayer == null) {
return; //Called when not fully loaded
}
if (videoPlayer.paused){
if(cm != null){
timer = setInterval(function () {
cm.time(Math.round(videoPlayer.currentTime * 1000));
}, 10);
}
cm.startTimer();
videoPlayer.play();
}else{
if(cm != null){
cm.stopTimer();
clearTimeout(timer);
}
videoPlayer.pause();
}
}
window.addEventListener("load",function () {
//Hook basics
cm = new CommentManager($('commentCanvas'));
cm.init();
cm.start();
try{
clearTimeout(timer);
}catch(e){
// Foo
}
$('player').addEventListener("click",function(){
togglePlayback();
});
var cp = (new CommentProvider()).addStaticSource(
CommentProvider.XMLProvider("GET", "../test/comment.xml"),
CommentProvider.SOURCE_XML).addParser(
new BilibiliFormat.XMLParser(),
CommentProvider.SOURCE_XML).addTarget(cm);
cp.start().catch(function (e) {
alert(e);
});
cm.clear();
});
</script>
</body>
</html>
9 changes: 3 additions & 6 deletions demo/scripting/ccl.htm
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="X-UA-Compatible" value="IE=9">
<link rel="stylesheet" href="../../demo/default.css" />
<link rel="stylesheet" href="../../build/style.css" />
<link rel="stylesheet" href="../../dist/css/style.css" />
<!-- Run 'make' to build the file -->
<script src="../../build/CommentCoreLibrary.js"></script>

<!-- A few helpers to do some decoding/fetching below-->
<script src="../../demo/libxml.js"></script>
<script src="../../dist/CommentCoreLibrary.js"></script>
<style>
pre{margin:0;}
pre.error{color:#f00;}
Expand All @@ -27,7 +24,7 @@
.s-button:hover,.abp .button:hover{background:#f88; color:#000;}
</style>
<!-- Scripting Extensions -->
<script src="../../build/scripting/Host.js"></script>
<script src="../../dist/scripting/Host.js"></script>

<title>Testrun Sandbox For CCL /w Scripting Enabled</title>
</head>
Expand Down
4 changes: 2 additions & 2 deletions demo/scripting/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@
pre.error{color:#f00;}
pre.warning{color:#FFC500;}
</style>
<link rel="stylesheet" href="../../build/style.css" />
<script src="../../build/scripting/Host.js" type="text/javascript"></script>
<link rel="stylesheet" href="../../dist/css/style.css" />
<script src="../../dist/scripting/Host.js" type="text/javascript"></script>
<script src="sandbox.js" type="text/javascript" ></script>
</head>
<body style="background:#000;">
Expand Down
2 changes: 1 addition & 1 deletion demo/scripting/sandbox.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var $ = function(e){return window.document.getElementById(e);}
window.addEventListener('load',function(){
window.bscripter = new CCLScripting("../../build/scripting/Worker.js");
window.bscripter = new CCLScripting("../../dist/scripting/Worker.js");
bscripter.logger = new function(){
this.log = function(t){
$("output").innerHTML = "<pre>" + t.toString() + "</pre>" + $("output").innerHTML;
Expand Down
4 changes: 2 additions & 2 deletions demo/intro/index.htm → demo/tutorial/index.htm
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<meta http-equiv="X-UA-Compatible" value="IE=9">
<title>This is a Sample of the Library</title>
<!-- 在这里载入CCL的基础库 -->
<link rel="stylesheet" href="../../build/style.css" />
<script type="text/javascript" src="../../build/CommentCoreLibrary.js"></script>
<link rel="stylesheet" href="../../dist/style.css" />
<script type="text/javascript" src="../../dist/CommentCoreLibrary.js"></script>
<!-- 你还可以载入其他的库,比如jQuery之类的 -->
<link rel="stylesheet" href="my-page-styles.css" />
</head>
Expand Down
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 903d4a9

Please sign in to comment.