diff options
| author | James Moger <james.moger@gitblit.com> | 2014-09-07 12:53:08 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-09-07 12:53:08 -0400 |
| commit | f7174e6984c08a153d1ba198c4bffe68c5afd873 (patch) | |
| tree | a4f81f00320a3e962f87714f2e0ee90528beb2e4 /src/main/java/com/gitblit/wicket/panels/CommentPanel.java | |
| parent | b8a44784ba8b0aaf9a3fbe6321956c0ee0e0451c (diff) | |
| parent | 7fdc298cf06c3d88d4fd9fd158fb4d32edac12a0 (diff) | |
| download | gitblit-f7174e6984c08a153d1ba198c4bffe68c5afd873.tar.gz gitblit-f7174e6984c08a153d1ba198c4bffe68c5afd873.zip | |
Merge branch 'ticket/164' into develop
Diffstat (limited to 'src/main/java/com/gitblit/wicket/panels/CommentPanel.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/panels/CommentPanel.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/panels/CommentPanel.java b/src/main/java/com/gitblit/wicket/panels/CommentPanel.java index 1d49ff0f..130e7336 100644 --- a/src/main/java/com/gitblit/wicket/panels/CommentPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/CommentPanel.java @@ -19,13 +19,14 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; -import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import com.gitblit.models.RepositoryModel; import com.gitblit.models.TicketModel; import com.gitblit.models.TicketModel.Change; import com.gitblit.models.UserModel; +import com.gitblit.wicket.SafeTextModel; +import com.gitblit.wicket.SafeTextModel.Mode; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.pages.BasePage; @@ -89,7 +90,7 @@ public class CommentPanel extends BasePanel { } }.setVisible(ticket != null && ticket.number > 0)); - final IModel<String> markdownPreviewModel = new Model<String>(); + final SafeTextModel markdownPreviewModel = new SafeTextModel(Mode.none); markdownPreview = new Label("markdownPreview", markdownPreviewModel); markdownPreview.setEscapeModelStrings(false); markdownPreview.setOutputMarkupId(true); |