diff --git a/changelog.html b/changelog.html index 1b8c3e0966..87b407b719 100644 --- a/changelog.html +++ b/changelog.html @@ -70,6 +70,9 @@ Upcoming changes
  • Managed windows slaves can be now run as a specific user account (pull #289) +
  • + Description field now has the preview button to test it inline. + (pull #243)
  • Maven mojo records can be now sorted diff --git a/core/src/main/java/hudson/markup/MarkupFormatter.java b/core/src/main/java/hudson/markup/MarkupFormatter.java index a1b3a594e5..4ed37c2297 100644 --- a/core/src/main/java/hudson/markup/MarkupFormatter.java +++ b/core/src/main/java/hudson/markup/MarkupFormatter.java @@ -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 + codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
    diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly index a450bc6bc2..2e211b6221 100644 --- a/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly +++ b/core/src/main/resources/hudson/model/AbstractModelObject/editDescription.jelly @@ -34,7 +34,7 @@ THE SOFTWARE. + codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/>
    diff --git a/core/src/main/resources/hudson/model/Job/configure.jelly b/core/src/main/resources/hudson/model/Job/configure.jelly index 3000b57320..dcfc7ee5dd 100644 --- a/core/src/main/resources/hudson/model/Job/configure.jelly +++ b/core/src/main/resources/hudson/model/Job/configure.jelly @@ -41,7 +41,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/Run/configure.jelly b/core/src/main/resources/hudson/model/Run/configure.jelly index c71262878d..52c9ff4142 100644 --- a/core/src/main/resources/hudson/model/Run/configure.jelly +++ b/core/src/main/resources/hudson/model/Run/configure.jelly @@ -33,7 +33,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/hudson/model/View/configure.jelly b/core/src/main/resources/hudson/model/View/configure.jelly index 5253f0272a..e8817cc545 100644 --- a/core/src/main/resources/hudson/model/View/configure.jelly +++ b/core/src/main/resources/hudson/model/View/configure.jelly @@ -39,7 +39,7 @@ THE SOFTWARE. - + diff --git a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly index c4ba3f6a35..5bee955402 100644 --- a/core/src/main/resources/jenkins/model/Jenkins/configure.jelly +++ b/core/src/main/resources/jenkins/model/Jenkins/configure.jelly @@ -48,7 +48,7 @@ THE SOFTWARE. + codemirror-mode="${app.markupFormatter.codeMirrorMode}" codemirror-config="${app.markupFormatter.codeMirrorConfig}" previewEndpoint="/markupFormatter/previewDescription"/> diff --git a/core/src/main/resources/lib/form/textarea.jelly b/core/src/main/resources/lib/form/textarea.jelly index 0a940dfd54..a758661177 100644 --- a/core/src/main/resources/lib/form/textarea.jelly +++ b/core/src/main/resources/lib/form/textarea.jelly @@ -60,6 +60,10 @@ THE SOFTWARE. Specifies additional key/value pairs in the JSON format (except the start and end bracket) to be passed as CodeMirror option object. + + If specified, this text area has preview feature. + The previewEndpoint is used to obtain formatted html. + @@ -80,4 +84,14 @@ THE SOFTWARE.
    + + + diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css index eb88fdde18..c8ab78010b 100644 --- a/war/src/main/webapp/css/style.css +++ b/war/src/main/webapp/css/style.css @@ -1003,3 +1003,13 @@ table.progress-bar.red td.progress-bar-done { .tag7 { font-size: 1.70em; } .tag8 { font-size: 1.80em; } .tag9 { font-size: 1.90em; } + +/* ========================= textarea.jelly ================== */ + +.textarea-preview-container { + text-align:left; +} +.textarea-preview { + background-color: #F0F0F0; + padding: 0.5em; +} diff --git a/war/src/main/webapp/scripts/hudson-behavior.js b/war/src/main/webapp/scripts/hudson-behavior.js index a71d00b9f2..bf2bc6d1be 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1194,6 +1194,45 @@ var hudsonRules = { ".button-with-dropdown" : function (e) { new YAHOO.widget.Button(e, { type: "menu", menu: e.nextSibling }); + }, + + "DIV.textarea-preview-container" : function (e) { + var previewDiv = findElementsBySelector(e,".textarea-preview")[0]; + var showPreview = findElementsBySelector(e,".textarea-show-preview")[0]; + var hidePreview = findElementsBySelector(e,".textarea-hide-preview")[0]; + $(hidePreview).hide(); + $(previewDiv).hide(); + + showPreview.onclick = function() { + // Several TEXTAREAs may exist if CodeMirror is enabled. The first one has reference to the CodeMirror object. + var textarea = e.parentNode.getElementsByTagName("TEXTAREA")[0]; + var text = textarea.codemirrorObject ? textarea.codemirrorObject.getValue() : textarea.value; + var render = function(txt) { + $(hidePreview).show(); + $(previewDiv).show(); + previewDiv.innerHTML = txt; + }; + + new Ajax.Request(rootURL + showPreview.getAttribute("previewEndpoint"), { + method: "POST", + requestHeaders: "Content-Type: application/x-www-form-urlencoded", + parameters: { + text: text + }, + onSuccess: function(obj) { + render(obj.responseText) + }, + onFailure: function(obj) { + render(obj.status + " " + obj.statusText + "
    " + obj.responseText) + } + }); + return false; + } + + hidePreview.onclick = function() { + $(hidePreview).hide(); + $(previewDiv).hide(); + }; } }; @@ -2357,4 +2396,3 @@ function createComboBox(idOrField,valueFunction) { Ajax.Request.prototype.dispatchException = function(e) { throw e; } -