garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

use a cdn when possible

Browse Source
This commit is contained in:
Athou
2013-04-14 08:45:24 +02:00
parent 73c932ed6e
commit 8f7709b6c4
25 changed files with 140 additions and 3620 deletions
Download Patch File Download Diff File Expand all files Collapse all files

136
src/main/java/com/commafeed/frontend/CommaFeedApplication.java
View File

@@ -1,10 +1,5 @@
package com.commafeed.frontend;
import java.io.IOException;
import java.net.URL;
import java.util.List;
import java.util.jar.JarFile;
import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -26,6 +21,9 @@ import org.apache.wicket.cdi.ConversationPropagation;
import org.apache.wicket.core.request.handler.PageProvider;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.filter.JavaScriptFilteredIntoFooterHeaderResponse;
import org.apache.wicket.markup.html.IHeaderResponseDecorator;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
@@ -33,13 +31,7 @@ import org.apache.wicket.request.Response;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.cookies.CookieUtils;
import org.jboss.vfs.VirtualFile;
import org.reflections.ReflectionsException;
import org.reflections.vfs.SystemDir;
import org.reflections.vfs.Vfs;
import org.reflections.vfs.ZipDir;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,29 +42,7 @@ import com.commafeed.frontend.pages.HomePage;
import com.commafeed.frontend.pages.LogoutPage;
import com.commafeed.frontend.pages.TestRssPage;
import com.commafeed.frontend.pages.WelcomePage;
import com.commafeed.frontend.references.angular.AngularReference;
import com.commafeed.frontend.references.angular.AngularResourceReference;
import com.commafeed.frontend.references.angular.AngularSanitizeReference;
import com.commafeed.frontend.references.angularui.AngularUIReference;
import com.commafeed.frontend.references.angularuibootstrap.AngularUIBootstrapReference;
import com.commafeed.frontend.references.angularuistate.AngularUIStateReference;
import com.commafeed.frontend.references.codemirror.CodeMirrorCssReference;
import com.commafeed.frontend.references.codemirror.CodeMirrorReference;
import com.commafeed.frontend.references.mousetrap.MouseTrapReference;
import com.commafeed.frontend.references.nggrid.NGGridReference;
import com.commafeed.frontend.references.nginfinitescroll.NGInfiniteScrollReference;
import com.commafeed.frontend.references.ngupload.NGUploadReference;
import com.commafeed.frontend.references.select2.Select2Reference;
import com.commafeed.frontend.references.spinjs.SpinJSReference;
import com.commafeed.frontend.utils.exception.DisplayExceptionPage;
import com.google.api.client.util.Lists;
import com.google.javascript.jscomp.CompilationLevel;
import de.agilecoders.wicket.Bootstrap;
import de.agilecoders.wicket.javascript.GoogleClosureJavaScriptCompressor;
import de.agilecoders.wicket.javascript.YuiCssCompressor;
import de.agilecoders.wicket.markup.html.RenderJavaScriptToFooterHeaderResponseDecorator;
import de.agilecoders.wicket.settings.BootstrapSettings;
public class CommaFeedApplication extends AuthenticatedWebApplication {
@@ -93,17 +63,18 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
setupInjection();
setupSecurity();
setupBootstrap();
setupResourceBundles();
getMarkupSettings().setStripWicketTags(true);
getMarkupSettings().setCompressWhitespace(true);
getMarkupSettings().setDefaultMarkupEncoding("UTF-8");
getResourceSettings().setJavaScriptCompressor(
new GoogleClosureJavaScriptCompressor(
CompilationLevel.SIMPLE_OPTIMIZATIONS));
getResourceSettings().setCssCompressor(new YuiCssCompressor());
setHeaderResponseDecorator(new IHeaderResponseDecorator() {
@Override
public IHeaderResponse decorate(IHeaderResponse response) {
return new JavaScriptFilteredIntoFooterHeaderResponse(response,
"footer-container");
}
});
getRequestCycleListeners().add(new AbstractRequestCycleListener() {
@Override
@@ -119,42 +90,6 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
});
}
private void setupResourceBundles() {
List<JavaScriptResourceReference> refs = Lists.newArrayList();
refs.add((JavaScriptResourceReference) getJavaScriptLibrarySettings()
.getJQueryReference());
refs.add((JavaScriptResourceReference) Bootstrap.getSettings()
.getJsResourceReference());
refs.add(AngularReference.INSTANCE);
refs.add(AngularResourceReference.INSTANCE);
refs.add(AngularSanitizeReference.INSTANCE);
refs.add(AngularUIReference.INSTANCE);
refs.add(AngularUIBootstrapReference.INSTANCE);
refs.add(AngularUIStateReference.INSTANCE);
refs.add(NGUploadReference.INSTANCE);
refs.add(NGInfiniteScrollReference.INSTANCE);
refs.add(Select2Reference.INSTANCE);
refs.add(SpinJSReference.INSTANCE);
refs.add(MouseTrapReference.INSTANCE);
refs.add(NGGridReference.INSTANCE);
refs.add(CodeMirrorReference.INSTANCE);
refs.add(CodeMirrorCssReference.INSTANCE);
getResourceBundles().addJavaScriptBundle(CommaFeedApplication.class,
"libs.js", refs.toArray(new JavaScriptResourceReference[0]));
}
private void setupBootstrap() {
BootstrapSettings settings = new BootstrapSettings();
settings.setJsResourceFilterName("footer-container");
Bootstrap.install(this, settings);
setHeaderResponseDecorator(new RenderJavaScriptToFooterHeaderResponseDecorator());
}
private void setupSecurity() {
getSecuritySettings().setAuthenticationStrategy(
new DefaultAuthenticationStrategy("LoggedIn") {
@@ -239,55 +174,4 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
return (CommaFeedApplication) Application.get();
}
/**
* Reflections fix for JbossAS7
*
* https://code.google.com/p/reflections/wiki/JBossIntegration
*/
static {
Vfs.addDefaultURLTypes(new Vfs.UrlType() {
public boolean matches(URL url) {
return url.getProtocol().equals("vfs");
}
public Vfs.Dir createDir(URL url) {
VirtualFile content;
try {
content = (VirtualFile) url.openConnection().getContent();
} catch (Throwable e) {
throw new ReflectionsException(
"could not open url connection as VirtualFile ["
+ url + "]", e);
}
Vfs.Dir dir = null;
try {
dir = createDir(new java.io.File(content.getPhysicalFile()
.getParentFile(), content.getName()));
} catch (IOException e) { /* continue */
}
if (dir == null) {
try {
dir = createDir(content.getPhysicalFile());
} catch (IOException e) { /* continue */
}
}
return dir;
}
Vfs.Dir createDir(java.io.File file) {
try {
return file.exists() && file.canRead() ? file.isDirectory() ? new SystemDir(
file) : new ZipDir(new JarFile(file))
: null;
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
});
}
}

5
src/main/java/com/commafeed/frontend/pages/BasePage.java
View File

@@ -14,8 +14,7 @@ import com.commafeed.backend.dao.FeedSubscriptionDAO;
import com.commafeed.backend.dao.UserDAO;
import com.commafeed.backend.dao.UserRoleDAO;
import com.commafeed.backend.dao.UserSettingsDAO;
import de.agilecoders.wicket.Bootstrap;
import com.commafeed.frontend.references.bootstrap.BootstrapReference;
@SuppressWarnings("serial")
public abstract class BasePage extends WebPage {
@@ -51,6 +50,6 @@ public abstract class BasePage extends WebPage {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
Bootstrap.renderHead(response);
BootstrapReference.renderHead(response);
}
}

7
src/main/java/com/commafeed/frontend/pages/HomePage.java
View File

@@ -24,11 +24,8 @@ import com.commafeed.frontend.references.mousetrap.MouseTrapReference;
import com.commafeed.frontend.references.nggrid.NGGridReference;
import com.commafeed.frontend.references.nginfinitescroll.NGInfiniteScrollReference;
import com.commafeed.frontend.references.ngupload.NGUploadReference;
import com.commafeed.frontend.references.select2.Select2Reference;
import com.commafeed.frontend.references.spinjs.SpinJSReference;
import de.agilecoders.wicket.markup.html.bootstrap.extensions.icon.OpenWebIconsCssReference;
@SuppressWarnings("serial")
@SecurityCheck(Role.USER)
public class HomePage extends BasePage {
@@ -48,15 +45,11 @@ public class HomePage extends BasePage {
AngularUIStateReference.renderHead(response);
NGUploadReference.renderHead(response);
NGInfiniteScrollReference.renderHead(response);
Select2Reference.renderHead(response);
SpinJSReference.renderHead(response);
MouseTrapReference.renderHead(response);
NGGridReference.renderHead(response);
CodeMirrorCssReference.renderHead(response);
response.render(CssHeaderItem.forReference(OpenWebIconsCssReference
.instance()));
response.render(JavaScriptHeaderItem.forUrl("js/main.js"));
response.render(JavaScriptHeaderItem.forUrl("js/controllers.js"));
response.render(JavaScriptHeaderItem.forUrl("js/directives.js"));

7
src/main/java/com/commafeed/frontend/pages/components/BootstrapFeedbackPanel.java
View File

@@ -7,10 +7,9 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import com.commafeed.frontend.references.bootstrap.BootstrapReference;
import com.commafeed.frontend.utils.WicketUtils;
import de.agilecoders.wicket.Bootstrap;
@SuppressWarnings("serial")
public class BootstrapFeedbackPanel extends FeedbackPanel {
@@ -45,7 +44,7 @@ public class BootstrapFeedbackPanel extends FeedbackPanel {
get("feedbackul").add(new AttributeAppender("class", " unstyled"));
}
@Override
protected void onComponentTag(ComponentTag tag) {
tag.setName("div");
@@ -55,7 +54,7 @@ public class BootstrapFeedbackPanel extends FeedbackPanel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
Bootstrap.renderHead(response);
BootstrapReference.renderHead(response);
WicketUtils.loadCSS(response, BootstrapFeedbackPanel.class);
}

9
src/main/java/com/commafeed/frontend/references/angular/AngularReference.java
View File

@@ -2,16 +2,17 @@ package com.commafeed.frontend.references.angular;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class AngularReference extends WebjarsJavaScriptResourceReference {
public class AngularReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final AngularReference INSTANCE = new AngularReference();
private AngularReference() {
super("/angularjs/current/angular.js");
super(
Url.parse("https://ajax.googleapis.com/ajax/libs/angularjs/1.1.4/angular.min.js"));
}
public static void renderHead(final IHeaderResponse response) {

10
src/main/java/com/commafeed/frontend/references/angular/AngularResourceReference.java
View File

@@ -5,17 +5,17 @@ import java.util.Arrays;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class AngularResourceReference extends
WebjarsJavaScriptResourceReference {
public class AngularResourceReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final AngularResourceReference INSTANCE = new AngularResourceReference();
private AngularResourceReference() {
super("/angularjs/current/angular-resource.js");
super(
Url.parse("https://ajax.googleapis.com/ajax/libs/angularjs/1.1.4/angular-resource.min.js"));
}
@Override

10
src/main/java/com/commafeed/frontend/references/angular/AngularSanitizeReference.java
View File

@@ -5,17 +5,17 @@ import java.util.Arrays;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class AngularSanitizeReference extends
WebjarsJavaScriptResourceReference {
public class AngularSanitizeReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final AngularSanitizeReference INSTANCE = new AngularSanitizeReference();
private AngularSanitizeReference() {
super("/angularjs/current/angular-sanitize.js");
super(
Url.parse("https://ajax.googleapis.com/ajax/libs/angularjs/1.1.4/angular-sanitize.min.js"));
}
@Override

18
src/main/java/com/commafeed/frontend/references/angularui/AngularUIReference.java
View File

@@ -6,27 +6,29 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.CssResourceReference;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import com.commafeed.frontend.references.angular.AngularReference;
public class AngularUIReference extends JavaScriptResourceReference {
public class AngularUIReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final AngularUIReference INSTANCE = new AngularUIReference();
private AngularUIReference() {
super(AngularUIReference.class, "angular-ui.js");
super(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/angular-ui/0.4.0/angular-ui.min.js"));
}
@SuppressWarnings("unchecked")
@Override
public Iterable<? extends HeaderItem> getDependencies() {
return Arrays.asList(JavaScriptHeaderItem
.forReference(AngularReference.INSTANCE), CssHeaderItem
.forReference(new CssResourceReference(
AngularUIReference.class, "angular-ui.css")));
return Arrays
.asList(JavaScriptHeaderItem
.forReference(AngularReference.INSTANCE),
CssHeaderItem.forReference(new UrlResourceReference(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/angular-ui/0.4.0/angular-ui.min.css"))));
}
public static void renderHead(final IHeaderResponse response) {

50
src/main/java/com/commafeed/frontend/references/angularui/angular-ui.css
View File

@@ -1,50 +0,0 @@
/**
* import components to builds angular-ui.css
*/
/* ui-reset */
.ui-resetwrap {
position: relative;
display: inline-block;
}
.ui-reset {
position: absolute;
top: 0;
right: 0;
z-index: 2;
display: none;
height: 100%;
cursor: pointer;
}
.ui-resetwrap:hover .ui-reset {
display: block;
}
/* ui-currency */
.ui-currency-pos {
color: green;
}
.ui-currency-neg {
color: red;
}
.ui-currency-zero {
color: blue;
}
.ui-currency-pos.ui-bignum,
.ui-currency-neg.ui-smallnum {
font-size: 110%;
}
/* highlight */
.ui-match {
background: yellow;
}

1461
src/main/java/com/commafeed/frontend/references/angularui/angular-ui.js vendored
View File

File diff suppressed because it is too large Load Diff

7
src/main/java/com/commafeed/frontend/references/angularuibootstrap/AngularUIBootstrapReference.java
View File

@@ -5,17 +5,18 @@ import java.util.Arrays;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import com.commafeed.frontend.references.angular.AngularReference;
public class AngularUIBootstrapReference extends JavaScriptResourceReference {
public class AngularUIBootstrapReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final AngularUIBootstrapReference INSTANCE = new AngularUIBootstrapReference();
private AngularUIBootstrapReference() {
super(AngularUIBootstrapReference.class, "ui-bootstrap-tpls-0.2.0.js");
super(Url.parse("https://cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.2.0/ui-bootstrap-tpls.js"));
}
@Override

1818
src/main/java/com/commafeed/frontend/references/angularuibootstrap/ui-bootstrap-tpls-0.2.0.js
View File

File diff suppressed because it is too large Load Diff

1
src/main/java/com/commafeed/frontend/references/angularuibootstrap/ui-bootstrap-tpls-0.2.0.min.js vendored
View File

File diff suppressed because one or more lines are too long

41
src/main/java/com/commafeed/frontend/references/bootstrap/BootstrapReference.java Normal file
View File

@@ -0,0 +1,41 @@
package com.commafeed.frontend.references.bootstrap;
import java.util.Arrays;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import com.commafeed.frontend.references.jquery.JQueryReference;
public class BootstrapReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final BootstrapReference INSTANCE = new BootstrapReference();
public BootstrapReference() {
super(
Url.parse("https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js"));
}
@SuppressWarnings("unchecked")
@Override
public Iterable<? extends HeaderItem> getDependencies() {
return Arrays
.asList(JavaScriptHeaderItem
.forReference(JQueryReference.INSTANCE),
CssHeaderItem.forReference(new UrlResourceReference(
Url.parse("https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css"))),
CssHeaderItem.forReference(new UrlResourceReference(
Url.parse("https://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-responsive.min.css"))));
}
public static void renderHead(final IHeaderResponse response) {
response.render(JavaScriptHeaderItem.forReference(INSTANCE));
}
}

9
src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorCssReference.java
View File

@@ -5,16 +5,17 @@ import java.util.Arrays;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class CodeMirrorCssReference extends WebjarsJavaScriptResourceReference {
public class CodeMirrorCssReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final CodeMirrorCssReference INSTANCE = new CodeMirrorCssReference();
private CodeMirrorCssReference() {
super("/codemirror/current/mode/css/css.js");
super(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/css.js"));
}
@Override

16
src/main/java/com/commafeed/frontend/references/codemirror/CodeMirrorReference.java
View File

@@ -2,28 +2,28 @@ package com.commafeed.frontend.references.codemirror;
import java.util.Arrays;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import com.commafeed.frontend.utils.WicketUtils;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class CodeMirrorReference extends WebjarsJavaScriptResourceReference {
public class CodeMirrorReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final CodeMirrorReference INSTANCE = new CodeMirrorReference();
private CodeMirrorReference() {
super("/codemirror/current/lib/codemirror.js");
super(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/codemirror.min.js"));
}
@Override
public Iterable<? extends HeaderItem> getDependencies() {
return Arrays
.asList(WicketUtils
.buildCssWebJarHeaderItem("/codemirror/current/lib/codemirror.css"));
.asList(CssHeaderItem.forReference(new UrlResourceReference(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/codemirror/2.36.0/codemirror.min.css"))));
}
public static void renderHead(final IHeaderResponse response) {

22
src/main/java/com/commafeed/frontend/references/jquery/JQueryReference.java Normal file
View File

@@ -0,0 +1,22 @@
package com.commafeed.frontend.references.jquery;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
public class JQueryReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final JQueryReference INSTANCE = new JQueryReference();
public JQueryReference() {
super(
Url.parse("https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"));
}
public static void renderHead(final IHeaderResponse response) {
response.render(JavaScriptHeaderItem.forReference(INSTANCE));
}
}

9
src/main/java/com/commafeed/frontend/references/mousetrap/MouseTrapReference.java
View File

@@ -2,16 +2,17 @@ package com.commafeed.frontend.references.mousetrap;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class MouseTrapReference extends WebjarsJavaScriptResourceReference {
public class MouseTrapReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final MouseTrapReference INSTANCE = new MouseTrapReference();
private MouseTrapReference() {
super("/mousetrap/current/mousetrap.js");
super(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/mousetrap/1.2.2/mousetrap.min.js"));
}
public static void renderHead(final IHeaderResponse response) {

31
src/main/java/com/commafeed/frontend/references/select2/Select2Reference.java
View File

@@ -1,31 +0,0 @@
package com.commafeed.frontend.references.select2;
import java.util.Arrays;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import com.commafeed.frontend.utils.WicketUtils;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class Select2Reference extends WebjarsJavaScriptResourceReference {
private static final long serialVersionUID = 1L;
public static final Select2Reference INSTANCE = new Select2Reference();
private Select2Reference() {
super("/select2/current/select2.js");
}
@Override
public Iterable<? extends HeaderItem> getDependencies() {
return Arrays.asList(WicketUtils
.buildCssWebJarHeaderItem("/select2/current/select2.css"));
}
public static void renderHead(final IHeaderResponse response) {
response.render(JavaScriptHeaderItem.forReference(INSTANCE));
}
}

9
src/main/java/com/commafeed/frontend/references/spinjs/SpinJSReference.java
View File

@@ -2,16 +2,17 @@ package com.commafeed.frontend.references.spinjs;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.resource.UrlResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class SpinJSReference extends WebjarsJavaScriptResourceReference {
public class SpinJSReference extends UrlResourceReference {
private static final long serialVersionUID = 1L;
public static final SpinJSReference INSTANCE = new SpinJSReference();
private SpinJSReference() {
super("/spin-js/current/spin.js");
super(
Url.parse("https://cdnjs.cloudflare.com/ajax/libs/spin.js/1.2.7/spin.min.js"));
}
public static void renderHead(final IHeaderResponse response) {

22
src/main/java/com/commafeed/frontend/utils/WicketUtils.java
View File

@@ -18,9 +18,6 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.apache.wicket.util.io.IOUtils;
import org.apache.wicket.util.template.PackageTextTemplate;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
public class WicketUtils {
public static void loadJQuery(IHeaderResponse response) {
@@ -34,12 +31,6 @@ public class WicketUtils {
.getSimpleName() + ".js"));
}
public static JavaScriptHeaderItem buildJavaScriptWebJarHeaderItem(
String name) {
return JavaScriptHeaderItem
.forReference(new WebjarsJavaScriptResourceReference(name));
}
public static void loadJS(IHeaderResponse response, Class<?> klass) {
response.render(buildJavaScriptHeaderItem(klass));
}
@@ -59,20 +50,11 @@ public class WicketUtils {
response.render(result);
}
public static void loadWebJarJS(IHeaderResponse response, String name) {
response.render(buildJavaScriptWebJarHeaderItem(name));
}
public static CssHeaderItem buildCssHeaderItem(Class<?> klass) {
return CssHeaderItem.forReference(new CssResourceReference(klass, klass
.getSimpleName() + ".css"));
}
public static CssHeaderItem buildCssWebJarHeaderItem(String name) {
return CssHeaderItem
.forReference(new WebjarsCssResourceReference(name));
}
public static void loadCSS(IHeaderResponse response, Class<?> klass) {
response.render(buildCssHeaderItem(klass));
}
@@ -92,10 +74,6 @@ public class WicketUtils {
response.render(result);
}
public static void loadWebJarCSS(IHeaderResponse response, String name) {
response.render(buildCssWebJarHeaderItem(name));
}
public static HttpServletRequest getHttpServletRequest() {
ServletWebRequest servletWebRequest = (ServletWebRequest) RequestCycle
.get().getRequest();

4
src/main/java/com/commafeed/frontend/utils/exception/DisplayExceptionPage.java
View File

@@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import de.agilecoders.wicket.Bootstrap;
import com.commafeed.frontend.references.bootstrap.BootstrapReference;
public class DisplayExceptionPage extends WebPage {
@@ -41,7 +41,7 @@ public class DisplayExceptionPage extends WebPage {
@Override
public void renderHead(IHeaderResponse response) {
Bootstrap.renderHead(response);
BootstrapReference.renderHead(response);
}
}