changed init to accomodate the popcorn replacement. no-popcorn
authorhamidouk
Fri, 02 Dec 2011 12:01:43 +0100
branchno-popcorn
changeset 389 2f855c3efd48
parent 388 30277c1e3d46
child 390 9b4e5f606d72
changed init to accomodate the popcorn replacement.
sbin/build/client.xml
src/js/init.js
--- a/sbin/build/client.xml	Fri Dec 02 11:31:54 2011 +0100
+++ b/sbin/build/client.xml	Fri Dec 02 12:01:43 2011 +0100
@@ -70,10 +70,10 @@
 	<target name="concatenate" description="Build the developer release file" depends="make_templates">
 	    <concat encoding="UTF-8" outputencoding="UTF-8" destfile="../../build/LdtPlayer-release.js">
 			<filelist dir="../../src/js/" files="header.js" />
-	        <filelist dir="../../src/js/libs" files="popcorn.js popcorn.youtube.js popcorn.code.js popcorn.jwplayer.js popcorn.mediafragment.js jwplayer.js mustache.js raphael.js" />
+	        <filelist dir="../../src/js/libs" files="jwplayer.js mustache.js raphael.js" />
 	        <filelist dir="../../src/js" files="main.js" />
 	    	<filelist dir="../../build" files="compiled_templates.js" />
-	    	<filelist dir="../../src/js" files="utils.js data.js site.js ui.js widgets.js layout.js init.js" />
+	    	<filelist dir="../../src/js" files="pop.js utils.js data.js site.js ui.js widgets.js layout.js init.js" />
 			<fileset dir="../../src/js/widgets" casesensitive="yes">
 					<include name="**/*.js"/>					
 			</fileset>
--- a/src/js/init.js	Fri Dec 02 11:31:54 2011 +0100
+++ b/src/js/init.js	Fri Dec 02 12:01:43 2011 +0100
@@ -22,7 +22,7 @@
       case "jwplayer":
           var opts = IriSP.jQuery.extend({}, options);
           delete opts.container;
-          pop = Popcorn.jwplayer("#" + containerDiv, "", opts).mediafragment({start : 0});
+          pop = Popcorn.jwplayer("#" + containerDiv, opts);
         break;
       
       case "youtube":