Merge branch 'pull-243'

This commit is contained in:
Kohsuke Kawaguchi committed 2011-11-07 17:33:11 -08:00
commit 737a7dfe79
11 files changed
+89 -7

No files matched your search

@@ -25,7 +25,14 @@ package hudson.markup;
import hudson.ExtensionPoint;
import hudson.model.AbstractDescribableImpl;
import hudson.util.HttpResponses;
import jenkins.model.Jenkins;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
import javax.servlet.ServletException;
import java.io.IOException;
import java.io.StringWriter;
import java.io.Writer;
@@ -91,4 +98,14 @@ public abstract class MarkupFormatter extends AbstractDescribableImpl<MarkupForm
public MarkupFormatterDescriptor getDescriptor() {
return (MarkupFormatterDescriptor)super.getDescriptor();
}
/**
* Generate HTML for preview, using markup formatter.
* Can be called from other views.
*/
public HttpResponse doPreviewDescription(@QueryParameter String text) throws IOException {
StringWriter w = new StringWriter();
translate(text, w);
return HttpResponses.html(w.toString());
}
}