projects
/
Sone.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
🔖 Set version to 81
[Sone.git]
/
src
/
main
/
java
/
net
/
pterodactylus
/
sone
/
template
/
ImageLinkFilter.java
diff --git
a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
index
2f1526f
..
85a7562
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
+++ b/
src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java
@@
-1,5
+1,5
@@
/*
/*
- * Sone - ImageLinkFilter.java - Copyright © 2011–20
16
David Roden
+ * Sone - ImageLinkFilter.java - Copyright © 2011–20
20
David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-28,6
+28,7
@@
import java.util.Map;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.util.template.Filter;
import net.pterodactylus.sone.core.Core;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.util.template.Filter;
+import net.pterodactylus.util.template.HtmlFilter;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.TemplateContextFactory;
import net.pterodactylus.util.template.Template;
import net.pterodactylus.util.template.TemplateContext;
import net.pterodactylus.util.template.TemplateContextFactory;
@@
-39,31
+40,22
@@
import com.google.common.base.Optional;
/**
* Template filter that turns an {@link Image} into an HTML <img> tag,
* using some parameters to influence parameters of the image.
/**
* Template filter that turns an {@link Image} into an HTML <img> tag,
* using some parameters to influence parameters of the image.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
public class ImageLinkFilter implements Filter {
/** The template to render for the <img> tag. */
*/
public class ImageLinkFilter implements Filter {
/** The template to render for the <img> tag. */
- private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html>
<%if forceDownload>?forcedownload=true<%/if>
\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" style=\"position: relative;<%ifnull ! top>top: <% top|html>;<%/if><%ifnull ! left>left: <% left|html>;<%/if>\"/>"));
+ private static final Template linkTemplate = TemplateParser.parse(new StringReader("<img<%ifnull !class> class=\"<%class|css>\"<%/if> src=\"<%src|html>\" alt=\"<%alt|html>\" title=\"<%title|html>\" width=\"<%width|html>\" height=\"<%height|html>\" style=\"position: relative;<%ifnull ! top>top: <% top|html>;<%/if><%ifnull ! left>left: <% left|html>;<%/if>\"/>"));
/** The core. */
private final Core core;
/** The template context factory. */
/** The core. */
private final Core core;
/** The template context factory. */
- private final TemplateContextFactory templateContextFactory;
+ private final TemplateContextFactory templateContextFactory
= new TemplateContextFactory()
;
- /**
- * Creates a new image link filter.
- *
- * @param core
- * The core
- * @param templateContextFactory
- * The template context factory
- */
- public ImageLinkFilter(Core core, TemplateContextFactory templateContextFactory) {
+ public ImageLinkFilter(Core core) {
this.core = core;
this.core = core;
- this.templateContextFactory = templateContextFactory;
+ templateContextFactory.addFilter("html", new HtmlFilter());
+ templateContextFactory.addFilter("css", new CssClassNameFilter());
}
/**
}
/**
@@
-90,7
+82,6
@@
public class ImageLinkFilter implements Filter {
linkTemplateContext.set("class", imageClass);
if (image.isInserted()) {
linkTemplateContext.set("src", "/" + image.getKey());
linkTemplateContext.set("class", imageClass);
if (image.isInserted()) {
linkTemplateContext.set("src", "/" + image.getKey());
- linkTemplateContext.set("forceDownload", true);
} else {
linkTemplateContext.set("src", "getImage.html?image=" + image.getId());
}
} else {
linkTemplateContext.set("src", "getImage.html?image=" + image.getId());
}