Skip to content

Update ass.js for gh-pages. #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fb39ca4 wants to merge 3 commits into
base: gh-pages
Choose a base branch
from
Open

Update ass.js for gh-pages. #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d7eeaf
Added time offset property to Script Info.
fb39ca4 Aug 26, 2014
5c277f2
Obeys timing offset property.
fb39ca4 Aug 26, 2014
263aaf9
Only keep core files.
fb39ca4 Sep 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 3 additions & 14 deletions ass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,6 @@ function Ass() {
this.scriptInfo = new Ass.ScriptInfo();
this.dialogue = [];
this.styles = {};
/*this.css = {}
this.css.identifier = "ass-js_" + Ass.util.randomString(8);
var styleElement = document.createElement("style");
styleElement.type = "text/css";
styleElement.title = this.css.identifier;
document.head.appendChild(styleElement);
for (var i = 0; i < document.styleSheets.length; i++) {
this.css.styleSheet = document.styleSheets[i];
if (this.css.styleSheet.title == this.css.identifier) {
console.log("using style sheet ", i);
break;
}
}*/
}

Ass.fromString = function(input) {
Expand Down Expand Up @@ -911,13 +898,15 @@ Ass.ScriptInfo = function() {
this.playResY = 720;
this.scaledBorderAndShadow = false;
this.wrapStyle = 0;
this.timingOffset = 0;
}

Ass.ScriptInfo.fromRaw = function(raw) {
var si = new Ass.ScriptInfo();
if (parseFloat(raw.PlayResX) != NaN) si.playResX = parseFloat(raw.PlayResX);
if (parseFloat(raw.PlayResY) != NaN) si.playResY = parseFloat(raw.PlayResY);
if (parseInt(raw.WrapStyle) >= 0 && parseInt(raw.WrapStyle) < 4) si.wrapStyle = parseInt(raw.WrapStyle);
if (parseFloat(raw.TimingOffset) != NaN) si.timingOffset = parseFloat(raw.TimingOffset);
si.scriptType = raw.ScriptType;
return si;
}
Expand Down Expand Up @@ -1294,4 +1283,4 @@ Array.prototype.duplicate = function() {
var newArray = []
while (i--) newArray[i] = this[i];
return newArray;
}
}
Binary file removed font/vjs.eot
View file
Open in desktop
Binary file not shown.
28 changes: 0 additions & 28 deletions font/vjs.svg
View file
Open in desktop

This file was deleted.

Binary file removed font/vjs.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed font/vjs.woff
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions htmlrenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ AssRenderer.prototype.generateHTML = function() {
for (var i = 0; i < this.assData.dialogue.length; i++) {
var event = {};
event.ass = this.assData.dialogue[i];
event.startTime = event.ass.startTime;
event.endTime = event.ass.endTime;
event.startTime = event.ass.startTime + this.assData.scriptInfo.timingOffset;
event.endTime = event.ass.endTime + this.assData.scriptInfo.timingOffset;
event.duration = event.endTime - event.startTime;
if (event.duration != 0) this.events.push(event);
}
Expand Down Expand Up @@ -789,4 +789,4 @@ AssRenderer.prototype.getLine = function(number) {

AssRenderer.generateSvg = function(points) {

}
}
135 changes: 0 additions & 135 deletions index.html
View file
Open in desktop

This file was deleted.

Loading