From a89948f76d7e7b19df9cf883673e72bdce03aaf2 Mon Sep 17 00:00:00 2001 From: Steven Lawson Date: Tue, 3 Sep 2013 16:35:11 -0400 Subject: [PATCH] Javascript support --- .../TotalFreedomMod/HTTPD/Module_help.java | 5 +++ .../HTTPD/TFM_HTTPD_Module.java | 13 +++++--- .../HTTPD/TFM_HTTPD_PageBuilder.java | 31 ++++++++++++++----- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java index ddd22f93..1139198f 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/Module_help.java @@ -147,4 +147,9 @@ public class Module_help extends TFM_HTTPD_Module { return ".commandName{font-weight:bold;}.commandDescription{padding-left:15px;}li{margin:.15em;padding:.15em;}"; } + @Override + public String getScript() + { + return "$(document).ready(function(){console.log(\"Ready\");});"; + } } diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Module.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Module.java index 3dfcb364..ca696f93 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Module.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_Module.java @@ -22,21 +22,26 @@ public abstract class TFM_HTTPD_Module public String getBody() { - return ""; + return null; } public String getTitle() { - return ""; + return null; } public String getStyle() { - return ""; + return null; + } + + public String getScript() + { + return null; } public Response getResponse() { - return new TFM_HTTPD_PageBuilder(getBody(), getTitle(), getStyle()).getResponse(); + return new TFM_HTTPD_PageBuilder(getBody(), getTitle(), getStyle(), getScript()).getResponse(); } } diff --git a/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_PageBuilder.java b/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_PageBuilder.java index 99ff58fb..37ca3938 100644 --- a/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_PageBuilder.java +++ b/src/me/StevenLawson/TotalFreedomMod/HTTPD/TFM_HTTPD_PageBuilder.java @@ -10,24 +10,32 @@ public class TFM_HTTPD_PageBuilder + "\r\n" + "{$TITLE}\r\n" + "\r\n" - + "\r\n" + + "{$STYLE}" + + "{$SCRIPT}" + "\r\n" - + "{$BODY}\r\n" + + "\r\n{$BODY}\r\n" + "\r\n"; + private static final String STYLE = "\r\n"; + private static final String SCRIPT = + "\r\n" + + "\r\n" + + "\r\n"; // - private String body = ""; - private String title = ""; - private String style = ""; + private String body = null; + private String title = null; + private String style = null; + private String script = null; public TFM_HTTPD_PageBuilder() { } - public TFM_HTTPD_PageBuilder(String body, String title, String style) + public TFM_HTTPD_PageBuilder(String body, String title, String style, String script) { this.body = body; this.title = title; this.style = style; + this.script = script; } public void setBody(String body) @@ -45,6 +53,11 @@ public class TFM_HTTPD_PageBuilder this.style = style; } + public void setScript(String script) + { + this.script = script; + } + public Response getResponse() { return new Response(this.toString()); @@ -53,6 +66,10 @@ public class TFM_HTTPD_PageBuilder @Override public String toString() { - return TEMPLATE.replace("{$BODY}", body).replace("{$TITLE}", title).replace("{$STYLE}", style); + return TEMPLATE + .replace("{$BODY}", this.body == null ? "" : this.body) + .replace("{$TITLE}", this.title == null ? "" : this.title) + .replace("{$STYLE}", this.style == null ? "" : STYLE.replace("{$STYLE}", this.style)) + .replace("{$SCRIPT}", this.script == null ? "" : SCRIPT.replace("{$SCRIPT}", this.script)); } }