From 6db2aeff20228297efb4f430b513939d782eafa8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jul 2017 12:00:18 +0200
Subject: [PATCH] Fix source code editor

---
 htdocs/core/class/doleditor.class.php | 70 ++++++++++++++++-----------
 htdocs/modulebuilder/index.php        | 32 ++++++++++--
 2 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 8f4bc50a2d4..9a9f0387309 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -146,7 +146,7 @@ class DolEditor
      *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements.
      *  @return	void|string
      */
-    function Create($noprint=0,$morejs='',$disallowAnyContent=true)
+    function Create($noprint=0, $morejs='', $disallowAnyContent=true)
     {
     	global $conf,$langs;
 
@@ -243,48 +243,62 @@ class DolEditor
                                filebrowserImageWindowHeight : \'500\'';
             	}
             	$out.= '	})'.$morejs;
-            	$out.= '});
-            			</script>';
+            	$out.= '});'."\n";
+            	$out.= '</script>'."\n";
             }
         }
+
+        // Output editor ACE
+        // Warning: ace.js and ext-statusbar.js must be loaded by the parent page.
         if (preg_match('/^ace/', $this->tool))
         {
         	$found=1;
 			$format=(GETPOST('format','aZ09')?GETPOST('format','aZ09'):'php');
 
-        	print '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'').($this->height?' height: '.$this->height.'px; ':'').'">';
-        	print preg_replace(array('/^<\?php/','/\?>$/'), array('&lt;?php','?&gt;'), $this->content);
-        	print '</pre>';
-        	print '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
-        	print $this->content;
-        	print '</textarea>';
+            $out.= '<!-- Output Ace editor -->'."\n";
+        	$out.= '<div id="statusBar"></div>';
+            $out.= '<pre id="'.$this->htmlname.'aceeditorid" style="'.($this->width?'width: '.$this->width.'px; ':'').($this->height?' height: '.$this->height.'px; ':'').'">';
+        	/*$out.= preg_replace(array('/^<\?php/','/\?>$/'), array('&lt;?php','?&gt;'), $this->content); */
+        	$out.= htmlentities($this->content);
+        	$out.= '</pre>';
+        	$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
+        	$out.= htmlentities($this->content);
+        	$out.= '</textarea>';
 
-        	print '<script type="text/javascript" language="javascript">'."\n";
-        	print 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
-					    aceEditor.session.setMode("ace/mode/'.$format.'");
-						aceEditor.setOptions({
-		   				   //enableBasicAutocompletion: false, // the editor completes the statement when you hit Ctrl + Space
-						   //enableLiveAutocompletion: false, // the editor completes the statement while you are typing
-						   //showPrintMargin: true, // hides the vertical limiting strip
-						   //maxLines: 34,
-						   fontSize: "100%" // ensures that the editor fits in the environment
-						});
-						// defines the style of the editor
-						aceEditor.setTheme("ace/theme/chrome");
-						// hides line numbers (widens the area occupied by error and warning messages)
-						//aceEditor.renderer.setOption("showLineNumbers", false);
-						// ensures proper autocomplete, validation and highlighting of JavaScript code
-						//aceEditor.getSession().setMode("ace/mode/javascript_expression");
-						'."\n";
+        	$out.= '<script type="text/javascript" language="javascript">'."\n";
+        	$out.= 'var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
 
-        	print 'jQuery(document).ready(function() {
+				    // Init status bar. Need lib ext-statusbar
+        			//var StatusBar = ace.require("ace/ext/statusbar").StatusBar;
+	    			//var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar"));
+
+				    aceEditor.session.setMode("ace/mode/'.$format.'");
+					aceEditor.setOptions({
+	   				   enableBasicAutocompletion: true, // the editor completes the statement when you hit Ctrl + Space. Need lib ext-language_tools.js
+					   enableLiveAutocompletion: false, // the editor completes the statement while you are typing. Need lib ext-language_tools.js
+					   showPrintMargin: false, // hides the vertical limiting strip
+					   minLines: 10,
+					   //maxLines: 34,
+					   fontSize: "100%" // ensures that the editor fits in the environment
+					});
+
+					// defines the style of the editor
+					aceEditor.setTheme("ace/theme/chrome");
+					// hides line numbers (widens the area occupied by error and warning messages)
+					//aceEditor.renderer.setOption("showLineNumbers", false);
+					// ensures proper autocomplete, validation and highlighting of JavaScript code
+					//aceEditor.getSession().setMode("ace/mode/javascript_expression");
+					'."\n";
+
+        	$out.= 'jQuery(document).ready(function() {
 						jQuery("#savefile").click(function() {
+        					console.log("We click on savefile button");
 							jQuery("#'.$this->htmlname.'").val(aceEditor.getSession().getValue());
 							if (strlen(jQuery("#'.$this->htmlname.'").html()) > 0) return true;
 							else return false;
 	        			});
 					})';
-        	print '</script>'."\n";
+        	$out.= '</script>'."\n";
         }
 
         if (empty($found))
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 78547dceee5..d8e1fa786a7 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -611,8 +611,34 @@ if (! dol_is_dir($dirins))
 }
 $dirins_ok=(dol_is_dir($dirins));
 
-
-llxHeader('', $langs->trans("ModuleBuilder"), "", '', 0, 0, array('/includes/ace/ace.js'), array());
+$head='<style type="text/css" media="screen">
+	.ace_editor {
+		margin: 0;
+	}
+	#statusBar {
+        margin: 0;
+        padding: 0;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        height: 20px;
+        background-color: rgb(245, 245, 245);
+        color: gray;
+    }
+    .ace_status-indicator {
+        color: gray;
+        position: relative;
+        right: 0;
+        border-left: 1px solid;
+    }
+	</style>';
+llxHeader($head, $langs->trans("ModuleBuilder"), "", '', 0, 0,
+	array(
+		'/includes/ace/ace.js',
+		'/includes/ace/ext-statusbar.js',
+		'/includes/ace/ext-language_tools.js',
+		//'/includes/ace/ext-chromevox.js'
+	), array());
 
 
 $text=$langs->trans("ModuleBuilder");
@@ -1302,7 +1328,7 @@ elseif (! empty($module))
                     print $doleditor->Create(1, '', false);
                     print '<br>';
                     print '<center>';
-                    print '<input type="submit" class="button id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+                    print '<input type="submit" class="button" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
                     print ' &nbsp; ';
                     print '<input type="submit" class="button" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
                     print '</center>';