Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files

Added the possibility to specify the id of the document element that …

…the subtitles are appended to.

Made target an options object, with keys and values, as suggested by @ScottDowne.
  • Loading branch information
aldatsa authored and ScottDowne committed Feb 21, 2014
1 parent 373097d commit 5835bbf749fcb7ac38dadca65543370711c447d3
Showing with 15 additions and 4 deletions.
  1. +9 −3 modules/parser/popcorn.parser.js
  2. +6 −1 parsers/parserSRT/popcorn.parserSRT.js
@@ -39,20 +39,26 @@
parseFn,
parser = {};

parseFn = function( filename, callback ) {
parseFn = function( filename, callback, options ) {

if ( !filename ) {
return this;
}

// fixes parameters for overloaded function call
if ( typeof callback !== "function" && !options ) {
options = callback;
callback = null;
}

var that = this;

Popcorn.xhr({
url: filename,
dataType: type,
success: function( data ) {

var tracksObject = definition( data ),
var tracksObject = definition( data, options ),
tracksData,
tracksDataLen,
tracksDef,
@@ -100,4 +106,4 @@

return parser;
};
})( Popcorn );
})( Popcorn );
@@ -26,7 +26,7 @@
SSA tags with {\i1} would open and close italicize {\i0}, but are stripped
Multiple {\pos(142,120)\b1}SSA tags are stripped
*/
Popcorn.parser( "parseSRT", function( data ) {
Popcorn.parser( "parseSRT", function( data, options ) {

// declare needed variables
var retObj = {
@@ -84,6 +84,11 @@
// Later modified by kev: http://kevin.deldycke.com/2007/03/ultimate-regular-expression-for-html-tag-parsing-with-php/
sub.text = sub.text.replace( /&lt;(\/?(font|b|u|i|s))((\s+(\w|\w[\w\-]*\w)(\s*=\s*(?:\".*?\"|'.*?'|[^'\">\s]+))?)+\s*|\s*)(\/?)&gt;/gi, "<$1$3$7>" );
sub.text = sub.text.replace( /\\N/gi, "<br />" );

if ( options && options[ "target" ] ) {
sub.target = options[ "target" ];
}

subs.push( createTrack( "subtitle", sub ) );
}

0 comments on commit 5835bbf

Please sign in to comment.
You can’t perform that action at this time.