Author: mfortun Date: 2011-06-09 15:02:27 +0200 (Thu, 09 Jun 2011) New Revision: 939 Url: http://nuiton.org/repositories/revision/wikitty/939 Log: * improve use of code mirror ui Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-06-09 08:40:37 UTC (rev 938) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeMirrorWrapper.java 2011-06-09 13:02:27 UTC (rev 939) @@ -16,17 +16,26 @@ protected String servContext; protected String pathToCodeMirrorModeDir; + protected String pathToCodeMirorUi; protected List<String> codeMirrorCssImport = new LinkedList<String>(); protected List<String> codeMirrorScriptImport = new LinkedList<String>(); protected List<SelectOption> langages = new LinkedList<SelectOption>(); - public CodeMirrorWrapper(String servContext, String pathToCodeMirrorModeDir) { + public CodeMirrorWrapper(String servContext, String pathToCodeMirorUi, + String pathToCodeMirrorModeDire) { super(); this.servContext = servContext; - this.pathToCodeMirrorModeDir = pathToCodeMirrorModeDir; + this.pathToCodeMirorUi = pathToCodeMirorUi; + this.pathToCodeMirrorModeDir = pathToCodeMirorUi + + pathToCodeMirrorModeDire; // TODO mfortun-2011-05-30 maybe change this + codeMirrorScriptImport.add(servContext + pathToCodeMirorUi + + "lib/CodeMirror-2.0/lib/codemirror.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirorUi + + "js/codemirror-ui.js"); + codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + "/javascript/javascript.js"); codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir @@ -47,6 +56,12 @@ codeMirrorScriptImport.add(servContext + pathToCodeMirrorModeDir + "/xml/xml.js"); + codeMirrorCssImport.add(servContext + pathToCodeMirorUi + + "css/codemirror-ui.css"); + + codeMirrorCssImport.add(servContext + pathToCodeMirorUi + + "lib/CodeMirror-2.0/lib/codemirror.css"); + codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir + "/diff/diff.css"); codeMirrorCssImport.add(servContext + pathToCodeMirrorModeDir @@ -86,6 +101,18 @@ return "javascript"; } + public String getPathToCodeMirorUiJs() { + return servContext + pathToCodeMirorUi + "/js/"; + } + + public String getPathToCodeMirorUi() { + return pathToCodeMirorUi; + } + + public void setPathToCodeMirorUi(String pathToCodeMirorUi) { + this.pathToCodeMirorUi = pathToCodeMirorUi; + } + public String getServContext() { return servContext; } @@ -125,5 +152,7 @@ public void setLangages(List<SelectOption> langages) { this.langages = langages; } + + } Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-06-09 08:40:37 UTC (rev 938) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-06-09 13:02:27 UTC (rev 939) @@ -46,17 +46,13 @@ Wikitty wikitty = action.getWikitty(); -CodeMirrorWrapper wrapper = new CodeMirrorWrapper(request.getContextPath(),"/js/codemirror-ui/lib/CodeMirror-2.0/mode"); +CodeMirrorWrapper wrapper = new CodeMirrorWrapper(request.getContextPath(),"/js/codemirror-ui/", "lib/CodeMirror-2.0/mode"); %> -<script src="/wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.js"></script> -<link rel="stylesheet" href="/wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/lib/codemirror.css"> -<script src="/wikitty-publication/js/codemirror-ui/js/codemirror-ui.js" type="text/javascript"></script> -<link rel="stylesheet" href="/wikitty-publication/js/codemirror-ui/css/codemirror-ui.css" type="text/css" media="screen" /> <% for (String uri : wrapper.getCodeMirrorCssImport()) { %> <link rel="stylesheet" href="<%=uri%>"> @@ -66,9 +62,8 @@ <script src="<%=uri%>"></script> <% } %> -<script src="/wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.js"></script> -<link rel="stylesheet" href="/wikitty-publication/js/codemirror-ui/lib/CodeMirror-2.0/mode/xml/xml.css"> + <style type="text/css"> .CodeMirror { border-top: 1px solid black; @@ -172,7 +167,10 @@ <select name="langageSelection" onchange="changeModeBy(this)"> <% for(SelectOption otpion : wrapper.getLangages()) { %> -<option value="<%=otpion.getValue()%>" selected="<%=otpion.isSelected()%>"><%=otpion.getDesc()%></option> +<option value="<%=otpion.getValue()%>" +<%=otpion.getValue(). +equalsIgnoreCase(wrapper.modeForMime(action.getMimeType()))?"selected":""%> +><%=otpion.getDesc()%></option> <% } %> </select> @@ -189,7 +187,7 @@ mode: "<%=wrapper.modeForMime(action.getMimeType())%>" }; -var uiOptions = { path : '/wikitty-publication/js/codemirror-ui/js/', searchMode : 'popup' }; +var uiOptions = { path : '<%=wrapper.getPathToCodeMirorUiJs()%>', searchMode : 'popup' }; uiCodeMiror = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions); //-->