unageanu-jiji 1.1.4 → 1.2.1

data/html/js/edit_area/highlight.js

@@ -1,8 +1,8 @@
 	// change_to: "on" or "off"
 	EditArea.prototype.change_highlight= function(change_to){
 		if(this.settings["syntax"].length==0 && change_to==false){
-			this.switchClassSticky($("highlight"), 'editAreaButtonDisabled', true);
-			this.switchClassSticky($("reset_highlight"), 'editAreaButtonDisabled', true);
+			this.switchClassSticky(_$("highlight"), 'editAreaButtonDisabled', true);
+			this.switchClassSticky(_$("reset_highlight"), 'editAreaButtonDisabled', true);
 			return false;
 		}
 		
@@ -10,8 +10,7 @@
 			return false;
 	
 			
-		if(this.nav['isIE'])
-			this.getIESelection();
+		this.getIESelection();
 		var pos_start= this.textarea.selectionStart;
 		var pos_end= this.textarea.selectionEnd;
 		
@@ -22,261 +21,370 @@
 		this.textarea.focus();
 		this.textarea.selectionStart = pos_start;
 		this.textarea.selectionEnd = pos_end;
-		if(this.nav['isIE'])
-			this.setIESelection();
+		this.setIESelection();
 				
 	};
 	
-	EditArea.prototype.disable_highlight= function(displayOnly){		
-		this.selection_field.innerHTML="";
-		this.content_highlight.style.visibility="hidden";
+	EditArea.prototype.disable_highlight= function(displayOnly){
+		var t= this, a=t.textarea, new_Obj, old_class, new_class;
+			
+		t.selection_field.innerHTML="";
+		t.selection_field_text.innerHTML="";
+		t.content_highlight.style.visibility="hidden";
 		// replacing the node is far more faster than deleting it's content in firefox
-		var new_Obj= this.content_highlight.cloneNode(false);
+		new_Obj= t.content_highlight.cloneNode(false);
 		new_Obj.innerHTML= "";			
-		this.content_highlight.parentNode.insertBefore(new_Obj, this.content_highlight);
-		this.content_highlight.parentNode.removeChild(this.content_highlight);	
-		this.content_highlight= new_Obj;
-		var old_class= parent.getAttribute(this.textarea,"class");
+		t.content_highlight.parentNode.insertBefore(new_Obj, t.content_highlight);
+		t.content_highlight.parentNode.removeChild(t.content_highlight);	
+		t.content_highlight= new_Obj;
+		old_class= parent.getAttribute( a,"class" );
 		if(old_class){
-			var new_class= old_class.replace("hidden","");
-			parent.setAttribute(this.textarea, "class", new_class);
+			new_class= old_class.replace( "hidden","" );
+			parent.setAttribute( a, "class", new_class );
 		}
 	
-		this.textarea.style.backgroundColor="transparent";	// needed in order to see the bracket finders
+		a.style.backgroundColor="transparent";	// needed in order to see the bracket finders
 		
 		//var icon= document.getElementById("highlight");
 		//setAttribute(icon, "class", getAttribute(icon, "class").replace(/ selected/g, "") );
-		//this.restoreClass(icon);
-		//this.switchClass(icon,'editAreaButtonNormal');
-		this.switchClassSticky($("highlight"), 'editAreaButtonNormal', true);
-		this.switchClassSticky($("reset_highlight"), 'editAreaButtonDisabled', true);
+		//t.restoreClass(icon);
+		//t.switchClass(icon,'editAreaButtonNormal');
+		t.switchClassSticky(_$("highlight"), 'editAreaButtonNormal', true);
+		t.switchClassSticky(_$("reset_highlight"), 'editAreaButtonDisabled', true);
 	
-		this.do_highlight=false;
+		t.do_highlight=false;
 	
-		this.switchClassSticky($("change_smooth_selection"), 'editAreaButtonSelected', true);
-		if(typeof(this.smooth_selection_before_highlight)!="undefined" && this.smooth_selection_before_highlight===false){
-			this.change_smooth_selection_mode(false);
+		t.switchClassSticky(_$("change_smooth_selection"), 'editAreaButtonSelected', true);
+		if(typeof(t.smooth_selection_before_highlight)!="undefined" && t.smooth_selection_before_highlight===false){
+			t.change_smooth_selection_mode(false);
 		}
 		
 	//	this.textarea.style.backgroundColor="#FFFFFF";
 	};
 
 	EditArea.prototype.enable_highlight= function(){
-		this.show_waiting_screen();
+		var t=this, a=t.textarea, new_class;
+		t.show_waiting_screen();
 			
-		this.content_highlight.style.visibility="visible";
-		var new_class=parent.getAttribute(this.textarea,"class")+" hidden";
-		parent.setAttribute(this.textarea, "class", new_class);
+		t.content_highlight.style.visibility="visible";
+		new_class	=parent.getAttribute(a,"class")+" hidden";
+		parent.setAttribute( a, "class", new_class );
 		
-		if(this.nav['isIE'])
-			this.textarea.style.backgroundColor="#FFFFFF";	// IE can't manage mouse click outside text range without this
+		// IE can't manage mouse click outside text range without this
+		if( t.isIE )
+			a.style.backgroundColor="#FFFFFF";	
 
-		//var icon= document.getElementById("highlight");
-		//setAttribute(icon, "class", getAttribute(icon, "class") + " selected");
-		//this.switchClass(icon,'editAreaButtonSelected');
-		//this.switchClassSticky($("highlight"), 'editAreaButtonNormal', false);
-		this.switchClassSticky($("highlight"), 'editAreaButtonSelected', false);
-		this.switchClassSticky($("reset_highlight"), 'editAreaButtonNormal', false);
+		t.switchClassSticky(_$("highlight"), 'editAreaButtonSelected', false);
+		t.switchClassSticky(_$("reset_highlight"), 'editAreaButtonNormal', false);
 		
-		this.smooth_selection_before_highlight=this.smooth_selection;
-		if(!this.smooth_selection)
-			this.change_smooth_selection_mode(true);
-		this.switchClassSticky($("change_smooth_selection"), 'editAreaButtonDisabled', true);
+		t.smooth_selection_before_highlight=t.smooth_selection;
+		if(!t.smooth_selection)
+			t.change_smooth_selection_mode(true);
+		t.switchClassSticky(_$("change_smooth_selection"), 'editAreaButtonDisabled', true);
 		
 		
-		this.do_highlight=true;
-		this.resync_highlight();
+		t.do_highlight=true;
+		t.resync_highlight();
 					
-		this.hide_waiting_screen();
-		//area.onkeyup="";
-		/*if(!displayOnly){
-			this.do_highlight=true;
-			this.reSync();
-			if(this.state=="loaded")
-				this.textarea.focus();
-		}*/
-	
+		t.hide_waiting_screen();	
 	};
 	
-	
+	/**
+	 * Ask to update highlighted text
+	 * @param Array infos - Array of datas returned by EditArea.get_selection_infos()
+	 */
 	EditArea.prototype.maj_highlight= function(infos){
-		if(this.last_highlight_base_text==infos["full_text"] && this.resync_highlight!==true)
-			return;
-					
-		//var infos= this.getSelectionInfos();
-		if(infos["full_text"].indexOf("\r")!=-1)
-			text_to_highlight= infos["full_text"].replace(/\r/g, "");
-		else
-			text_to_highlight= infos["full_text"];
-		
-		// for optimisation process
-		var start_line_pb=-1;	
-		var end_line_pb=-1;		
-		
-		var stay_begin="";	
-		var stay_end="";
-		
-		
-		var debug_opti="";
-		
 		// for speed mesure
-		var date= new Date();
-		var tps_start=date.getTime();		
-		var tps_middle_opti=date.getTime();	
+		var debug_opti="",tps_start= new Date().getTime(), tps_middle_opti=new Date().getTime();
+		var t=this, hightlighted_text, updated_highlight;	
+		var textToHighlight=infos["full_text"], doSyntaxOpti = false, doHtmlOpti = false, stay_begin="", stay_end="", trace_new , trace_last;
 		
+		if(t.last_text_to_highlight==infos["full_text"] && t.resync_highlight!==true)
+			return;
 					
 		//  OPTIMISATION: will search to update only changed lines
-		if(this.reload_highlight===true){
-			this.reload_highlight=false;
-		}else if(text_to_highlight.length==0){
-			text_to_highlight="\n ";
-		}else{			
-			var base_step=200;
+		if(t.reload_highlight===true){
+			t.reload_highlight=false;
+		}else if(textToHighlight.length==0){
+			textToHighlight="\n ";
+		}else{
+			// get text change datas
+			changes = t.checkTextEvolution(t.last_text_to_highlight,textToHighlight);
 			
-			var cpt= 0;
-			var end= Math.min(text_to_highlight.length, this.last_text_to_highlight.length);
-            var step= base_step;
-            // find how many chars are similar at the begin of the text						
-			while(cpt<end && step>=1){
-                if(this.last_text_to_highlight.substr(cpt, step) == text_to_highlight.substr(cpt, step)){
-                    cpt+= step;
-                }else{
-                    step= Math.floor(step/2);
-                }
-			}
-			var pos_start_change=cpt;
-			var line_start_change= text_to_highlight.substr(0, pos_start_change).split("\n").length -1;						
+			// check if it can only reparse the changed text
+			trace_new		= t.get_syntax_trace(changes.newTextLine).replace(/\r/g, '');
+			trace_last		= t.get_syntax_trace(changes.lastTextLine).replace(/\r/g, '');
+			doSyntaxOpti	= ( trace_new == trace_last );
 			
-			cpt_last= this.last_text_to_highlight.length;
-            cpt= text_to_highlight.length;
-            step= base_step;			
-            // find how many chars are similar at the end of the text						
-			while(cpt>=0 && cpt_last>=0 && step>=1){
-                if(this.last_text_to_highlight.substr(cpt_last-step, step) == text_to_highlight.substr(cpt-step, step)){
-                    cpt-= step;
-                    cpt_last-= step;
-                }else{
-                    step= Math.floor(step/2);
-                }
+			// check if the difference comes only from a new line created 
+			// => we have to remember that the editor can automaticaly add tabulation or space after the new line) 
+			if( !doSyntaxOpti && trace_new == "\n"+trace_last && /^[ \t\s]*\n[ \t\s]*$/.test( changes.newText.replace(/\r/g, '') ) && changes.lastText =="" )
+			{
+				doSyntaxOpti	= true;
 			}
-			//cpt_last=Math.max(0, cpt_last);
-			var pos_new_end_change= cpt;
-			var pos_last_end_change= cpt_last;
-			if(pos_new_end_change<=pos_start_change){
-				if(this.last_text_to_highlight.length < text_to_highlight.length){
-					pos_new_end_change= pos_start_change + text_to_highlight.length - this.last_text_to_highlight.length;
-					pos_last_end_change= pos_start_change;
-				}else{
-					pos_last_end_change= pos_start_change + this.last_text_to_highlight.length - text_to_highlight.length;
-					pos_new_end_change= pos_start_change;
-				}
-			} 
-			var change_new_text= text_to_highlight.substring(pos_start_change, pos_new_end_change);
-			var change_last_text= this.last_text_to_highlight.substring(pos_start_change, pos_last_end_change);			            
-			
-			var line_new_end_change= text_to_highlight.substr(0, pos_new_end_change).split("\n").length -1;
-			var line_last_end_change= this.last_text_to_highlight.substr(0, pos_last_end_change).split("\n").length -1;
 			
-			var change_new_text_line= text_to_highlight.split("\n").slice(line_start_change, line_new_end_change+1).join("\n");
-			var change_last_text_line= this.last_text_to_highlight.split("\n").slice(line_start_change, line_last_end_change+1).join("\n");
-		
-			// check if it can only reparse the changed text
-			var trace_new= this.get_syntax_trace(change_new_text_line);
-			var trace_last= this.get_syntax_trace(change_last_text_line);
-			if(trace_new == trace_last){
+			// we do the syntax optimisation
+			if( doSyntaxOpti ){
 						
+				tps_middle_opti=new Date().getTime();	
 			
-			
-				date= new Date();		
-				tps_middle_opti=date.getTime();	
-			
-				stay_begin= this.last_hightlighted_text.split("\n").slice(0, line_start_change).join("\n");
-				if(line_start_change>0)
+				stay_begin= t.last_hightlighted_text.split("\n").slice(0, changes.lineStart).join("\n");
+				if(changes.lineStart>0)
 					stay_begin+= "\n";
-				stay_end= this.last_hightlighted_text.split("\n").slice(line_last_end_change+1).join("\n");
+				stay_end= t.last_hightlighted_text.split("\n").slice(changes.lineLastEnd+1).join("\n");
 				if(stay_end.length>0)
 					stay_end= "\n"+stay_end;
-	
-	
-				if(stay_begin.length==0 && pos_last_end_change==-1)
-					change_new_text_line+="\n";
-				text_to_highlight=change_new_text_line;
-				
+					
+				// Final check to see that we're not in the middle of span tags
+				if( stay_begin.split('<span').length != stay_begin.split('</span').length 
+					|| stay_end.split('<span').length != stay_end.split('</span').length )
+				{
+					doSyntaxOpti	= false;
+					stay_end		= '';
+					stay_begin		= '';
+				}
+				else
+				{
+					if(stay_begin.length==0 && changes.posLastEnd==-1)
+						changes.newTextLine+="\n";
+					textToHighlight=changes.newTextLine;
+				}
 			}
-			if(this.settings["debug"]){
-				debug_opti= (trace_new == trace_last)?"Optimisation": "No optimisation";
-				debug_opti+= " start: "+pos_start_change +"("+line_start_change+")";
-				debug_opti+=" end_new: "+ pos_new_end_change+"("+line_new_end_change+")";
-				debug_opti+=" end_last: "+ pos_last_end_change+"("+line_last_end_change+")";
-				debug_opti+="\nchanged_text: "+change_new_text+" => trace: "+trace_new;
-				debug_opti+="\nchanged_last_text: "+change_last_text+" => trace: "+trace_last;
-				//debug_opti+= "\nchanged: "+ infos["full_text"].substring(pos_start_change, pos_new_end_change);
-				debug_opti+= "\nchanged_line: "+change_new_text_line;
-				debug_opti+= "\nlast_changed_line: "+change_last_text_line;
-				debug_opti+="\nstay_begin: "+ stay_begin.slice(-200);
-				debug_opti+="\nstay_end: "+ stay_end;
-				//debug_opti="start: "+stay_begin_len+ "("+nb_line_start_unchanged+") end: "+ (stay_end_len)+ "("+(splited.length-nb_line_end_unchanged)+") ";
-				//debug_opti+="changed: "+ text_to_highlight.substring(stay_begin_len, text_to_highlight.length-stay_end_len)+" \n";
-				
-				//debug_opti+="changed: "+ stay_begin.substr(stay_begin.length-200)+ "----------"+ text_to_highlight+"------------------"+ stay_end.substr(0,200) +"\n";
-				debug_opti+="\n";
+			if(t.settings["debug"]){
+				var ch =changes;
+				debug_opti= ( doSyntaxOpti?"Optimisation": "No optimisation" )
+					+" start: "+ch.posStart +"("+ch.lineStart+")"
+					+" end_new: "+ ch.posNewEnd+"("+ch.lineNewEnd+")"
+					+" end_last: "+ ch.posLastEnd+"("+ch.lineLastEnd+")"
+					+"\nchanged_text: "+ch.newText+" => trace: "+trace_new
+					+"\nchanged_last_text: "+ch.lastText+" => trace: "+trace_last
+					//debug_opti+= "\nchanged: "+ infos["full_text"].substring(ch.posStart, ch.posNewEnd);
+					+ "\nchanged_line: "+ch.newTextLine
+					+ "\nlast_changed_line: "+ch.lastTextLine
+					+"\nstay_begin: "+ stay_begin.slice(-100)
+					+"\nstay_end: "+ stay_end.substr( 0, 100 );
+					//debug_opti="start: "+stay_begin_len+ "("+nb_line_start_unchanged+") end: "+ (stay_end_len)+ "("+(splited.length-nb_line_end_unchanged)+") ";
+					//debug_opti+="changed: "+ textToHighlight.substring(stay_begin_len, textToHighlight.length-stay_end_len)+" \n";
+					
+					//debug_opti+="changed: "+ stay_begin.substr(stay_begin.length-200)+ "----------"+ textToHighlight+"------------------"+ stay_end.substr(0,200) +"\n";
+					+"\n";
 			}
 	
 			
 			// END OPTIMISATION
 		}
-		date= new Date();
-		tps_end_opti=date.getTime();	
+
+		tps_end_opti	= new Date().getTime();	
 				
 		// apply highlight
-		var updated_highlight= this.colorize_text(text_to_highlight);		
+		updated_highlight	= t.colorize_text(textToHighlight);
+		tpsAfterReg			= new Date().getTime();
 		
-		// get the new highlight content
+		/***
+		 * see if we can optimize for updating only the required part of the HTML code
+		 * 
+		 * The goal here will be to find the text node concerned by the modification and to update it
+		 */
+		//-------------------------------------------
+		// 
+		if( doSyntaxOpti )
+		{
+			try
+			{
+				var replacedBloc, i, nbStart = '', nbEnd = '', newHtml, lengthOld, lengthNew;
+				replacedBloc		= t.last_hightlighted_text.substring( stay_begin.length, t.last_hightlighted_text.length - stay_end.length );
+				
+				lengthOld	= replacedBloc.length;
+				lengthNew	= updated_highlight.length;
+				
+				// find the identical caracters at the beginning
+				for( i=0; i < lengthOld && i < lengthNew && replacedBloc.charAt(i) == updated_highlight.charAt(i) ; i++ )
+				{
+				}
+				nbStart = i;
+				// find the identical caracters at the end
+				for( i=0; i + nbStart < lengthOld && i + nbStart < lengthNew && replacedBloc.charAt(lengthOld-i-1) == updated_highlight.charAt(lengthNew-i-1) ; i++ )
+				{
+				}
+				nbEnd	= i;
+				
+				// get the changes
+				lastHtml	= replacedBloc.substring( nbStart, lengthOld - nbEnd );
+				newHtml		= updated_highlight.substring( nbStart, lengthNew - nbEnd );
+				
+				
+				// We can do the optimisation only if we havn't touch to span elements
+				if( newHtml.indexOf('<span') == -1 && newHtml.indexOf('</span') == -1 
+					&& lastHtml.indexOf('<span') == -1 && lastHtml.indexOf('</span') == -1 )
+				{
+					var beginStr, nbOpendedSpan, nbClosedSpan, nbUnchangedChars, span, textNode;
+					doHtmlOpti		= true;
+					beginStr		= t.last_hightlighted_text.substr( 0, stay_begin.length + nbStart );
 			
-		date= new Date();
-		tps2=date.getTime();
-		//updated_highlight= "<div class='keywords'>"+updated_highlight+"</div>";
-		var hightlighted_text= stay_begin + updated_highlight + stay_end;
-		//this.previous_hightlight_content= tab_text.join("<br>");
+					nbOpendedSpan	= beginStr.split('<span').length - 1;
+					nbClosedSpan	= beginStr.split('</span').length - 1;
+					// retrieve the previously opened span (Add 1 for the first level span?)
+					span 			= t.content_highlight.getElementsByTagName('span')[ nbOpendedSpan ];
+					
+					//--------[
+					// get the textNode to update
+					
+					// if we're inside a span, we'll take the one that is opened (can be a parent of the current span)
+					parentSpan		= span;
+					maxStartOffset	= maxEndOffset = 0;
+					
+					// it will be in the child of the root node 
+					if( nbOpendedSpan == nbClosedSpan )
+					{
+						while( parentSpan.parentNode != t.content_highlight && parentSpan.parentNode.tagName != 'PRE' )
+						{
+							parentSpan	= parentSpan.parentNode;
+						}
+					}
+					// get the last opened span
+					else
+					{
+						maxStartOffset	= maxEndOffset = beginStr.length + 1;
+						// move to parent node for each closed span found after the lastest open span
+						nbClosed = beginStr.substr( Math.max( 0, beginStr.lastIndexOf( '<span', maxStartOffset - 1 ) ) ).split('</span').length - 1;
+						while( nbClosed > 0 )
+						{
+							nbClosed--;
+							parentSpan = parentSpan.parentNode;
+						}
+						
+						// find the position of the last opended tag
+						while( parentSpan.parentNode != t.content_highlight && parentSpan.parentNode.tagName != 'PRE' && ( tmpMaxStartOffset = Math.max( 0, beginStr.lastIndexOf( '<span', maxStartOffset - 1 ) ) ) < ( tmpMaxEndOffset = Math.max( 0, beginStr.lastIndexOf( '</span', maxEndOffset - 1 ) ) ) )
+						{
+							maxStartOffset	= tmpMaxStartOffset;
+							maxEndOffset	= tmpMaxEndOffset;
+						}
+					}
+					// Note: maxEndOffset is no more used but maxStartOffset will be used
+					
+					if( parentSpan.parentNode == t.content_highlight || parentSpan.parentNode.tagName == 'PRE' )
+					{
+						maxStartOffset	= Math.max( 0, beginStr.indexOf( '<span' ) );
+					}
+					
+					// find the matching text node (this will be one that will be at the end of the beginStr
+					if( maxStartOffset == beginStr.length )
+					{
+						nbSubSpanBefore	= 0;
+					}
+					else
+					{
+						lastEndPos 				= Math.max( 0, beginStr.lastIndexOf( '>', maxStartOffset ) );
 		
-		date= new Date();
-		inner1=date.getTime();		
+						// count the number of sub spans
+						nbSubSpanBefore			= beginStr.substr( lastEndPos ).split('<span').length-1;
+					}
 					
-		// update the content of the highlight div by first updating a clone node (as there is no display in the same time for this node it's quite faster (5*))
-		var new_Obj= this.content_highlight.cloneNode(false);
-		if(this.nav['isIE'] || this.nav['isOpera'] || this.nav['isFirefox'] >= 3 )
-			new_Obj.innerHTML= "<pre><span class='"+ this.settings["syntax"] +"'>" + hightlighted_text.replace("\n", "<br/>") + "</span></pre>";	
-		else
-			new_Obj.innerHTML= "<span class='"+ this.settings["syntax"] +"'>"+ hightlighted_text +"</span>";			
-		this.content_highlight.parentNode.replaceChild(new_Obj, this.content_highlight);
-		this.content_highlight= new_Obj;
-		if(infos["full_text"].indexOf("\r")!=-1)
-			this.last_text_to_highlight= infos["full_text"].replace(/\r/g, "");
-		else
-			this.last_text_to_highlight= infos["full_text"];
-		this.last_hightlighted_text= hightlighted_text;
-		date= new Date();
-		tps3=date.getTime();
+					// there is no sub-span before
+					if( nbSubSpanBefore == 0 )
+					{
+						textNode	= parentSpan.firstChild;
+					}
+					// we need to find where is the text node modified
+					else
+					{
+						// take the last direct child (no sub-child)
+						lastSubSpan	= parentSpan.getElementsByTagName('span')[ nbSubSpanBefore - 1 ];
+						while( lastSubSpan.parentNode != parentSpan )
+						{
+							lastSubSpan	= lastSubSpan.parentNode;
+						}
+
+						// associate to next text node following the last sub span
+						if( lastSubSpan.nextSibling == null || lastSubSpan.nextSibling.nodeType != 3 )
+						{
+							textNode	= document.createTextNode('');
+							lastSubSpan.parentNode.insertBefore( textNode, lastSubSpan.nextSibling );
+						}
+						else
+						{
+							textNode	= lastSubSpan.nextSibling;
+						}
+					}
+					//--------]
+					
+					
+					//--------[
+					// update the textNode content
+					
+					// number of caracters after the last opened of closed span
+					nbUnchangedChars = beginStr.length - Math.max( 0, beginStr.lastIndexOf( '>' ) + 1 );
+					
+					//	console.log( span, textNode, nbOpendedSpan,nbClosedSpan,  span.nextSibling, textNode.length, nbUnchangedChars, lastHtml, lastHtml.length, newHtml, newHtml.length );
+					//	alert( textNode.parentNode.className +'-'+ textNode.parentNode.tagName+"\n"+ textNode.data +"\n"+ nbUnchangedChars +"\n"+ lastHtml.length +"\n"+ newHtml +"\n"+ newHtml.length  );
+					
+					// IE only manage \r for cariage return in textNode and not \n or \r\n
+					if( t.isIE )
+					{
+						nbUnchangedChars	-= ( beginStr.substr( beginStr.length - nbUnchangedChars ).split("\n").length - 1 );
+						//alert( textNode.data.replace(/\r/g, '_r').replace(/\n/g, '_n')); 
+						textNode.replaceData( nbUnchangedChars, lastHtml.replace(/\n/g, '').length, newHtml.replace(/\n/g, '') );
+					}
+					else
+					{
+						textNode.replaceData( nbUnchangedChars, lastHtml.length, newHtml );
+					}
+					//--------]
+				}
+			}
+			// an exception shouldn't occured but if replaceData failed at least it won't break everything
+			catch( e )
+			{
+		//		throw e;
+		//		console.log( e );
+				doHtmlOpti	= false;
+			}
+			
+		}
+		/*** END HTML update's optimisation ***/
+		// end test
+		
+	//			console.log(  (TPS6-TPS5), (TPS5-TPS4), (TPS4-TPS3), (TPS3-TPS2), (TPS2-TPS1), _CPT );
+		// get the new highlight content
+		tpsAfterOpti2		= new Date().getTime();
+		hightlighted_text	= stay_begin + updated_highlight + stay_end;
+		if( !doHtmlOpti )
+		{
+			// update the content of the highlight div by first updating a clone node (as there is no display in the same time for t node it's quite faster (5*))
+			var new_Obj= t.content_highlight.cloneNode(false);
+			if( ( t.isIE && t.isIE < 8 ) || ( t.isOpera && t.isOpera < 9.6 ) )
+				new_Obj.innerHTML= "<pre><span class='"+ t.settings["syntax"] +"'>" + hightlighted_text + "</span></pre>";	
+			else
+				new_Obj.innerHTML= "<span class='"+ t.settings["syntax"] +"'>"+ hightlighted_text +"</span>";
+	
+			t.content_highlight.parentNode.replaceChild(new_Obj, t.content_highlight);
+		
+			t.content_highlight= new_Obj;
+		}
+		
+		t.last_text_to_highlight= infos["full_text"];
+		t.last_hightlighted_text= hightlighted_text;
+		
+		tps3=new Date().getTime();
 	
-		if(this.settings["debug"]){
-			tot1=tps_end_opti-tps_start;
-			tot_middle=tps_end_opti- tps_middle_opti;
-			tot2=tps2-tps_end_opti;
-			tps_join=inner1-tps2;			
-			tps_td2=tps3-inner1;
+		if(t.settings["debug"]){
 			//lineNumber=tab_text.length;
-			//this.debug.value+=" \nNB char: "+$("src").value.length+" Nb line: "+ lineNumber;
-			this.debug.value= "Tps optimisation "+tot1+" (second part: "+tot_middle+") | tps reg exp: "+tot2+" | tps join: "+tps_join;
-			this.debug.value+= " | tps update highlight content: "+tps_td2+"("+tps3+")\n";
-			this.debug.value+=debug_opti;
-		//	this.debug.value+= "highlight\n"+hightlighted_text;
+			//t.debug.value+=" \nNB char: "+_$("src").value.length+" Nb line: "+ lineNumber;
+		
+			t.debug.value= "Tps optimisation "+(tps_end_opti-tps_start)
+				+" | tps reg exp: "+ (tpsAfterReg-tps_end_opti)
+				+" | tps opti HTML : "+ (tpsAfterOpti2-tpsAfterReg) + ' '+ ( doHtmlOpti ? 'yes' : 'no' )
+				+" | tps update highlight content: "+ (tps3-tpsAfterOpti2)
+				+" | tpsTotal: "+ (tps3-tps_start)
+				+ "("+tps3+")\n"+ debug_opti;
+		//	t.debug.value+= "highlight\n"+hightlighted_text;*/
 		}
 		
 	};
 	
 	EditArea.prototype.resync_highlight= function(reload_now){
 		this.reload_highlight=true;
-		this.last_highlight_base_text="";
+		this.last_text_to_highlight="";
 		this.focus();		
 		if(reload_now)
 			this.check_line_selection(false); 

data/html/js/edit_area/keyboard.js

@@ -11,7 +11,7 @@ function keyDown(e){
 	for(var i in editArea.plugins){
 		if(typeof(editArea.plugins[i].onkeydown)=="function"){
 			if(editArea.plugins[i].onkeydown(e)===false){ // stop propaging
-				if(editArea.nav['isIE'])
+				if(editArea.isIE)
 					e.keyCode=0;
 				return false;
 			}
@@ -27,10 +27,10 @@ function keyDown(e){
 	
 	var low_letter= letter.toLowerCase();
 			
-	if(letter=="Page up" && !editArea.nav['isOpera']){
+	if(letter=="Page up" && !editArea.isOpera){
 		editArea.execCommand("scroll_page", {"dir": "up", "shift": ShiftPressed(e)});
 		use=true;
-	}else if(letter=="Page down" && !editArea.nav['isOpera']){
+	}else if(letter=="Page down" && !editArea.isOpera){
 		editArea.execCommand("scroll_page", {"dir": "down", "shift": ShiftPressed(e)});
 		use=true;
 	}else if(editArea.is_editable==false){
@@ -43,7 +43,7 @@ function keyDown(e){
 			editArea.execCommand("tab_selection");
 		
 		use=true;
-		if(editArea.nav['isOpera'] || (editArea.nav['isFirefox'] && editArea.nav['isMacOS']) )	// opera && firefox mac can't cancel tabulation events...
+		if(editArea.isOpera || (editArea.isFirefox && editArea.isMac) )	// opera && firefox mac can't cancel tabulation events...
 			setTimeout("editArea.execCommand('focus');", 1);
 	}else if(letter=="Entrer" && target_id=="textarea"){
 		if(editArea.press_enter())
@@ -103,7 +103,7 @@ function keyDown(e){
 	
 	if(use){
 		// in case of a control that sould'nt be used by IE but that is used => THROW a javascript error that will stop key action
-		if(editArea.nav['isIE'])
+		if(editArea.isIE)
 			e.keyCode=0;
 		return false;
 	}