[Openutils-svn] SF.net SVN: openutils:[4464] magnoliamodules/trunk/openutils-mgnlmedia/src/ main/resources/META-INF/tags/media

[<fg...@us...>]

Revision: 4464
          http://openutils.svn.sourceforge.net/openutils/?rev=4464&view=rev
Author:   fgiust
Date:     2013-12-08 12:25:00 +0000 (Sun, 08 Dec 2013)
Log Message:
-----------
add support for jwplayer6

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
    magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag	2013-12-08 12:14:34 UTC (rev 4463)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag	2013-12-08 12:25:00 UTC (rev 4464)
@@ -30,8 +30,13 @@
     description="Adds the share features to the player (only supported for jwplayer 4/5)" />
   <jsp:directive.attribute name="analytics" required="false" rtexprvalue="true" type="java.lang.Boolean"
     description="Track views using google analytics (only supported for jwplayer 5)" />
+  <jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String"
+    description="Player path (jwplayer5 or jwplayer6)" />
+    
+  <c:set var="playerfolder" value="${player}" />
+  
   <c:if test="${empty requestScope['mgnlmedia_jwplayer5_link_drawn']}">
-    <script type="text/javascript" src="${pageContext.request.contextPath}/.resources/media/players/jwplayer5/jwplayer.js"><!-- -->
+    <script type="text/javascript" src="${pageContext.request.contextPath}/.resources/media/players/${playerfolder}/jwplayer.js"><!-- -->
     </script>
     <c:set var="mgnlmedia_jwplayer5_link_drawn" scope="request" value="true" />
   </c:if>
@@ -75,14 +80,14 @@
               streamer: "${fn:substring(url, 0, fn:length(url) - fn:length(file))}",
               ]]>
       </c:when>
-      <c:otherwise> file:"${fn:contains(url, '://')? '' : pageContext.request.contextPath}${url}",</c:otherwise>
+      <c:otherwise> file:"${url}",</c:otherwise>
     </c:choose>
     
 
     <![CDATA[
 modes: [
   { type: "flash", 
-      src: "${pageContext.request.contextPath}/.resources/media/players/jwplayer5/player.swf" 
+      src: "${pageContext.request.contextPath}/.resources/media/players/${playerfolder}/player.swf" 
   },
   { type: "html5" },
   { type: "download" }
@@ -111,7 +116,7 @@
               <![CDATA[file=${file}&amp;streamer=${fn:substring(url, 0, fn:length(url) - fn:length(file))}]]>
       </c:when>
       <c:otherwise>
-              <![CDATA[file=${fn:contains(url, '://')? '' : pageContext.request.contextPath}${url}]]>
+              <![CDATA[file=${url}]]>
       </c:otherwise>
     </c:choose>
   </c:set>

Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2013-12-08 12:14:34 UTC (rev 4463)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag	2013-12-08 12:25:00 UTC (rev 4464)
@@ -76,17 +76,12 @@
   </c:if>
   <c:if test="${!empty(url)}">
     <c:choose>
-      <c:when test="${player eq 'jwplayer5' or player eq 'jwplayer'}">
+      <c:when test="${fn:contains(player, 'jwplayer')}">
         <media:player-jwplayer5 url="${url}" preview="${preview}" share="${share}"
           item="${item}" width="${width}" height="${height}" autoPlay="${autoPlay}" loop="${loop}" thumbnail="${thumbnail}"
-          noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}" analytics="${analytics}"/>
+          noPlayIcon="${noPlayIcon}" controlbar="${controlbar}" skin="${skin}" analytics="${analytics}" player="${player eq 'jwplayer' ? 'jwplayer5' : player}"/>
       </c:when>
       <c:otherwise>
-        <c:choose>
-          <c:when test="${player eq 'jwplayer4'}">
-            <c:set var="player" value="jwplayer4/player.swf" />
-          </c:when>
-        </c:choose>
         <c:set var="playerPath">
           <c:choose>
             <c:when test="${!fn:startsWith(player, '/')}">${pageContext.request.contextPath}/.resources/media/players/${player}</c:when>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.