Changeset 1879

Timestamp:

07/01/11 11:01:19 (23 months ago)

Author:

jeroen

Message:

started working on Flash version of plugin. Also added JS minification/image embedding

Location:

branches/sharing

Files:

• assets/copy.png (added)
• assets/icon.png (added)
• assets/input.png (added)
• build/build.xml (modified) (1 diff)
• build/encode-images.py (modified) (1 diff)
• libs (added)
• libs/jwplayer-5-classes.xml (added)
• libs/jwplayer-5-lib.swc (added)
• sharing.js (added)
• sharing.swf (added)
• src/as (added)
• src/as/Sharing.as (added)
• src/js (added)
• src/js/sharing.js (moved) (moved from branches/sharing/src/sharing.js) (3 diffs)
• test/basic.html (modified) (1 diff)
• test/flash.html (added)
• test/iframe.html (modified) (1 diff)
• test/index.html (modified) (1 diff)
• test/modes.html (modified) (1 diff)
• test/playlist.html (modified) (1 diff)

branches/sharing/build/build.xml

@@ -1 @@
-<project name="Plugin" default="buildJS">
+<project name="Plugin" default="buildAS">
 
-    <target name="buildJS" depends="buildAS">
+
+    <target name="buildJS">
         <java jar="yuicompressor.jar" fork="true">
-            <arg line="'../src/sharing.js'"/>
+            <arg line="'../src/js/sharing.js'"/>
             <arg line="-o '../sharing.js'"/>
         </java>
-        <echo message="Minified javascript." />
         <exec executable="python">
             <arg file="encode-images.py" />
             <arg file="../sharing.js" />
-            <arg file="../src/assets/" />
+            <arg file="../assets/" />
         </exec>
-        <echo message="Encoded images to base64." />
+        <echo message="Compiled JS plugin." />
+    </target>
+
+    <target name="buildAS" depends="buildJS">
+        <exec executable="/Developer/SDKs/flex_sdk_4/bin/mxmlc" dir="../">
+            <arg line="src/as/Sharing.as" />
+            <arg line="-o sharing.swf" />
+            <arg line="-sp src/as" />
+            <arg line="-library-path+=libs" />
+            <arg line="-load-externs=libs/jwplayer-5-classes.xml" />
+            <arg line="-static-link-runtime-shared-libraries=true" />
+            <arg line="-use-network=false" />
+            <arg line="-optimize=true" />
+            <arg line="-incremental=false" />
+        </exec>
+        <echo message="Compiled SWF plugin." />
     </target>
 

branches/sharing/build/encode-images.py

@@ -17 +17 @@
     }
     for ext in extensions:
-        regex = re.compile('url\((\.*\/*)([a-zA-Z0-9-_/]+)\.%s\)' % ext)
+        regex = re.compile('(\.*\/*)([a-zA-Z0-9-_/]+)\.%s' % ext)
         matches = regex.finditer(css)
         if matches:

branches/sharing/src/js/sharing.js

@@ -112 +112 @@
     /** Set dock buttons when player is ready. **/
     function _setup() {
+        if(_player.getRenderingMode() == 'flash') { return; }
         _player.getPlugin("dock").setButton('share',show,'../assets/share.png');
         _div.onclick = _hide;
@@ -152 +153 @@
     /** Reposition elements upon a resize. **/
     this.resize = function(width,height) {
+        if(_player.getRenderingMode() == 'flash') { return; }
         _style(_div,{
             backgroundImage: 'url(../assets/sheet.png)',
@@ -181 +183 @@
 
 /** Register the plugin with JW Player. **/
-jwplayer().registerPlugin('sharing', template);
+jwplayer().registerPlugin('sharing', template,'./sharing.swf');
 
 

branches/sharing/test/basic.html

@@ -27 +27 @@
     };
     if(codelink) { 
-        options.plugins = { '../src/sharing.js': {
+        options.plugins = { '../sharing.js': {
             code: '<iframe src="http://content.bitsontherun.com/previews/bkaovAYt-V7MoJd7l" width="480" height="270" frameborder="0" scrolling="auto"></iframe>',
             link: 'http://www.bigbuckbunny.org/'
         }};
     } else { 
-        options.plugins = { '../src/sharing.js': {} };
+        options.plugins = { '../sharing.js': {} };
     }
     jwplayer("container").setup(options);

branches/sharing/test/iframe.html

@@ -18 +18 @@
     image: 'http://content.bitsontherun.com/thumbs/bkaovAYt-480.jpg',
     flashplayer: 'assets/jwplayer.swf',
-    plugins: { '../src/sharing.js': {} },
+    plugins: { '../sharing.js': {} },
     height: 180,
     width: 320

branches/sharing/test/index.html

@@ -20 +20 @@
     <li><a href="playlist.html">Sharing in Playlist</a></li>
     <li><a href="iframed.html">Within an iFrame</a></li>
+    <li><a href="flash.html">Standalone Flash</a></li>
 </ul>
 

branches/sharing/test/modes.html

@@ -25 +25 @@
         image: 'http://content.bitsontherun.com/thumbs/bkaovAYt-480.jpg',
         height: 294,
-        plugins: {'../src/sharing.js': {
+        plugins: {'../sharing.js': {
             code: '<iframe src="http://content.bitsontherun.com/previews/bkaovAYt-V7MoJd7l" width="480" height="270" frameborder="0" scrolling="auto"></iframe>',
             link: 'http://www.bigbuckbunny.org/'

branches/sharing/test/playlist.html

@@ -23 +23 @@
         'playlist.position': 'right',
         'playlist.size': 320,
-        plugins: { '../src/sharing.js': {} },
+        plugins: { '../sharing.js': {} },
         width: 720
     };