Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
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...
commit 5835bbf749fcb7ac38dadca65543370711c447d3 1 parent 373097d
@aldatsa aldatsa authored ScottDowne committed
View
12 modules/parser/popcorn.parser.js
@@ -39,12 +39,18 @@
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({
@@ -52,7 +58,7 @@
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 );
View
7 parsers/parserSRT/popcorn.parserSRT.js
@@ -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 ) );
}
Please sign in to comment.
Something went wrong with that request. Please try again.