Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2012-04-10 08:58:54
|
Revision: 3945
http://openutils.svn.sourceforge.net/openutils/?rev=3945&view=rev
Author: diego_schivo
Date: 2012-04-10 08:58:47 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
cms, cmsfn
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
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
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 08:50:55 UTC (rev 3944)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 08:58:47 UTC (rev 3945)
@@ -1,6 +1,6 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:fn="http://java.sun.com/jsp/jstl/functions">
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<jsp:directive.attribute name="property" required="true" rtexprvalue="true" type="java.lang.String" />
<jsp:directive.attribute name="width" required="true" rtexprvalue="true" type="java.lang.Integer" />
<jsp:directive.attribute name="height" required="true" rtexprvalue="true" type="java.lang.Integer" />
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 08:50:55 UTC (rev 3944)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 08:58:47 UTC (rev 3945)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag description="Displays a media" pageEncoding="UTF-8"/>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2012-04-10 08:50:55 UTC (rev 3944)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2012-04-10 08:58:47 UTC (rev 3945)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.attribute name="url" required="true" rtexprvalue="true" type="java.lang.String"
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 2012-04-10 08:50:55 UTC (rev 3944)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2012-04-10 08:58:47 UTC (rev 3945)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8" />
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 2012-04-10 08:50:55 UTC (rev 3944)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2012-04-10 08:58:47 UTC (rev 3945)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag description="Renders the audio or video player" pageEncoding="UTF-8" />
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2012-04-10 08:50:55 UTC (rev 3944)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2012-04-10 08:58:47 UTC (rev 3945)
@@ -1,5 +1,5 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:cms="cms-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:cmsu="cms-util-taglib"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:cmsu="cms-util-taglib"
xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag pageEncoding="UTF-8" description="Renders the flash-content and the javascript for replacing it" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <die...@us...> - 2012-04-10 09:10:33
|
Revision: 3946
http://openutils.svn.sourceforge.net/openutils/?rev=3946&view=rev
Author: diego_schivo
Date: 2012-04-10 09:10:22 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
cms:out, cms:setNode
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 08:58:47 UTC (rev 3945)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/crop.tag 2012-04-10 09:10:22 UTC (rev 3946)
@@ -1,6 +1,7 @@
<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
- xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions">
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:mu="mgnlutils">
<jsp:directive.attribute name="property" required="true" rtexprvalue="true" type="java.lang.String" />
<jsp:directive.attribute name="width" required="true" rtexprvalue="true" type="java.lang.Integer" />
<jsp:directive.attribute name="height" required="true" rtexprvalue="true" type="java.lang.Integer" />
@@ -17,7 +18,7 @@
<c:if test="${empty node}">
<c:set var="node" value="${content.handle}" />
</c:if>
- <cms:setNode path="${node}" var="pzcNode" />
+ <c:set value="${mu:node(node, 'website')}" var="pzcNode" />
<c:if test="${empty item}">
<c:set var="item" value="${pzcNode[property]}" />
</c:if>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 08:58:47 UTC (rev 3945)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2012-04-10 09:10:22 UTC (rev 3946)
@@ -46,12 +46,14 @@
<c:if test="${empty property}">
<c:set var="property" value="media" />
</c:if>
- <cms:out var="item" contentNode="${node}" nodeDataName="${property}" />
+ <c:set var="item" value="${node[property]}" />
<c:if test="${empty width}">
- <cms:out var="width" contentNode="${node}" nodeDataName="${property}_width" />
+ <c:set var="widthProperty" value="${property}_width" />
+ <c:set var="width" value="${node[widthProperty]}" />
</c:if>
<c:if test="${empty height}">
- <cms:out var="height" contentNode="${node}" nodeDataName="${property}_height" />
+ <c:set var="heightProperty" value="${property}_height" />
+ <c:set var="height" value="${node[heightProperty]}" />
</c:if>
</c:if>
<c:set value="${10000}" var="bigValue" />
@@ -72,7 +74,7 @@
<c:set value="${media:node(item)}" var="mediaNode" />
<c:choose>
<c:when test="${!empty mediaNode}">
- <cms:setNode var="media" content="${mediaNode}" />
+ <c:set var="media" value="${media:node(mediaNode)}" />
<c:choose>
<c:when test="${crop and (media.type eq 'image' or media.type eq 'wallpaper' or videoImagePreview)}">
<media:crop item="${media}" width="${width}" height="${height}" property="${cropProperty}" jquery="${cropJquery}" jqueryui="${cropJqueryUI}" loadjs="${cropJs}" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-12-08 12:25:04
|
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}&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.
|
|
From: <fg...@us...> - 2014-10-22 13:38:48
|
Revision: 4600
http://openutils.svn.sourceforge.net/openutils/?rev=4600&view=rev
Author: fgiust
Date: 2014-10-22 13:38:45 +0000 (Wed, 22 Oct 2014)
Log Message:
-----------
add support for percentage in witdh/height
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
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
magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2014-10-03 07:28:20 UTC (rev 4599)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/media.tag 2014-10-22 13:38:45 UTC (rev 4600)
@@ -8,8 +8,8 @@
<jsp:directive.attribute name="node" required="false" rtexprvalue="true" type="java.lang.Object" description="the content object to use; if not specified, object 'content' will be used"/>
<jsp:directive.attribute name="property" required="false" rtexprvalue="true" type="java.lang.String" description="the name of the nodeData storing the media uuid; if not specified, 'media' will be used"/>
<jsp:directive.attribute name="player" required="false" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)"/>
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player width"/>
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="image or player height"/>
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object" description="image or player width"/>
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object" description="image or player height"/>
<jsp:directive.attribute name="useEm" required="false" rtexprvalue="true" type="java.lang.Boolean" description="if true, and ignoreDimensions is not true it will apply style attribute on img tags with sidth and height in 'em'. the em values will be computed using as width in pixel * emRatio (see next attribute)"/>
<jsp:directive.attribute name="emRatio" required="false" rtexprvalue="true" type="java.lang.Float" description="float value to convert dimensions from px to em "/>
<jsp:directive.attribute name="alt" required="false" rtexprvalue="true" description="alt / title on images. If not specified, the title of the media (if present) will be used"/>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2014-10-03 07:28:20 UTC (rev 4599)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-genericswfobject.tag 2014-10-22 13:38:45 UTC (rev 4600)
@@ -10,9 +10,9 @@
description="media uuid or media content node " />
<jsp:directive.attribute name="playerPath" required="true" rtexprvalue="true" type="java.lang.String"
description="the swf file of the player (examples: /.resources/media/players/someplayer/player.swf)" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object"
description="image or player width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object"
description="image or player height" />
<jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean"
description="if true the img element will be rendered without width and height attributes " />
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 2014-10-03 07:28:20 UTC (rev 4599)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player-jwplayer5.tag 2014-10-22 13:38:45 UTC (rev 4600)
@@ -9,9 +9,9 @@
description="Preview image url" />
<jsp:directive.attribute name="item" required="true" rtexprvalue="true" type="java.lang.Object"
description="media uuid or media content node " />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object"
description="image or player width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object"
description="image or player height" />
<jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean"
description="if true the img element will be rendered without width and height attributes " />
@@ -50,8 +50,8 @@
controlbar: "${controlbar}",
repeat: "${loop? 'always': 'none'}",
icons: "${noPlayIcon? 'false': 'true'}",
-width: ${width},
-height: ${height},
+width: "${width}",
+height: "${height}",
]]>
<c:if test="${not empty skin}">skin:"${skin}",</c:if>
<c:if test="${thumbnail and !empty preview}"> image:"${preview}",</c:if>
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 2014-10-03 07:28:20 UTC (rev 4599)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/player.tag 2014-10-22 13:38:45 UTC (rev 4600)
@@ -11,9 +11,9 @@
description="media uuid or media content node " />
<jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String"
description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer"
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object"
description="image or player width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer"
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object"
description="image or player height" />
<jsp:directive.attribute name="ignoreDim" required="false" rtexprvalue="true" type="java.lang.Boolean"
description="if true the img element will be rendered without width and height attributes " />
@@ -42,26 +42,28 @@
<jsp:text>${pageContext.request.scheme}://${pageContext.request.serverName}</jsp:text>
<c:if test="${(pageContext.request.scheme eq 'http' and pageContext.request.serverPort != 80)}">:${pageContext.request.serverPort}</c:if>
</c:set>
- <c:if test="${empty width or width eq 0 }">
+ <c:if test="${!ignoreDim and (empty width or width eq '0')}">
<c:set var="width" value="${media:width(mediaNode)}" />
</c:if>
- <c:if test="${empty height or height eq 0}">
+ <c:if test="${!ignoreDim and (empty height or height eq '0')}">
<c:set var="height" value="${media:height(mediaNode)}" />
<c:if test="${(controlbar eq 'bottom' or controlbar eq 'top') and height gt 20}">
<!-- the control bar adds 20px -->
<c:set var="height" value="${height + 20}" />
</c:if>
</c:if>
- <c:if test="${empty width or width eq 0 }">
+ <c:if test="${!ignoreDim and (empty width or width eq '0')}">
<c:set var="width" value="320" />
</c:if>
- <c:if test="${empty height or height eq 0}">
+ <c:if test="${!ignoreDim and (empty height or height eq '0')}">
<c:set var="height" value="${mediaNode.type eq 'audio' ? 20 : 240}" />
</c:if>
<c:set var="previewwidth" value="${width}" />
<c:set var="previewheight" value="${height}" />
- <c:if test="${previewheight gt 20 and (controlbar eq 'bottom' or controlbar eq 'top')}">
- <c:set var="previewheight" value="${previewheight - 20}" />
+ <c:if test="${!ignoreDim}">
+ <c:if test="${previewheight gt 20 and (controlbar eq 'bottom' or controlbar eq 'top')}">
+ <c:set var="previewheight" value="${previewheight - 20}" />
+ </c:if>
</c:if>
<c:if test="${thumbnail and empty preview}">
<c:choose>
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2014-10-03 07:28:20 UTC (rev 4599)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/resources/META-INF/tags/media/swfobject.tag 2014-10-22 13:38:45 UTC (rev 4600)
@@ -4,8 +4,8 @@
xmlns:su="http://openutils.sf.net/openutils-stringutils">
<jsp:directive.tag pageEncoding="UTF-8" description="Renders the flash-content and the javascript for replacing it" />
<jsp:directive.attribute name="player" required="true" rtexprvalue="true" type="java.lang.String" description="the swf file of the player (examples: player.swf (default), jwplayer4, jwplayer5, jwplayer5/player.swf, /.resources/media/players/jwplayer5/player.swf)" />
- <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content width" />
- <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Integer" description="flash content height" />
+ <jsp:directive.attribute name="width" required="false" rtexprvalue="true" type="java.lang.Object" description="flash content width" />
+ <jsp:directive.attribute name="height" required="false" rtexprvalue="true" type="java.lang.Object" description="flash content height" />
<jsp:directive.attribute name="image" required="false" rtexprvalue="true" description="replacement image" />
<jsp:directive.attribute name="title" required="false" rtexprvalue="true" description="title/alt" />
<jsp:directive.tag dynamic-attributes="attrs" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X