From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index 534c196..0d99f5e 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -35,7 +35,6 @@
import org.apache.commons.io.IOUtils;
import org.apache.wicket.Application;
-import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RedirectToUrlException;
@@ -78,13 +77,11 @@
public BasePage() {
super();
- add(new RepeatingView("bottomScripts").setRenderBodyOnly(true));
customizeHeader();
}
public BasePage(PageParameters params) {
super(params);
- add(new RepeatingView("bottomScripts").setRenderBodyOnly(true));
customizeHeader();
}
@@ -247,7 +244,7 @@
protected void setupPage(String repositoryName, String pageName) {
add(new Label("title", getPageTitle(repositoryName)));
-
+ getBottomScriptContainer();
String rootLinkUrl = app().settings().getString(Keys.web.rootLink, urlFor(GitBlitWebApp.get().getHomePage(), null).toString());
ExternalLink rootLink = new ExternalLink("rootLink", rootLinkUrl);
WicketUtils.setHtmlTooltip(rootLink, app().settings().getString(Keys.web.siteName, Constants.NAME));
@@ -511,21 +508,27 @@
return sb.toString();
}
+ private RepeatingView getBottomScriptContainer() {
+ RepeatingView bottomScriptContainer = (RepeatingView) get("bottomScripts");
+ if (bottomScriptContainer == null) {
+ bottomScriptContainer = new RepeatingView("bottomScripts");
+ bottomScriptContainer.setRenderBodyOnly(true);
+ add(bottomScriptContainer);
+ }
+ return bottomScriptContainer;
+ }
+
/**
* Adds a HTML script element loading the javascript designated by the given path.
*
* @param scriptPath
- * page-relative path to the Javascript resource; normally starts with "script/"
+ * page-relative path to the Javascript resource; normally starts with "scripts/"
*/
protected void addBottomScript(String scriptPath) {
- Component bottomScriptContainer = get("bottomScripts");
- if (bottomScriptContainer instanceof RepeatingView) {
- // Always true.
- RepeatingView bottomScripts = (RepeatingView) bottomScriptContainer;
- Label script = new Label(bottomScripts.newChildId(), "<script type='text/javascript' src='"
- + urlFor(new JavascriptResourceReference(this.getClass(), scriptPath)) + "'></script>\n");
- bottomScripts.add(script.setEscapeModelStrings(false).setRenderBodyOnly(true));
- }
+ RepeatingView bottomScripts = getBottomScriptContainer();
+ Label script = new Label(bottomScripts.newChildId(), "<script type='text/javascript' src='"
+ + urlFor(new JavascriptResourceReference(this.getClass(), scriptPath)) + "'></script>\n");
+ bottomScripts.add(script.setEscapeModelStrings(false).setRenderBodyOnly(true));
}
/**
@@ -535,14 +538,10 @@
* inline script code
*/
protected void addBottomScriptInline(String code) {
- Component bottomScriptContainer = get("bottomScripts");
- if (bottomScriptContainer instanceof RepeatingView) {
- // Always true.
- RepeatingView bottomScripts = (RepeatingView) bottomScriptContainer;
- Label script = new Label(bottomScripts.newChildId(),
- "<script type='text/javascript'>/*<![CDATA[*/\n" + code + "\n//]]>\n</script>\n");
- bottomScripts.add(script.setEscapeModelStrings(false).setRenderBodyOnly(true));
- }
+ RepeatingView bottomScripts = getBottomScriptContainer();
+ Label script = new Label(bottomScripts.newChildId(),
+ "<script type='text/javascript'>/*<![CDATA[*/\n" + code + "\n//]]>\n</script>\n");
+ bottomScripts.add(script.setEscapeModelStrings(false).setRenderBodyOnly(true));
}
}
--
Gitblit v1.9.1