Update of /var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
In directory james.mmbase.org:/tmp/cvs-serv4969
Modified Files:
Tag: MMBase-1_8
mmbase-taglib.xml ImageTag.java
Log Message:
MMB-1750
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib
See also: http://www.mmbase.org/jira/browse/MMB-1750
Index: mmbase-taglib.xml
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/mmbase-taglib.xml,v
retrieving revision 1.374.2.34
retrieving revision 1.374.2.35
diff -u -b -r1.374.2.34 -r1.374.2.35
--- mmbase-taglib.xml 9 Dec 2008 09:35:58 -0000 1.374.2.34
+++ mmbase-taglib.xml 9 Dec 2008 16:10:18 -0000 1.374.2.35
@@ -39,7 +39,7 @@
Use one or more possiblevalue tags if you want to list all possible values. Use
one or more examplevalue tags is you want to give some example values.
-version: $Id: mmbase-taglib.xml,v 1.374.2.34 2008/12/09 09:35:58 bert Exp $
+version: $Id: mmbase-taglib.xml,v 1.374.2.35 2008/12/09 16:10:18 michiel Exp $
-->
<taglib author="MMBase community">
@@ -4572,6 +4572,26 @@
</possiblevalue>
</attribute>
<attribute>
+ <name>disposition</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <refercontext>true</refercontext>
+ <info>
+ <p>
+ </p>
+ </info>
+
+ <since>MMBase-1.9.1</since>
+ <possiblevalue>
+ <value>attachment</value>
+ <info>The image will be served out as an attachment.</info>
+ </possiblevalue>
+ <possiblevalue>
+ <value>inline</value>
+ <info>The image will be served out inline.</info>
+ </possiblevalue>
+ </attribute>
+ <attribute>
<name>element</name>
<required>false</required>
<rtexprvalue>true</rtexprvalue>
@@ -4732,6 +4752,13 @@
<see tag="node" attribute="element" />
<since>MMBase-1.7.4</since>
</attribute>
+ <attribute>
+ <name>disposition</name>
+ <required>false</required>
+ <rtexprvalue>true</rtexprvalue>
+ <refercontext>true</refercontext>
+ <see tag="image" attribute="disposition" />
+ </attribute>
<info>
<p>
Returns an URL to the attachment servlet. This is a NodeReferrer
Index: ImageTag.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/ImageTag.java,v
retrieving revision 1.73.2.2
retrieving revision 1.73.2.3
diff -u -b -r1.73.2.2 -r1.73.2.3
--- ImageTag.java 24 Jul 2007 10:00:25 -0000 1.73.2.2
+++ ImageTag.java 9 Dec 2008 16:10:18 -0000 1.73.2.3
@@ -30,7 +30,7 @@
* sensitive for future changes in how the image servlet works.
*
* @author Michiel Meeuwissen
- * @version $Id: ImageTag.java,v 1.73.2.2 2007/07/24 10:00:25 michiel Exp $
+ * @version $Id: ImageTag.java,v 1.73.2.3 2008/12/09 16:10:18 michiel Exp $
*/
public class ImageTag extends FieldTag {
@@ -84,6 +84,8 @@
private Attribute altAttribute = Attribute.NULL;
+ private Attribute disposition = Attribute.NULL;
+
private Object prevDimension;
@@ -145,6 +147,13 @@
altAttribute = getAttribute(a);
}
+ /**
+ * @since MMBase-1.9.1
+ */
+ public void setDisposition(String d) throws JspTagException {
+ disposition = getAttribute(d);
+ }
+
private int getMode() throws JspTagException {
String m = mode.getString(this).toLowerCase();
if (m.equals("") || m.equals("url")) {
@@ -275,11 +284,15 @@
return servletPathFunction;
}
- public Parameters getServletArguments(String servletArgument, Function
servletPathFunction) {
+ public Parameters getServletArguments(String servletArgument, Function
servletPathFunction) throws JspTagException {
HttpServletRequest req = (HttpServletRequest) pageContext.getRequest();
Parameters args = servletPathFunction.createParameters();
args.set("context", makeRelative() ? UriParser.makeRelative(new
File(req.getServletPath()).getParent(), "/") : req.getContextPath())
.set("argument", servletArgument);
+ String d = disposition.getString(this);
+ if (! "".equals(d)) {
+ args.set("disposition", d);
+ }
return args;
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
