This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 3503c19a69915dbcf3a45792a1fe26a4936aa84d Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Feb 13 08:55:08 2016 +0100 Ajout dans la configuration de l'application d'une propriété pour récupérer la version de la librairie codeMirror et utilisation au niveau de la jsp incriminée (See #3877) --- .../scmwebeditor/uiweb/ScmWebEditorConfig.java | 5 +++++ .../scmwebeditor/uiweb/actions/EditAction.java | 2 ++ .../src/main/resources/scmwebeditor.properties | 3 ++- .../webapp/WEB-INF/content/modificationViewer.jsp | 26 +++++++++++----------- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorConfig.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorConfig.java index 21e7ce9..ecd5088 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorConfig.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/ScmWebEditorConfig.java @@ -39,6 +39,7 @@ import java.util.Properties; public class ScmWebEditorConfig { private static final Log log = LogFactory.getLog(ScmWebEditorConfig.class); + public static final String CONFIG_CODE_MIRROR_VERSION_PROPERTY = "swe.codeMirror.version"; /** this application's configuration */ protected static ApplicationConfig config; @@ -103,6 +104,10 @@ public class ScmWebEditorConfig { return getConfig().getOption(ScmWebEditorConfigOption.VERSION.getKey()); } + public static String getCodeMirrorVersion() { + return getConfig().getOption(CONFIG_CODE_MIRROR_VERSION_PROPERTY); + } + public static int getAutoSaveInterval() { String readValue = getConfig().getOption(ScmWebEditorConfigOption.AUTO_SAVE_INTERVAL.getKey()); return Integer.parseInt(readValue); diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java index 1445d4f..7323cde 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java @@ -80,6 +80,8 @@ public class EditAction extends ScmWebEditorMainAction { protected boolean fileDirectlyAccessible; + public String getCodeMirrorVersion() { return ScmWebEditorConfig.getCodeMirrorVersion(); } + public String getSelectedBranch() { return selectedBranch; } public void setSelectedBranch(String selectedBranch) { this.selectedBranch = selectedBranch; } diff --git a/swe-ui-web/src/main/resources/scmwebeditor.properties b/swe-ui-web/src/main/resources/scmwebeditor.properties index 0f07c30..2e9ff31 100644 --- a/swe-ui-web/src/main/resources/scmwebeditor.properties +++ b/swe-ui-web/src/main/resources/scmwebeditor.properties @@ -26,4 +26,5 @@ swe.localRepositoriesPath=/var/local/swe # the auto save interval is set in milliseconds, or equals 0 for no auto save swe.autoSaveInterval=30000 swe.provider.SVN=org.nuiton.scmwebeditor.svn.SvnProvider -swe.provider.Git=org.nuiton.scmwebeditor.git.GitProvider \ No newline at end of file +swe.provider.Git=org.nuiton.scmwebeditor.git.GitProvider +swe.codeMirror.version=${codeMirrorVersion} \ No newline at end of file diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index 9539137..ff3b085 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -62,19 +62,19 @@ <script src="https://code.jquery.com/ui/1.11.4/jquery-ui.min.js"></script> <!-- Code mirror --> - <script src="webjars/codemirror/5.8/lib/codemirror.js" type="text/javascript"></script> - <link rel="stylesheet" href="webjars/codemirror/5.8/lib/codemirror.css"> - <script src="webjars/codemirror/5.8/addon/mode/overlay.js" type="text/javascript"></script> - <script src="webjars/codemirror/5.8/addon/search/searchcursor.js" type="text/javascript"></script> - - <script src="webjars/codemirror/5.8/mode/rst/rst.js"></script> - <script src="webjars/codemirror/5.8/mode/markdown/markdown.js"></script> - <script src="webjars/codemirror/5.8/mode/clike/clike.js"></script> - <script src="webjars/codemirror/5.8/mode/htmlmixed/htmlmixed.js"></script> - <script src="webjars/codemirror/5.8/mode/javascript/javascript.js"></script> - <script src="webjars/codemirror/5.8/mode/css/css.js"></script> - <script src="webjars/codemirror/5.8/mode/xml/xml.js"></script> - <script src="webjars/codemirror/5.8/mode/stex/stex.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/lib/codemirror.js" type="text/javascript"></script> + <link rel="stylesheet" href="webjars/codemirror/<s:property value='codeMirrorVersion'/>/lib/codemirror.css"> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/addon/mode/overlay.js" type="text/javascript"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/addon/search/searchcursor.js" type="text/javascript"></script> + + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/rst/rst.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/markdown/markdown.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/clike/clike.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/htmlmixed/htmlmixed.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/javascript/javascript.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/css/css.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/xml/xml.js"></script> + <script src="webjars/codemirror/<s:property value='codeMirrorVersion'/>/mode/stex/stex.js"></script> <script src="codemirror-ui/js/codemirror-ui.js"></script> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.