Changeset 1277


Ignore:
Timestamp:
09/16/10 02:45:07 (3 years ago)
Author:
zach
Message:

Un-reverse merging

Location:
trunk/html5
Files:
15 deleted
3 edited
16 copied

Legend:

Unmodified
Added
Removed

  • trunk/html5/build/build.xml

    r1215 r1277  
    33 
    44        <target name="clean"> 
    5                 <delete file="${basedir}/jquery.jwplayer.js" quiet="true"/> 
    6                 <delete file="${basedir}/jquery.jwplayer.min.js" quiet="true"/> 
     5                <delete file="${basedir}/jwplayer.js" quiet="true"/> 
     6                <delete file="${basedir}/jwplayer.min.js" quiet="true"/> 
    77        </target> 
    88 
    99        <target name="concat" depends="clean"> 
    10                 <concat destfile="${basedir}/jquery.jwplayer.js"> 
    11                         <fileset dir="${basedir}/src/" includes="*.js" /> 
     10                <concat destfile="${basedir}/jwplayer.html5.js"> 
     11                        <fileset dir="${basedir}/src/html5" includes="jwplayer.html5.js" /> 
     12                        <fileset dir="${basedir}/src/html5" includes="jwplayer.html5.states.js" /> 
     13                        <fileset dir="${basedir}/src/html5" includes="jwplayer.html5.events.js" /> 
     14                        <fileset dir="${basedir}/src/html5" includes="jwplayer.html5.*.js" excludes="jwplayer.html5.js,jwplayer.html5.states.js,jwplayer.html5.events.js" /> 
    1215                </concat> 
    1316        </target> 
    … …  
    1922        <target name="build-release" depends="concat"> 
    2023                <java jar="${basedir}/build/yuicompressor-2.4.2.jar" fork="true"> 
    21                         <arg line="'${basedir}/jquery.jwplayer.js'"/> 
    22                         <arg line="-o '${basedir}/jquery.jwplayer.min.js'"/> 
     24                        <arg line="'${basedir}/jwplayer.html5.js'"/> 
     25                        <arg line="-o '${basedir}/jwplayer.html5.min.js'"/> 
    2326                </java> 
    2427        </target> 
    2528         
    2629        <target name="build-zip" depends="concat"> 
    27                  <zip destfile="${basedir}/mediaplayer-html5-beta.zip"> 
     30                 <zip destfile="${basedir}/mediaplayer-html5.zip"> 
    2831                        <fileset dir="." includes="license.txt"/> 
    2932                        <fileset dir="." includes="readme.txt"/> 
    30                         <fileset dir="." includes="jquery.jwplayer.js"/> 
    31                         <fileset dir="./lib" includes="jquery.js"/> 
     33                        <fileset dir="." includes="jwplayer.html5.js"/> 
    3234                        <fileset dir="./assets/" includes="**/*.*" excludes=".svn,*.zip"/> 
    3335                 </zip> 

  • trunk/html5/test/examples/single_mp4.html

    r1215 r1277  
    99<p>This is the basic setup for a video that plays on Safari,iPhone/iPad and Chrome. Firefox, IE and Opera will fallback to Flash. A poster image is included.</p> 
    1010 
    11 <p><video height="270" id="player" poster="/jw/upload/bunny.jpg" src="/jw/upload/bunny.mp4" width="480"></video></p> 
     11<p><video height="270" id="player" poster="http://content.bitsontherun.com/thumbs/nPripu9l-320.jpg" src="http://content.bitsontherun.com/videos/nPripu9l-327.mp4" width="480"></video></p> 
    1212 
    13 <script type="text/javascript" src="/jw/js/jquery.jwplayer.js"></script> 
     13<script type="text/javascript" src="../../lib/jquery.js"></script> 
     14<script type="text/javascript" src="../../jwplayer.js"></script> 
    1415<script type="text/javascript"> 
    15         $('#player').jwplayer({ 
     16        var player = new jwplayer.html5(document.getElementById("player")); 
     17        player.setup({ 
     18                sources: [{ 
     19                        file:"http://content.bitsontherun.com/videos/nPripu9l-327.mp4", 
     20                        type: "video/mp4" 
     21                }], 
    1622                flashplayer:'/files/player.swf', 
    1723                skin:'/files/skins/five/five.xml' 
    … …  
    2228<p>Here is the code for this setup. Make sure to change all links to the scripts, player, image and video. They must refer to the correct files on your server.</p> 
    2329 
    24 <p>First, place this code in the <ems>&lt;head&gt;</ems> of your page:</p> 
     30<p>First, place this code in the <strong>&lt;head&gt;</strong> of your page:</p> 
    2531<pre>&lt;script type="text/javascript" src="/scripts/jquery.js"&gt;&lt;/script&gt; 
    2632&lt;script type="text/javascript" src="/scripts/jquery.jwplayer.js"&gt;&lt;/script&gt;</pre> 

  • trunk/html5/test/index.html

    r1215 r1277  
    33<title>JW Player Testing Tool</title> 
    44<link rel="stylesheet" href="files/style.css" type="text/css"> 
     5<script type="text/javascript"> 
     6var jwplayer = function(){}; 
     7</script> 
    58<script type="text/javascript" src="../lib/jquery.js"></script> 
    6 <script type="text/javascript" src="../jquery.jwplayer.js"></script> 
     9<script type="text/javascript" src="../jwplayer.html5.js"></script> 
    710<script type="text/javascript"> 
    8  
    911        /** List with settings for this testing tool (skins / examples). **/ 
    1012        var settings = { 
    1113                players: {  
    12                         html5:'../jquery.jwplayer.js' 
     14                        html5:'../jwplayer.html5.js' 
    1315                }, 
    1416                skins: { 
    … …  
    246248                var lnk = 'http://developer.longtailvideo.com/player/trunk/html5/test/'; 
    247249                $("#permalink").val(lnk+'?'+$.param(variables)); 
    248                 if(variables['file']) { 
     250                variables["playlist"] = [{"sources":[{"file": variables['file']}]}, {"sources":[{"file": variables['file']}]}, {"sources":[{"file": variables['file']}]}] 
     251                /*if(variables['file']) { 
    249252                        $('#container').attr('src',variables['file']); 
    250253                } 
    251254                if(variables['image']) {  
    252255                        $('#container').attr('poster',variables['image']); 
    253                 } 
     256                }*/ 
    254257                for (itm in variables) { 
    255258                        variables[itm] = serialize(variables[itm]); 
    256259                } 
    257                 $('#container').jwplayer(variables); 
     260                jwplayer.html5(document.getElementById("container")).setup(variables); 
    258261        }; 
    259262        /** Change the page URL. **/ 
    … …  
    296299                evt.preventDefault(); 
    297300                var typ = $('#vartype').val().toString(); 
    298                 var prp = $.jwplayer()[typ](); 
     301                var prp = jwplayer()[typ](); 
    299302                alert(prp); 
    300303        }; 
    … …  
    306309                var pr2 = serialize($('#sendeventdata2').val()); 
    307310                if((pr2 !== undefined) && (pr2 !== null)) { 
    308                         $.jwplayer()[typ](pr1,pr2); 
     311                        jwplayer()[typ](pr1,pr2); 
    309312                } else if ((pr1 !== undefined) && (pr1 !== null)) {  
    310                         $.jwplayer()[typ](pr1); 
     313                        jwplayer()[typ](pr1); 
    311314                } else {  
    312                         $.jwplayer()[typ](); 
     315                        jwplayer()[typ](); 
    313316                } 
    314317        }; 
    … …  
    317320                evt.preventDefault(); 
    318321                var typ = $('#eventtype').val(); 
    319                 $.jwplayer()[typ](alertValue); 
     322                jwplayer()[typ](alertValue); 
    320323        }; 
    321324        /** Alert responses from the player. **/ 
Note: See TracChangeset for help on using the changeset viewer.