From b4ad3fbfead2e79fd86ee5b9cd8826977b185d6c Mon Sep 17 00:00:00 2001 From: OHTAKE Tomohiro Date: Mon, 26 Sep 2011 11:32:53 +0900 Subject: [PATCH] Make preview feature more generic - previewEndpoint attribute is used to obtain formatted html --- .../main/java/hudson/markup/MarkupFormatter.java | 4 ++-- .../model/AbstractModelObject/descriptionForm.jelly | 2 +- .../model/AbstractModelObject/editDescription.jelly | 2 +- .../main/resources/hudson/model/Job/configure.jelly | 2 +- .../main/resources/hudson/model/Run/configure.jelly | 2 +- .../resources/hudson/model/View/configure.jelly | 2 +- .../resources/jenkins/model/Jenkins/configure.jelly | 2 +- core/src/main/resources/lib/form/textarea.jelly | 13 +++++++------ war/src/main/webapp/css/style.css | 4 ++-- war/src/main/webapp/scripts/hudson-behavior.js | 12 ++++++------ 10 files changed, 23 insertions(+), 22 deletions(-) diff --git a/core/src/main/java/hudson/markup/MarkupFormatter.java b/core/src/main/java/hudson/markup/MarkupFormatter.java index a9b3741110..4ed37c2297 100644 --- a/core/src/main/java/hudson/markup/MarkupFormatter.java +++ b/core/src/main/java/hudson/markup/MarkupFormatter.java @@ -103,9 +103,9 @@ 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 6536fa693e..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 4f4e300e3d..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 04ee7bb0fc..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 53beaa7438..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 49e699c354..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 51255773e4..a758661177 100644 --- a/core/src/main/resources/lib/form/textarea.jelly +++ b/core/src/main/resources/lib/form/textarea.jelly @@ -60,8 +60,9 @@ 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. @@ -83,12 +84,12 @@ THE SOFTWARE.
- -
- ${%Preview} + +
+ ${%Preview} - ${%Hide preview} - diff --git a/war/src/main/webapp/css/style.css b/war/src/main/webapp/css/style.css index c7290b78f5..c8ab78010b 100644 --- a/war/src/main/webapp/css/style.css +++ b/war/src/main/webapp/css/style.css @@ -1006,10 +1006,10 @@ table.progress-bar.red td.progress-bar-done { /* ========================= textarea.jelly ================== */ -.description-preview-container { +.textarea-preview-container { text-align:left; } -.description-preview { +.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 ee2899d183..082a05ec46 100644 --- a/war/src/main/webapp/scripts/hudson-behavior.js +++ b/war/src/main/webapp/scripts/hudson-behavior.js @@ -1196,10 +1196,10 @@ var hudsonRules = { new YAHOO.widget.Button(e, { type: "menu", menu: e.nextSibling }); }, - "DIV.description-preview-container" : function (e) { - var previewDiv = findElementsBySelector(e,".description-preview")[0]; - var showPreview = findElementsBySelector(e,".description-show-preview")[0]; - var hidePreview = findElementsBySelector(e,".description-hide-preview")[0]; + "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(); @@ -1213,11 +1213,11 @@ var hudsonRules = { previewDiv.innerHTML = txt; }; - new Ajax.Request(rootURL + "/markupFormatter/previewDescription", { + new Ajax.Request(rootURL + showPreview.getAttribute("previewEndpoint"), { method: "POST", requestHeaders: "Content-Type: application/x-www-form-urlencoded", parameters: { - description: text + text: text }, onSuccess: function(obj) { render(obj.responseText)