r164 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp - Scmwebeditor-commits

7 Jul 2011

Author: kcardineaud
Date: 2011-07-07 12:31:09 +0200 (Thu, 07 Jul 2011)
New Revision: 164

Url: http://nuiton.org/repositories/revision/scmwebeditor/164

Log:
The default language in editor is now select only with javascript instead of java/javascript


Added:
   trunk/src/main/webapp/selectLanguage.js
Modified:
   trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java
   trunk/src/main/webapp/ModificationViewer.jsp

Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java
===================================================================

--- trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java	2011-07-07 09:25:04 UTC (rev 163)
+++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/SearchAction.java	2011-07-07 10:31:09 UTC (rev 164)
@@ -127,7 +127,6 @@
         
         if(log.isInfoEnabled()) {
             log.info("Enter in search action");
-            log.info("username : "+username+" pw : "+pw);
         }
         
          

Modified: trunk/src/main/webapp/ModificationViewer.jsp
===================================================================
--- trunk/src/main/webapp/ModificationViewer.jsp	2011-07-07 09:25:04 UTC (rev 163)
+++ trunk/src/main/webapp/ModificationViewer.jsp	2011-07-07 10:31:09 UTC (rev 164)
@@ -11,6 +11,8 @@
 <head>
     <title>SCMWebEditor</title>
 
+    <script src="selectLanguage.js"></script>
+
     
     <!-- Code mirror -->
     <!-- First the CodeMirror stuff  -->
@@ -75,8 +77,18 @@
     <p>File in editor : <a href="<%=request.getAttribute("address")%>" ><%=request.getAttribute("address")%></a> </p>
     <textarea id="newTextId" rows="50" cols="80" name="newText"><%=valueTextarea%></textarea>
      
+     
+     
+    <script type="text/javascript">
+        var textarea = document.getElementById('newTextId');
+        var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } 
+        var codeMirrorOptions = { mode: "null" } 
+        var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions);
+    </script>
+     
+     
     <label>Language :
-        <select id="language" name="langageSelection" onchange="changeModeBy(this)">
+        <select id="language" name="langageSelection" onchange="changeModeBy(editor,this)">
             <option value="null">Text</option>
             <option value="rst">ReStructuredText</option>
             <option value="javascript">Javascript</option>
@@ -86,101 +98,16 @@
         </select>
     </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 (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("format").equals("javascript")) {
-        typeEditor="javascript";
-        %>
-        <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("format").equals("xml")) {
-        typeEditor="xml";
-        %>
-        <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'>
+    selectLanguage('<%=((String) request.getAttribute("minetype"))%>','<%=request.getAttribute("format")%>' );
+    changeModeBy(editor, document.getElementById('language'));
+    </script>
 
 
-
     <script type="text/javascript">
-        var textarea = document.getElementById('newTextId');
-        var uiOptions = { path : 'codemirror-ui/js/', searchMode : 'inline' } 
-        var codeMirrorOptions = { mode: "<%=typeEditor%>" } 
-        var editor = new CodeMirrorUI(textarea,uiOptions,codeMirrorOptions);
-    </script>
-    
-    
-    <script type="text/javascript">
-    function changeModeBy(select){
-        editor.mirror.setOption("mode",select.value);
-        //editor.reindent();
-    }
-    </script>
-    <script type="text/javascript">
         function loadChange(){
             document.getElementById('newTextId').value = editor.mirror.getValue();
         }

Added: trunk/src/main/webapp/selectLanguage.js
===================================================================
--- trunk/src/main/webapp/selectLanguage.js	                        (rev 0)
+++ trunk/src/main/webapp/selectLanguage.js	2011-07-07 10:31:09 UTC (rev 164)
@@ -0,0 +1,92 @@
+/**
+ * 
+ */
+
+
+function contains(text, test) {
+	
+    if(text.indexOf(test) == -1) {
+    	return false;
+    }
+    else {
+    	return true;
+    }
+}
+
+
+
+function changeModeBy(CodeMirrorEditor, select){
+	CodeMirrorEditor.mirror.setOption("mode",select.value);
+}
+
+
+
+function selectLanguage(minetype, format) {
+	
+	var typeEditor = null;
+	
+	if(typeEditor==null && minetype!=null) {
+
+        if(contains(minetype, "rst") ) {
+            typeEditor="rst";
+            document.getElementById('language').selectedIndex=1
+        }
+        else if(contains(minetype, "javascript")) {
+            typeEditor="javascript";
+            document.getElementById('language').selectedIndex=2
+        }
+        else if(contains(minetype, "html") ) {
+            typeEditor="text/html";
+        
+        
+        document.getElementById('language').selectedIndex=3
+        
+        
+        }
+        else if( contains(minetype, "xml") ) {
+            typeEditor="xml";
+        
+        
+        document.getElementById('language').selectedIndex=4
+        
+        
+        }
+    }
+    
+    if (typeEditor==null && format!=null){
+           
+            
+        if (format==("rst")) {        
+        typeEditor="rst";
+        
+        
+            document.getElementById('language').selectedIndex=1
+//            var element = document.getElementById('language');
+//            element.value = "rst";
+        
+         } else if(format==("javascript")) {
+        	 typeEditor="javascript";
+    
+        	 document.getElementById('language').selectedIndex=2
+                            
+         } else if(format==("html")) {
+        	 typeEditor="text/html";
+     
+        	 document.getElementById('language').selectedIndex=3
+      
+        } else if(format==("xml")) {
+        	typeEditor="xml";
+     
+        	document.getElementById('language').selectedIndex=4
+
+        } else if(format==("java")) {
+        	typeEditor="text/x-java";
+
+        	document.getElementById('language').selectedIndex=5
+
+        }
+        
+    }
+	
+	
+}
\ No newline at end of file

    

r164 - in trunk/src/main: java/org/nuiton/scmwebeditor/actions webapp

kcardineaud＠users.nuiton.org

tags

participants (1)