Author: kcardineaud Date: 2011-06-29 16:57:03 +0200 (Wed, 29 Jun 2011) New Revision: 141 Url: http://nuiton.org/repositories/revision/scmwebeditor/141 Log: Fix a bug with the selection of the type of file Modified: trunk/src/main/webapp/ModificationViewer.jsp Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 14:07:46 UTC (rev 140) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-29 14:57:03 UTC (rev 141) @@ -47,12 +47,9 @@ <% String typeEditor="null"; if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ - typeEditor="rst"; - %><h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> - <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("html")) { - typeEditor="text/html"; - } - %> + %> + <h4>For any Problem with RestruturedText visit <a href="http://docutils.sourceforge.net/rst.html">RST documentation website</a>.</h4> + <% } %> </center> @@ -86,82 +83,85 @@ </label> <% + if(typeEditor.equals("null") && request.getAttribute("minetype")!=null) { + + if(( (String) request.getAttribute("minetype")).contains("rst") ) { + typeEditor="rst"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=1 + </script> + <% + } + else if(( (String) request.getAttribute("minetype")).contains("javascript")) { + typeEditor="javascript"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=2 + </script> + <% + } + else if(( (String) request.getAttribute("minetype")).contains("html") ) { + typeEditor="text/html"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=3 + </script> + <% + } + else if(( (String) request.getAttribute("minetype")).contains("xml") ) { + typeEditor="xml"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=4 + </script> + <% + } + } - if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("rst") ) { + if (typeEditor.equals("null") && request.getAttribute("format")!=null){ + + + if (request.getAttribute("format").equals("rst")) { typeEditor="rst"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=1 - </script> - <% - } - else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("javascript")) { + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=1 + </script> + <% } else if(request.getAttribute("format").equals("javascript")) { typeEditor="javascript"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=2 - </script> - <% - } - else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("html") ) { + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=2 + </script> + <% } else if(request.getAttribute("format").equals("html")) { typeEditor="text/html"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=3 - </script> - <% - } - else if(request.getAttribute("minetype")!=null && ( (String) request.getAttribute("minetype")).contains("xml") ) { + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=3 + </script> + <% + } else if(request.getAttribute("format").equals("xml")) { typeEditor="xml"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=4 - </script> - <% - } - - else { - if (request.getAttribute("format")!=null && request.getAttribute("format").equals("rst")){ - typeEditor="rst"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=1 - </script> - <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("javascript")) { - typeEditor="javascript"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=2 - </script> - <% } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("html")) { - typeEditor="text/html"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=3 - </script> - <% - } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("xml")) { - typeEditor="xml"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=4 - </script> - <% - } else if(request.getAttribute("format")!=null && request.getAttribute("format").equals("java")) { - typeEditor="text/x-java"; - %> - <script type='text/javascript'> - document.getElementById('language').selectedIndex=5 - </script> - <% - } + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=4 + </script> + <% + } else if(request.getAttribute("format").equals("java")) { + typeEditor="text/x-java"; + %> + <script type='text/javascript'> + document.getElementById('language').selectedIndex=5 + </script> + <% + } } +%> - %> - <script type="text/javascript"> var textarea = document.getElementById('newTextId'); var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'popup' }