unageanu-jiji 1.1.4 → 1.2.1

data/html/js/edit_area/edit_area_functions.js

@@ -10,16 +10,17 @@
 	};
 	
 	EditArea.prototype.show_waiting_screen= function(){
-		width= this.editor_area.offsetWidth;
-		height= this.editor_area.offsetHeight;
-		if(this.nav['isGecko'] || this.nav['isOpera'] || this.nav['isIE']>=7){
-			width-=2;
-			height-=2;
+		width	= this.editor_area.offsetWidth;
+		height	= this.editor_area.offsetHeight;
+		if( !(this.isIE && this.isIE<6) )
+		{
+			width	-= 2;
+			height	-= 2;
 		}
-		this.processing_screen.style.display="block";
-		this.processing_screen.style.width= width+"px";
-		this.processing_screen.style.height= height+"px";
-		this.waiting_screen_displayed= true;
+		this.processing_screen.style.display= "block";
+		this.processing_screen.style.width	= width+"px";
+		this.processing_screen.style.height	= height+"px";
+		this.waiting_screen_displayed		= true;
 	};
 	
 	EditArea.prototype.hide_waiting_screen= function(){
@@ -32,86 +33,126 @@
 			newcss = document.createElement("style");
 			newcss.type="text/css";
 			newcss.media="all";
-			document.getElementsByTagName("head")[0].appendChild(newcss);
-			cssrules = styles.split("}");
-			newcss = document.styleSheets[0];
-			if(newcss.rules) { //IE
-				for(i=cssrules.length-2;i>=0;i--) {
-					newrule = cssrules[i].split("{");
-					newcss.addRule(newrule[0],newrule[1])
-				}
-			}
-			else if(newcss.cssRules) { //Firefox etc
-				for(i=cssrules.length-1;i>=0;i--) {
-					if(cssrules[i].indexOf("{")!=-1){
-						newcss.insertRule(cssrules[i]+"}",0);
-					}
-				}
+			if(newcss.styleSheet){ // IE
+				newcss.styleSheet.cssText = styles;
+			} else { // W3C
+				newcss.appendChild(document.createTextNode(styles));
 			}
+			document.getElementsByTagName("head")[0].appendChild(newcss);
 		}
 	};
 	
 	EditArea.prototype.set_font= function(family, size){
-		var elems= new Array("textarea", "content_highlight", "cursor_pos", "end_bracket", "selection_field", "line_number");
+		var t=this, a=this.textarea, s=this.settings, elem_font, i, elem;
+		// list all elements concerned by font changes
+		var elems= ["textarea", "content_highlight", "cursor_pos", "end_bracket", "selection_field", "selection_field_text", "line_number"];
+		
 		if(family && family!="")
-			this.settings["font_family"]= family;
+			s["font_family"]= family;
 		if(size && size>0)
-			this.settings["font_size"]=size;
-		if(this.nav['isOpera'])	// opera can't manage non monospace font
-			this.settings['font_family']="monospace";
-		var elem_font=$("area_font_size");	
-		if(elem_font){	
-			for(var i=0; i<elem_font.length; i++){
-				if(elem_font.options[i].value && elem_font.options[i].value == this.settings["font_size"])
-						elem_font.options[i].selected=true;
+			s["font_size"]	= size;
+		if( t.isOpera && t.isOpera < 9.6 )	// opera<9.6 can't manage non monospace font
+			s['font_family']="monospace";
+			
+		// update the select tag
+		if( elem_font = _$("area_font_size") )
+		{	
+			for( i = 0; i < elem_font.length; i++ )
+			{
+				if( elem_font.options[i].value && elem_font.options[i].value == s["font_size"] )
+					elem_font.options[i].selected=true;
 			}
 		}
 		
-		// calc line height
-		elem	= $("test_font_size");
-		elem.style.fontFamily= ""+this.settings["font_family"];
-		elem.style.fontSize= this.settings["font_size"]+"pt";				
-		elem.innerHTML="0";		
-		this.lineHeight= elem.offsetHeight;
-
+		/*
+		 * somethimes firefox has rendering mistake with non-monospace font for text width in textarea vs in div for changing font size (eg: verdana change between 11pt to 12pt)
+		 * => looks like a browser internal random bug as text width can change while content_highlight is updated
+		 * we'll check if the font-size produce the same text width inside textarea and div and if not, we'll increment the font-size
+		 * 
+		 * This is an ugly fix 
+		 */ 
+		if( t.isFirefox )
+		{
+			var nbTry = 3;
+			do {
+				var div1 = document.createElement( 'div' ), text1 = document.createElement( 'textarea' );
+				var styles = {
+					width:		'40px',
+					overflow:	'scroll',
+					zIndex: 	50,
+					visibility:	'hidden',
+					fontFamily:	s["font_family"],
+					fontSize:	s["font_size"]+"pt",
+					lineHeight:	t.lineHeight+"px",
+					padding:	'0',
+					margin:		'0',
+					border:		'none',
+					whiteSpace:	'nowrap'
+				};
+				var diff, changed = false;
+				for( i in styles )
+				{
+					div1.style[ i ]		= styles[i];
+					text1.style[ i ]	= styles[i];
+				}
+				// no wrap for this text
+				text1.wrap = 'off';
+				text1.setAttribute('wrap', 'off');
+				t.container.appendChild( div1 );
+				t.container.appendChild( text1 );
+				// try to make FF to bug
+				div1.innerHTML 		= text1.value	= 'azertyuiopqsdfghjklm';
+				div1.innerHTML 		= text1.value	= text1.value+'wxcvbn^p*ù$!:;,,';
+				diff	=  text1.scrollWidth - div1.scrollWidth;
+				
+				// firefox return here a diff of 1 px between equals scrollWidth (can't explain)
+				if( Math.abs( diff ) >= 2 )
+				{
+					s["font_size"]++;
+					changed	= true;
+				}
+				t.container.removeChild( div1 );
+				t.container.removeChild( text1 );
+				nbTry--;
+			}while( changed && nbTry > 0 );
+		}
+		
 		
-		for(var i=0; i<elems.length; i++){
-			var elem= $(elems[i]);	
-			elem.style.fontFamily= this.settings["font_family"];
-			elem.style.fontSize= this.settings["font_size"]+"pt";
-			elem.style.lineHeight= this.lineHeight+"px";
+		// calc line height
+		elem					= t.test_font_size;
+		elem.style.fontFamily	= ""+s["font_family"];
+		elem.style.fontSize		= s["font_size"]+"pt";				
+		elem.innerHTML			= "0";		
+		t.lineHeight			= elem.offsetHeight;
 
+		// update font for all concerned elements
+		for( i=0; i<elems.length; i++)
+		{
+			elem	= _$(elems[i]);	
+			elem.style.fontFamily	= s["font_family"];
+			elem.style.fontSize		= s["font_size"]+"pt";
+			elem.style.lineHeight	= t.lineHeight+"px";
 		}
-		if(this.nav['isOpera']){	// opera doesn't update font change to the textarea
-			var start=this.textarea.selectionStart;
-			var end= this.textarea.selectionEnd;
-			var parNod = this.textarea.parentNode, nxtSib = this.textarea.nextSibling;
-			parNod.removeChild(this.textarea); parNod.insertBefore(this.textarea, nxtSib);
-			this.area_select(start, end-start);
-		}
+		// define a css for <pre> tags
+		t.add_style("pre{font-family:"+s["font_family"]+"}");
 		
-		this.add_style("pre{font-family:"+this.settings["font_family"]+"}");
-		
-		//alert(	getAttribute($("edit_area_test_font_size"), "style"));
+		// old opera and IE>=8 doesn't update font changes to the textarea
+		if( ( t.isOpera && t.isOpera < 9.6 ) || t.isIE >= 8 )
+		{
+			var parNod = a.parentNode, nxtSib = a.nextSibling, start= a.selectionStart, end= a.selectionEnd;
+			parNod.removeChild(a);
+			parNod.insertBefore(a, nxtSib);
+			t.area_select(start, end-start);
+		}
 		
-
-		//alert("font "+this.textarea.style.font);
 		// force update of selection field
-		this.last_line_selected=-1;
-		//if(this.state=="loaded"){
-		this.last_selection= new Array();
-		this.resync_highlight();
-		//}
-	/*	this.last_selection["indexOfCursor"]=-1;
-		this.last_selection["curr_pos"]=-1;
-		this.last_selection["line_start"]=-1;
-		this.focus();*/
-		//this.check_line_selection(false);
-		//alert("line_h"+ this.lineHeight + " this.id: "+this.id+ "(size: "+size+")");
+		this.focus();
+		this.update_size();
+		this.check_line_selection();
 	};
 	
 	EditArea.prototype.change_font_size= function(){
-		var size=$("area_font_size").value;
+		var size=_$("area_font_size").value;
 		if(size>0)
 			this.set_font("", size);			
 	};
@@ -119,13 +160,13 @@
 	
 	EditArea.prototype.open_inline_popup= function(popup_id){
 		this.close_all_inline_popup();
-		var popup= $(popup_id);		
-		var editor= $("editor");
+		var popup= _$(popup_id);		
+		var editor= _$("editor");
 		
 		// search matching icon
 		for(var i=0; i<this.inlinePopup.length; i++){
 			if(this.inlinePopup[i]["popup_id"]==popup_id){
-				var icon= $(this.inlinePopup[i]["icon_id"]);
+				var icon= _$(this.inlinePopup[i]["icon_id"]);
 				if(icon){
 					this.switchClassSticky(icon, 'editAreaButtonSelected', true);			
 					break;
@@ -157,11 +198,11 @@
 	};
 
 	EditArea.prototype.close_inline_popup= function(popup_id){
-		var popup= $(popup_id);		
+		var popup= _$(popup_id);		
 		// search matching icon
 		for(var i=0; i<this.inlinePopup.length; i++){
 			if(this.inlinePopup[i]["popup_id"]==popup_id){
-				var icon= $(this.inlinePopup[i]["icon_id"]);
+				var icon= _$(this.inlinePopup[i]["icon_id"]);
 				if(icon){
 					this.switchClassSticky(icon, 'editAreaButtonNormal', false);			
 					break;
@@ -191,7 +232,7 @@
 	};
 	
 	EditArea.prototype.get_all_toolbar_height= function(){
-		var area= $("editor");
+		var area= _$("editor");
 		var results= parent.getChildren(area, "div", "class", "area_toolbar", "all", "0");	// search only direct children
 		//results= results.concat(getChildren(area, "table", "class", "area_toolbar", "all", "0"));
 		var height=0;
@@ -205,7 +246,7 @@
 	EditArea.prototype.go_to_line= function(line){	
 		if(!line)
 		{	
-			var icon= $("go_to_line");
+			var icon= _$("go_to_line");
 			if(icon != null){
 				this.restoreClass(icon);
 				this.switchClassSticky(icon, 'editAreaButtonSelected', true);
@@ -242,7 +283,7 @@
 			else
 				this.smooth_selection=false;
 		}
-		var icon= $("change_smooth_selection");
+		var icon= _$("change_smooth_selection");
 		this.textarea.focus();
 		if(this.smooth_selection===true){
 			//setAttribute(icon, "class", getAttribute(icon, "class").replace(/ selected/g, "") );
@@ -254,33 +295,37 @@
 			
 			this.smooth_selection=false;
 			this.selection_field.style.display= "none";
-			$("cursor_pos").style.display= "none";
-			$("end_bracket").style.display= "none";
+			_$("cursor_pos").style.display= "none";
+			_$("end_bracket").style.display= "none";
 		}else{
 			//setAttribute(icon, "class", getAttribute(icon, "class") + " selected");
 			//this.switchClass(icon,'editAreaButtonSelected');
 			this.switchClassSticky(icon, 'editAreaButtonSelected', false);
 			this.smooth_selection=true;
 			this.selection_field.style.display= "block";
-			$("cursor_pos").style.display= "block";
-			$("end_bracket").style.display= "block";
+			_$("cursor_pos").style.display= "block";
+			_$("end_bracket").style.display= "block";
 		}	
 	};
 	
 	// the auto scroll of the textarea has some lacks when it have to show cursor in the visible area when the textarea size change
 	// show specifiy whereas it is the "top" or "bottom" of the selection that is showned
 	EditArea.prototype.scroll_to_view= function(show){
+		var zone, lineElem;
 		if(!this.smooth_selection)
 			return;
-		var zone= $("result");
+		zone= _$("result");
 		
-		//var cursor_pos_top= parseInt($("cursor_pos").style.top.replace("px",""));
-		var cursor_pos_top= $("cursor_pos").cursor_top;
+		// manage height scroll
+		var cursor_pos_top= _$("cursor_pos").cursor_top;
 		if(show=="bottom")
-			cursor_pos_top+= (this.last_selection["line_nb"]-1)* this.lineHeight;
+		{
+			//cursor_pos_top+=  (this.last_selection["line_nb"]-1)* this.lineHeight;
+			cursor_pos_top+= this.getLinePosTop( this.last_selection['line_start'] + this.last_selection['line_nb'] - 1 );
+		}
 			
 		var max_height_visible= zone.clientHeight + zone.scrollTop;
-		var miss_top= cursor_pos_top + this.lineHeight - max_height_visible;
+		var miss_top	= cursor_pos_top + this.lineHeight - max_height_visible;
 		if(miss_top>0){
 			//alert(miss_top);
 			zone.scrollTop=  zone.scrollTop + miss_top;
@@ -289,8 +334,10 @@
 			//alert("else: "+cursor_pos_top);
 			zone.scrollTop= cursor_pos_top;	 
 		}
-		//var cursor_pos_left= parseInt($("cursor_pos").style.left.replace("px",""));
-		var cursor_pos_left= $("cursor_pos").cursor_left;
+		
+		// manage left scroll
+		//var cursor_pos_left= parseInt(_$("cursor_pos").style.left.replace("px",""));
+		var cursor_pos_left= _$("cursor_pos").cursor_left;
 		var max_width_visible= zone.clientWidth + zone.scrollLeft;
 		var miss_left= cursor_pos_left + 10 - max_width_visible;
 		if(miss_left>0){			
@@ -309,7 +356,7 @@
 		if(this.textareaFocused && editAreas[this.id]["displayed"]==true){
 			var text=this.textarea.value;
 			if(this.previous.length<=1)
-				this.switchClassSticky($("undo"), 'editAreaButtonDisabled', true);
+				this.switchClassSticky(_$("undo"), 'editAreaButtonDisabled', true);
 		
 			if(!this.previous[this.previous.length-1] || this.previous[this.previous.length-1]["text"] != text){
 				this.previous.push({"text": text, "selStart": this.textarea.selectionStart, "selEnd": this.textarea.selectionEnd});
@@ -318,7 +365,7 @@
 				
 			}
 			if(this.previous.length >= 2)
-				this.switchClassSticky($("undo"), 'editAreaButtonNormal', false);		
+				this.switchClassSticky(_$("undo"), 'editAreaButtonNormal', false);		
 		}
 
 		if(!only_once)
@@ -327,18 +374,18 @@
 	
 	EditArea.prototype.undo= function(){
 		//alert("undo"+this.previous.length);
-		if(this.previous.length > 0){
-			if(this.nav['isIE'])
-				this.getIESelection();
+		if(this.previous.length > 0)
+		{
+			this.getIESelection();
 		//	var pos_cursor=this.textarea.selectionStart;
-			this.next.push({"text": this.textarea.value, "selStart": this.textarea.selectionStart, "selEnd": this.textarea.selectionEnd});
+			this.next.push( { "text": this.textarea.value, "selStart": this.textarea.selectionStart, "selEnd": this.textarea.selectionEnd } );
 			var prev= this.previous.pop();
-			if(prev["text"]==this.textarea.value && this.previous.length > 0)
-				prev=this.previous.pop();						
-			this.textarea.value= prev["text"];
-			this.last_undo= prev["text"];
+			if( prev["text"] == this.textarea.value && this.previous.length > 0 )
+				prev	=this.previous.pop();						
+			this.textarea.value	= prev["text"];
+			this.last_undo		= prev["text"];
 			this.area_select(prev["selStart"], prev["selEnd"]-prev["selStart"]);
-			this.switchClassSticky($("redo"), 'editAreaButtonNormal', false);
+			this.switchClassSticky(_$("redo"), 'editAreaButtonNormal', false);
 			this.resync_highlight(true);
 			//alert("undo"+this.previous.length);
 			this.check_file_changes();
@@ -346,31 +393,31 @@
 	};
 	
 	EditArea.prototype.redo= function(){
-		if(this.next.length > 0){
-			/*if(this.nav['isIE'])
-				this.getIESelection();*/
+		if(this.next.length > 0)
+		{
+			/*this.getIESelection();*/
 			//var pos_cursor=this.textarea.selectionStart;
 			var next= this.next.pop();
 			this.previous.push(next);
 			this.textarea.value= next["text"];
 			this.last_undo= next["text"];
 			this.area_select(next["selStart"], next["selEnd"]-next["selStart"]);
-			this.switchClassSticky($("undo"), 'editAreaButtonNormal', false);
+			this.switchClassSticky(_$("undo"), 'editAreaButtonNormal', false);
 			this.resync_highlight(true);
 			this.check_file_changes();
 		}
 		if(	this.next.length == 0)
-			this.switchClassSticky($("redo"), 'editAreaButtonDisabled', true);
+			this.switchClassSticky(_$("redo"), 'editAreaButtonDisabled', true);
 	};
 	
 	EditArea.prototype.check_redo= function(){
 		if(editArea.next.length == 0 || editArea.textarea.value!=editArea.last_undo){
-			editArea.next= new Array();	// undo the ability to use "redo" button
-			editArea.switchClassSticky($("redo"), 'editAreaButtonDisabled', true);
+			editArea.next= [];	// undo the ability to use "redo" button
+			editArea.switchClassSticky(_$("redo"), 'editAreaButtonDisabled', true);
 		}
 		else
 		{
-			this.switchClassSticky($("redo"), 'editAreaButtonNormal', false);
+			this.switchClassSticky(_$("redo"), 'editAreaButtonNormal', false);
 		}
 	};
 	
@@ -424,20 +471,27 @@
 	
 	//make the "page up" and "page down" buttons works correctly
 	EditArea.prototype.scroll_page= function(params){
-		var dir= params["dir"];
-		var shift_pressed= params["shift"];
-		screen_height=$("result").clientHeight;
+		var dir= params["dir"], shift_pressed= params["shift"];
 		var lines= this.textarea.value.split("\n");		
-		var new_pos=0;
-		var length=0;
-		var char_left=0;
-		var line_nb=0;
+		var new_pos=0, length=0, char_left=0, line_nb=0, curLine=0;
+		var toScrollAmount	= _$("result").clientHeight -30;
+		var nbLineToScroll	= 0, diff= 0;
+		
 		if(dir=="up"){
-			//val= Math.max(0, $("result").scrollTop - screen_height);
-			//$("result").scrollTop= val;
-			var scroll_line= Math.ceil((screen_height -30)/this.lineHeight);
+			nbLineToScroll	= Math.ceil( toScrollAmount / this.lineHeight );
+			
+			// fix number of line to scroll
+			for( i = this.last_selection["line_start"]; i - diff > this.last_selection["line_start"] - nbLineToScroll ; i-- )
+			{
+				if( elem = _$('line_'+ i) )
+				{
+					diff +=  Math.floor( ( elem.offsetHeight - 1 ) / this.lineHeight );
+				}
+			}
+			nbLineToScroll	-= diff;
+			
 			if(this.last_selection["selec_direction"]=="up"){
-				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]-scroll_line, lines.length); line_nb++){
+				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]-nbLineToScroll, lines.length); line_nb++){
 					new_pos+= lines[line_nb].length + 1;
 				}
 				char_left=Math.min(lines[Math.min(lines.length-1, line_nb)].length, this.last_selection["curr_pos"]-1);
@@ -447,7 +501,7 @@
 				view="top";
 			}else{			
 				view="bottom";
-				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]+this.last_selection["line_nb"]-1-scroll_line, lines.length); line_nb++){
+				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]+this.last_selection["line_nb"]-1-nbLineToScroll, lines.length); line_nb++){
 					new_pos+= lines[line_nb].length + 1;
 				}
 				char_left=Math.min(lines[Math.min(lines.length-1, line_nb)].length, this.last_selection["curr_pos"]-1);
@@ -462,13 +516,23 @@
 				this.area_select(start, length);
 				
 			}
-		}else{
-			//val= Math.max($("result").style.height.replace("px", ""), $("result").scrollTop + screen_height);
-			//$("result").scrollTop= val;
-			var scroll_line= Math.floor((screen_height-30)/this.lineHeight);				
+		}
+		else
+		{
+			var nbLineToScroll= Math.floor( toScrollAmount / this.lineHeight );
+			// fix number of line to scroll
+			for( i = this.last_selection["line_start"]; i + diff < this.last_selection["line_start"] + nbLineToScroll ; i++ )
+			{
+				if( elem = _$('line_'+ i) )
+				{
+					diff +=  Math.floor( ( elem.offsetHeight - 1 ) / this.lineHeight );
+				}
+			}
+			nbLineToScroll	-= diff;
+				
 			if(this.last_selection["selec_direction"]=="down"){
 				view="bottom";
-				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]+this.last_selection["line_nb"]-2+scroll_line, lines.length); line_nb++){
+				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]+this.last_selection["line_nb"]-2+nbLineToScroll, lines.length); line_nb++){
 					if(line_nb==this.last_selection["line_start"]-1)
 						char_left= this.last_selection["selectionStart"] -new_pos;
 					new_pos+= lines[line_nb].length + 1;
@@ -485,7 +549,7 @@
 				
 			}else{
 				view="top";
-				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]+scroll_line-1, lines.length, lines.length); line_nb++){
+				for(line_nb=0; line_nb< Math.min(this.last_selection["line_start"]+nbLineToScroll-1, lines.length, lines.length); line_nb++){
 					if(line_nb==this.last_selection["line_start"]-1)
 						char_left= this.last_selection["selectionStart"] -new_pos;
 					new_pos+= lines[line_nb].length + 1;									
@@ -502,137 +566,133 @@
 				}
 				
 			}
-		}		
-		
+		}
+		//console.log( new_pos, char_left, length, nbLineToScroll, toScrollAmount, _$("result").clientHeigh );
 		this.check_line_selection();
 		this.scroll_to_view(view);
 	};
 	
-	EditArea.prototype.start_resize= function(e){		
-		parent.editAreaLoader.resize["id"]= editArea.id;		
-		parent.editAreaLoader.resize["start_x"]= (e)? e.pageX : event.x + document.body.scrollLeft;		
-		parent.editAreaLoader.resize["start_y"]= (e)? e.pageY : event.y + document.body.scrollTop;
-		if(editArea.nav['isIE']){
+	EditArea.prototype.start_resize= function(e){
+		parent.editAreaLoader.resize["id"]		= editArea.id;		
+		parent.editAreaLoader.resize["start_x"]	= (e)? e.pageX : event.x + document.body.scrollLeft;		
+		parent.editAreaLoader.resize["start_y"]	= (e)? e.pageY : event.y + document.body.scrollTop;
+		if(editArea.isIE)
+		{
 			editArea.textarea.focus();
 			editArea.getIESelection();
 		}
-		parent.editAreaLoader.resize["selectionStart"]= editArea.textarea.selectionStart;
-		parent.editAreaLoader.resize["selectionEnd"]= editArea.textarea.selectionEnd;
-		/*parent.editAreaLoader.resize["frame_top"]= parent.calculeOffsetTop(parent.editAreas[editArea.id]["textarea"]);
-		/*parent.editAreaLoader.resize["frame_left"]= parent.calculeOffsetLeft(parent.frames[editArea.id]);*/
+		parent.editAreaLoader.resize["selectionStart"]	= editArea.textarea.selectionStart;
+		parent.editAreaLoader.resize["selectionEnd"]	= editArea.textarea.selectionEnd;
 		parent.editAreaLoader.start_resize_area();
 	};
 	
 	EditArea.prototype.toggle_full_screen= function(to){
+		var t=this, p=parent, a=t.textarea, html, frame, selStart, selEnd, old, icon;
 		if(typeof(to)=="undefined")
-			to= !this.fullscreen['isFull'];
-		var old= this.fullscreen['isFull'];
-		this.fullscreen['isFull']= to;
-		var icon= $("fullscreen");
+			to= !t.fullscreen['isFull'];
+		old			= t.fullscreen['isFull'];
+		t.fullscreen['isFull']= to;
+		icon		= _$("fullscreen");
+		selStart	= t.textarea.selectionStart;
+		selEnd		= t.textarea.selectionEnd;
+		html		= p.document.getElementsByTagName("html")[0];
+		frame		= p.document.getElementById("frame_"+t.id);
+		
 		if(to && to!=old)
 		{	// toogle on fullscreen		
-			var selStart= this.textarea.selectionStart;
-			var selEnd= this.textarea.selectionEnd;
-			var html= parent.document.getElementsByTagName("html")[0];
-			var frame= parent.document.getElementById("frame_"+this.id);
-
-			this.fullscreen['old_overflow']= parent.get_css_property(html, "overflow");
-			this.fullscreen['old_height']= parent.get_css_property(html, "height");
-			this.fullscreen['old_width']= parent.get_css_property(html, "width");
-			this.fullscreen['old_scrollTop']= html.scrollTop;
-			this.fullscreen['old_scrollLeft']= html.scrollLeft;
-			this.fullscreen['old_zIndex']= parent.get_css_property(frame, "z-index");
-			if(this.nav['isOpera']){
-				html.style.height= "100%";
-				html.style.width= "100%";	
-			}
-			html.style.overflow= "hidden";
-			html.scrollTop=0;
-			html.scrollLeft=0;
-			
-		
-			//html.style.backgroundColor= "#FF0000"; 
-//	alert(screen.height+"\n"+window.innerHeight+"\n"+html.clientHeight+"\n"+window.offsetHeight+"\n"+document.body.offsetHeight);
 			
+			t.fullscreen['old_overflow']	= p.get_css_property(html, "overflow");
+			t.fullscreen['old_height']		= p.get_css_property(html, "height");
+			t.fullscreen['old_width']		= p.get_css_property(html, "width");
+			t.fullscreen['old_scrollTop']	= html.scrollTop;
+			t.fullscreen['old_scrollLeft']	= html.scrollLeft;
+			t.fullscreen['old_zIndex']		= p.get_css_property(frame, "z-index");
+			if(t.isOpera){
+				html.style.height	= "100%";
+				html.style.width	= "100%";	
+			}
+			html.style.overflow	= "hidden";
+			html.scrollTop		= 0;
+			html.scrollLeft		= 0;
 			
-			frame.style.position="absolute";
-			frame.style.width= html.clientWidth+"px";
-			frame.style.height= html.clientHeight+"px";
-			frame.style.display="block";
-			frame.style.zIndex="999999";
-			frame.style.top="0px";
-			frame.style.left="0px";
+			frame.style.position	= "absolute";
+			frame.style.width		= html.clientWidth+"px";
+			frame.style.height		= html.clientHeight+"px";
+			frame.style.display		= "block";
+			frame.style.zIndex		= "999999";
+			frame.style.top			= "0px";
+			frame.style.left		= "0px";
 			
 			// if the iframe was in a div with position absolute, the top and left are the one of the div, 
 			// so I fix it by seeing at witch position the iframe start and correcting it
-			frame.style.top= "-"+parent.calculeOffsetTop(frame)+"px";
-			frame.style.left= "-"+parent.calculeOffsetLeft(frame)+"px";
+			frame.style.top			= "-"+p.calculeOffsetTop(frame)+"px";
+			frame.style.left		= "-"+p.calculeOffsetLeft(frame)+"px";
 			
-		//	parent.editAreaLoader.execCommand(this.id, "update_size();");
+		//	parent.editAreaLoader.execCommand(t.id, "update_size();");
 		//	var body=parent.document.getElementsByTagName("body")[0];
 		//	body.appendChild(frame);
 			
-			this.switchClassSticky(icon, 'editAreaButtonSelected', false);
-			this.fullscreen['allow_resize']= this.resize_allowed;
-			this.allow_resize(false);
+			t.switchClassSticky(icon, 'editAreaButtonSelected', false);
+			t.fullscreen['allow_resize']= t.resize_allowed;
+			t.allow_resize(false);
 	
-			//this.area_select(selStart, selEnd-selStart);
+			//t.area_select(selStart, selEnd-selStart);
 			
 		
 			// opera can't manage to do a direct size update
-			if(this.nav['isFirefox']){
-				parent.editAreaLoader.execCommand(this.id, "update_size();");
-				this.area_select(selStart, selEnd-selStart);
-				this.scroll_to_view();
-				this.focus();
+			if(t.isFirefox){
+				p.editAreaLoader.execCommand(t.id, "update_size();");
+				t.area_select(selStart, selEnd-selStart);
+				t.scroll_to_view();
+				t.focus();
 			}else{
-				setTimeout("parent.editAreaLoader.execCommand('"+ this.id +"', 'update_size();');editArea.focus();", 10);
+			  p.editAreaLoader.execCommand(t.id, "update_size();");
+			  setTimeout("editArea.focus();", 10);
+				//setTimeout("p.editAreaLoader.execCommand('"+ t.id +"', 'update_size();');editArea.focus();", 10);
 			}	
 			
 	
 		}
 		else if(to!=old)
 		{	// toogle off fullscreen
-			var selStart= this.textarea.selectionStart;
-			var selEnd= this.textarea.selectionEnd;
-			
-			var frame= parent.document.getElementById("frame_"+this.id);	
 			frame.style.position="static";
-			frame.style.zIndex= this.fullscreen['old_zIndex'];
-		
-			var html= parent.document.getElementsByTagName("html")[0];
-		//	html.style.overflow= this.fullscreen['old_overflow'];
+			frame.style.zIndex= t.fullscreen['old_zIndex'];
 		
-			if(this.nav['isOpera']){
-				html.style.height= "auto"; 
-				html.style.width= "auto";
-				html.style.overflow= "auto";
-			}else if(this.nav['isIE'] && parent!=top){	// IE doesn't manage html overflow in frames like in normal page... 
-				html.style.overflow= "auto";
+			if(t.isOpera)
+			{
+				html.style.height	= "auto"; 
+				html.style.width	= "auto";
+				html.style.overflow	= "auto";
+			}
+			else if(t.isIE && p!=top)
+			{	// IE doesn't manage html overflow in frames like in normal page... 
+				html.style.overflow	= "auto";
 			}
 			else
-				html.style.overflow= this.fullscreen['old_overflow'];
-			html.scrollTop= this.fullscreen['old_scrollTop'];
-			html.scrollTop= this.fullscreen['old_scrollLeft'];
+			{
+				html.style.overflow	= t.fullscreen['old_overflow'];
+			}
+			html.scrollTop	= t.fullscreen['old_scrollTop'];
+			html.scrollLeft	= t.fullscreen['old_scrollLeft'];
 		
-			parent.editAreaLoader.hide(this.id);
-			parent.editAreaLoader.show(this.id);
+			p.editAreaLoader.hide(t.id);
+			p.editAreaLoader.show(t.id);
 			
-			this.switchClassSticky(icon, 'editAreaButtonNormal', false);
-			if(this.fullscreen['allow_resize'])
-				this.allow_resize(this.fullscreen['allow_resize']);
-			if(this.nav['isFirefox']){
-				this.area_select(selStart, selEnd-selStart);
+			t.switchClassSticky(icon, 'editAreaButtonNormal', false);
+			if(t.fullscreen['allow_resize'])
+				t.allow_resize(t.fullscreen['allow_resize']);
+			if(t.isFirefox){
+				t.area_select(selStart, selEnd-selStart);
 				setTimeout("editArea.scroll_to_view();", 10);
 			}			
 			
-			//parent.editAreaLoader.remove_event(parent.window, "resize", editArea.update_size);
+			//p.editAreaLoader.remove_event(p.window, "resize", editArea.update_size);
 		}
 		
 	};
 	
 	EditArea.prototype.allow_resize= function(allow){
-		var resize= $("resize_area");
+		var resize= _$("resize_area");
 		if(allow){
 			
 			resize.style.visibility="visible";
@@ -681,7 +741,7 @@
 					this.allready_used_syntax[new_syntax]=true;
 				}
 				// be sure that the select option is correctly updated
-				var sel= $("syntax_selection");
+				var sel= _$("syntax_selection");
 				if(sel && sel.value!=new_syntax)
 				{
 					for(var i=0; i<sel.length; i++){
@@ -692,8 +752,8 @@
 				
 			/*	if(this.settings['syntax'].length==0)
 				{
-					this.switchClassSticky($("highlight"), 'editAreaButtonNormal', false);
-					this.switchClassSticky($("reset_highlight"), 'editAreaButtonNormal', false);
+					this.switchClassSticky(_$("highlight"), 'editAreaButtonNormal', false);
+					this.switchClassSticky(_$("reset_highlight"), 'editAreaButtonNormal', false);
 					this.change_highlight(true);
 				}
 				*/
@@ -727,36 +787,63 @@
 	};
 	
 	/***** Wrap mode *****/
+	
+	// toggling function for set_wrap_mode
+	EditArea.prototype.toggle_word_wrap= function(){
+		this.set_word_wrap( !this.settings['word_wrap'] );
+	};
+	
+	
 	// open a new tab for the given file
-	EditArea.prototype.set_wrap_text= function(to){
-		this.settings['wrap_text']	= to;
-		if( this.settings['wrap_text'] )
+	EditArea.prototype.set_word_wrap= function(to){
+		var t=this, a= t.textarea;
+		
+		if( t.isOpera )
+		{
+			this.settings['word_wrap']= false;
+			t.switchClassSticky( _$("word_wrap"), 'editAreaButtonDisabled', true );
+			return false;
+		}
+		
+		if( to )
 		{
 			wrap_mode = 'soft';
-			this.container.className+= ' wrap_text';
+			this.container.className+= ' word_wrap';
+			this.container.style.width="";
+			this.content_highlight.style.width="";
+			a.style.width="100%";
+			if( t.isIE && t.isIE < 7 )	// IE 6 count 50 px too much
+			{
+				a.style.width	= ( a.offsetWidth-5 )+"px";
+			}
+			
+			t.switchClassSticky( _$("word_wrap"), 'editAreaButtonSelected', false );
 		}
 		else
 		{
 			wrap_mode = 'off';
-			this.container.className= this.container.className.replace(/ wrap_text/g, '');
+			this.container.className	= this.container.className.replace(/word_wrap/g, '');
+			t.switchClassSticky( _$("word_wrap"), 'editAreaButtonNormal', true );
 		}
+		this.textarea.previous_scrollWidth = '';
+		this.textarea.previous_scrollHeight = '';
 		
-		
-		var t= this.textarea;
-		t.wrap= wrap_mode;
-		t.setAttribute('wrap', wrap_mode);
-		// seul IE supporte de changer à la volée le wrap mode du textarea
-		if(!this.nav['isIE']){
-			var start=t.selectionStart, end= t.selectionEnd;
-			var parNod = t.parentNode, nxtSib = t.nextSibling;
-			parNod.removeChild(t); parNod.insertBefore(t, nxtSib);
+		a.wrap= wrap_mode;
+		a.setAttribute('wrap', wrap_mode);
+		// only IE can change wrap mode on the fly without element reloading
+		if(!this.isIE)
+		{
+			var start=a.selectionStart, end= a.selectionEnd;
+			var parNod = a.parentNode, nxtSib = a.nextSibling;
+			parNod.removeChild(a);
+			parNod.insertBefore(a, nxtSib);
 			this.area_select(start, end-start);
-	/*	//	v = s.value;
-			n = s.cloneNode(true);
-			n.setAttribute("wrap", val);
-			s.parentNode.replaceChild(n, s);
-		//	n.value = v;*/
 		}
+		// reset some optimisation
+		this.settings['word_wrap']	= to;
+		this.focus();
+		this.update_size();
+		this.check_line_selection();
 	};	
 	/***** tabbed files managing functions *****/
 	
@@ -767,27 +854,28 @@
 		{
 			var id= settings['id'];
 			// create a new file object with defautl values
-			var new_file= new Object();
-			new_file['id']= id;
-			new_file['title']= id;
-			new_file['text']= "";
-			new_file['last_selection']= "";		
-			new_file['last_text_to_highlight']= "";
-			new_file['last_hightlighted_text']= "";
-			new_file['previous']= new Array();
-			new_file['next']= new Array();
-			new_file['last_undo']= "";
-			new_file['smooth_selection']= this.settings['smooth_selection'];
+			var new_file= {};
+			new_file['id']			= id;
+			new_file['title']		= id;
+			new_file['text']		= "";
+			new_file['last_selection']	= "";		
+			new_file['last_text_to_highlight']	= "";
+			new_file['last_hightlighted_text']	= "";
+			new_file['previous']	= [];
+			new_file['next']		= [];
+			new_file['last_undo']	= "";
+			new_file['smooth_selection']	= this.settings['smooth_selection'];
 			new_file['do_highlight']= this.settings['start_highlight'];
-			new_file['syntax']= this.settings['syntax'];
-			new_file['scroll_top']= 0;
-			new_file['scroll_left']= 0;
+			new_file['syntax']		= this.settings['syntax'];
+			new_file['scroll_top']	= 0;
+			new_file['scroll_left']	= 0;
 			new_file['selection_start']= 0;
 			new_file['selection_end']= 0;
-			new_file['edited']= false;
-			new_file['font_size']= this.settings["font_size"];
-			new_file['font_family']= this.settings["font_family"];
-			new_file['toolbar']= {'links':{}, 'selects': {}};
+			new_file['edited']		= false;
+			new_file['font_size']	= this.settings["font_size"];
+			new_file['font_family']	= this.settings["font_family"];
+			new_file['word_wrap']	= this.settings["word_wrap"];
+			new_file['toolbar']		= {'links':{}, 'selects': {}};
 			new_file['compare_edited_text']= new_file['text'];
 			
 			
@@ -800,7 +888,7 @@
 			this.filesIdAssoc[html_id]= id;
 			this.files[id]['html_id']= html_id;
 		
-			if(!$(this.files[id]['html_id']) && id!="")
+			if(!_$(this.files[id]['html_id']) && id!="")
 			{
 				// be sure the tab browsing area is displayed
 				this.tab_browsing_area.style.display= "block";
@@ -808,7 +896,7 @@
 				elem.id= this.files[id]['html_id'];
 				var close= "<img src=\""+ parent.editAreaLoader.baseURL +"images/close.gif\" title=\""+ this.get_translation('close_tab', 'word') +"\" onclick=\"editArea.execCommand('close_file', editArea.filesIdAssoc['"+ html_id +"']);return false;\" class=\"hidden\" onmouseover=\"this.className=''\" onmouseout=\"this.className='hidden'\" />";
 				elem.innerHTML= "<a onclick=\"javascript:editArea.execCommand('switch_to_file', editArea.filesIdAssoc['"+ html_id +"']);\" selec=\"none\"><b><span><strong class=\"edited\">*</strong>"+ this.files[id]['title'] + close +"</span></b></a>";
-				$('tab_browsing_list').appendChild(elem);
+				_$('tab_browsing_list').appendChild(elem);
 				var elem= document.createElement('text');
 				this.update_size();
 			}
@@ -834,7 +922,7 @@
 			if(this.execCommand('file_close', this.files[id])!==false)
 			{
 				// remove the tab in the toolbar
-				var li= $(this.files[id]['html_id']);
+				var li= _$(this.files[id]['html_id']);
 				li.parentNode.removeChild(li);
 				// select a new file
 				if(id== this.curr_file)
@@ -843,15 +931,15 @@
 					var is_next= false;
 					for(var i in this.files)
 					{
-						if(is_next)
+						if( is_next )
 						{
-							next_file= i;
+							next_file	= i;
 							break;
 						}
-						else if(i==id)
-							is_next= true;
+						else if( i == id )
+							is_next		= true;
 						else
-							next_file= i;
+							next_file	= i;
 					}
 					// display the next file
 					this.switch_to_file(next_file);
@@ -865,57 +953,61 @@
 	
 	// backup current file datas
 	EditArea.prototype.save_file= function(id){
-		if(this.files[id])
+		var t= this, save, a_links, a_selects, save_butt, img, i;
+		if(t.files[id])
 		{
-			var save= this.files[id];
-			save['last_selection']= this.last_selection;		
-			save['last_text_to_highlight']= this.last_text_to_highlight;
-			save['last_hightlighted_text']= this.last_hightlighted_text;
-			save['previous']= this.previous;
-			save['next']= this.next;
-			save['last_undo']= this.last_undo;
-			save['smooth_selection']= this.smooth_selection;
-			save['do_highlight']= this.do_highlight;
-			save['syntax']= this.settings['syntax'];
-			save['text']= this.textarea.value;
-			save['scroll_top']= this.result.scrollTop;
-			save['scroll_left']= this.result.scrollLeft;
-			save['selection_start']= this.last_selection["selectionStart"];
-			save['selection_end']= this.last_selection["selectionEnd"];
-			save['font_size']= this.settings["font_size"];
-			save['font_family']= this.settings["font_family"];
-			save['toolbar']= {'links':{}, 'selects': {}};
+			var save= t.files[id];
+			save['last_selection']			= t.last_selection;		
+			save['last_text_to_highlight']	= t.last_text_to_highlight;
+			save['last_hightlighted_text']	= t.last_hightlighted_text;
+			save['previous']				= t.previous;
+			save['next']					= t.next;
+			save['last_undo']				= t.last_undo;
+			save['smooth_selection']		= t.smooth_selection;
+			save['do_highlight']			= t.do_highlight;
+			save['syntax']					= t.settings['syntax'];
+			save['text']					= t.textarea.value;
+			save['scroll_top']				= t.result.scrollTop;
+			save['scroll_left']				= t.result.scrollLeft;
+			save['selection_start']			= t.last_selection["selectionStart"];
+			save['selection_end']			= t.last_selection["selectionEnd"];
+			save['font_size']				= t.settings["font_size"];
+			save['font_family']				= t.settings["font_family"];
+			save['word_wrap']				= t.settings["word_wrap"];
+			save['toolbar']					= {'links':{}, 'selects': {}};
+			
 			// save toolbar buttons state for fileSpecific buttons
-			var links= $("toolbar_1").getElementsByTagName("a");
-			for(var i=0; i<links.length; i++)
+			a_links= _$("toolbar_1").getElementsByTagName("a");
+			for( i=0; i<a_links.length; i++ )
 			{
-				if(links[i].getAttribute('fileSpecific')=='yes')
+				if( a_links[i].getAttribute('fileSpecific') == 'yes' )
 				{
-					var save_butt= new Object();
-					var img= links[i].getElementsByTagName('img')[0];
-					save_butt['classLock']= img.classLock;
-					save_butt['className']= img.className;
-					save_butt['oldClassName']= img.oldClassName;
+					save_butt	= {};
+					img			= a_links[i].getElementsByTagName('img')[0];
+					save_butt['classLock']		= img.classLock;
+					save_butt['className']		= img.className;
+					save_butt['oldClassName']	= img.oldClassName;
 					
-					save['toolbar']['links'][links[i].id]= save_butt;
+					save['toolbar']['links'][a_links[i].id]= save_butt;
 				}
 			}
+			
 			// save toolbar select state for fileSpecific buttons
-			var selects= $("toolbar_1").getElementsByTagName("select");
-			for(var i=0; i<selects.length; i++)
+			a_selects= _$("toolbar_1").getElementsByTagName("select");
+			for( i=0; i<a_selects.length; i++)
 			{
-				if(selects[i].getAttribute('fileSpecific')=='yes')
+				if(a_selects[i].getAttribute('fileSpecific')=='yes')
 				{
-					save['toolbar']['selects'][selects[i].id]= selects[i].value;
+					save['toolbar']['selects'][a_selects[i].id]= a_selects[i].value;
 				}
 			}
 				
-			this.files[id]= save;
+			t.files[id]= save;
 			
 			return save;
 		}
-		else
-			return false;
+		
+		return false;
 	};
 	
 	// update file_datas
@@ -928,88 +1020,103 @@
 	
 	// display file datas
 	EditArea.prototype.display_file= function(id){
-		// check if there is at least one tab file displayed
+		var t = this, a= t.textarea, new_file, a_lis, a_selects, a_links, a_options, i, j;
+		
+		// we're showing the empty file
 		if(id=='')
 		{
-			this.textarea.readOnly= true;
-			this.tab_browsing_area.style.display= "none";
-			$("no_file_selected").style.display= "block";
-			this.result.className= "empty";
-			if(!this.files[''])
-				this.open_file({id: ''});
+			a.readOnly= true;
+			t.tab_browsing_area.style.display= "none";
+			_$("no_file_selected").style.display= "block";
+			t.result.className= "empty";
+			// clear current datas
+			if(!t.files[''])
+			{
+				t.open_file({id: ''});
+			}
+		}
+		// we try to show a non existent file, so we left
+		else if( typeof( t.files[id] ) == 'undefined' )
+		{
+			return false;
 		}
+		// display a normal file
 		else
 		{
-			this.result.className= "";
-			this.textarea.readOnly= !this.is_editable;
-			$("no_file_selected").style.display= "none";
-			this.tab_browsing_area.style.display= "block";
+			t.result.className= "";
+			a.readOnly= !t.is_editable;
+			_$("no_file_selected").style.display= "none";
+			t.tab_browsing_area.style.display= "block";
 		}
 		
-		this.check_redo(true);
-		this.check_undo(true);
-		this.curr_file= id;
+		// ensure to have last state for undo/redo actions
+		t.check_redo(true);
+		t.check_undo(true);
+		t.curr_file= id;
 		
 		// replace selected tab file
-		var lis= this.tab_browsing_area.getElementsByTagName('li');
-		for(var i=0; i<lis.length; i++)
+		a_lis= t.tab_browsing_area.getElementsByTagName('li');
+		for( i=0; i<a_lis.length; i++)
 		{
-			if(lis[i].id == this.files[id]['html_id'])
-				lis[i].className='selected';
+			if(a_lis[i].id == t.files[id]['html_id'])
+				a_lis[i].className='selected';
 			else
-				lis[i].className='';
+				a_lis[i].className='';
 		}
 		
 		// replace next files datas
-		var new_file= this.files[id];
+		new_file= t.files[id];
 	
 		// restore text content
-		this.textarea.value= new_file['text'];
+		a.value= new_file['text'];
 		
 		// restore font-size
-		this.set_font(new_file['font_family'], new_file['font_size']);
+		t.set_font(new_file['font_family'], new_file['font_size']);
 		
 		// restore selection and scroll
-		this.area_select(new_file['last_selection']['selection_start'], new_file['last_selection']['selection_end'] - new_file['last_selection']['selection_start']);
-		this.manage_size(true);
-		this.result.scrollTop= new_file['scroll_top'];
-		this.result.scrollLeft= new_file['scroll_left'];
+		t.area_select(new_file['last_selection']['selection_start'], new_file['last_selection']['selection_end'] - new_file['last_selection']['selection_start']);
+		t.manage_size(true);
+		t.result.scrollTop= new_file['scroll_top'];
+		t.result.scrollLeft= new_file['scroll_left'];
 		
 		// restore undo, redo
-		this.previous=	new_file['previous'];
-		this.next=	new_file['next'];
-		this.last_undo=	new_file['last_undo'];
-		this.check_redo(true);
-		this.check_undo(true);
+		t.previous=	new_file['previous'];
+		t.next=	new_file['next'];
+		t.last_undo=	new_file['last_undo'];
+		t.check_redo(true);
+		t.check_undo(true);
 		
 		// restore highlight
-		this.execCommand("change_highlight", new_file['do_highlight']);
-		this.execCommand("change_syntax", new_file['syntax']);
+		t.execCommand("change_highlight", new_file['do_highlight']);
+		t.execCommand("change_syntax", new_file['syntax']);
 		
 		// smooth mode
-		this.execCommand("change_smooth_selection_mode", new_file['smooth_selection']);
+		t.execCommand("change_smooth_selection_mode", new_file['smooth_selection']);
+		
+		// word_wrap
+		t.execCommand("set_word_wrap", new_file['word_wrap']);
 			
 		// restore links state in toolbar
-		var links= new_file['toolbar']['links'];
-		for(var i in links)
+		a_links= new_file['toolbar']['links'];
+		for( i in a_links)
 		{
-			if(img= $(i).getElementsByTagName('img')[0])
+			if( img =  _$(i).getElementsByTagName('img')[0] )
 			{
-				var save_butt= new Object();
-				img.classLock= links[i]['classLock'];
-				img.className= links[i]['className'];
-				img.oldClassName= links[i]['oldClassName'];
+				img.classLock	= a_links[i]['classLock'];
+				img.className	= a_links[i]['className'];
+				img.oldClassName= a_links[i]['oldClassName'];
 			}
 		}
+		
 		// restore select state in toolbar
-		var selects= new_file['toolbar']['selects'];
-		for(var i in selects)
+		a_selects = new_file['toolbar']['selects'];
+		for( i in a_selects)
 		{
-			var options= $(i).options;
-			for(var j=0; j<options.length; j++)
+			a_options	= _$(i).options;
+			for( j=0; j<a_options.length; j++)
 			{
-				if(options[j].value == selects[i])
-					$(i).options[j].selected=true;
+				if( a_options[j].value == a_selects[i] )
+					_$(i).options[j].selected=true;
 			}
 		}
 	
@@ -1067,9 +1174,9 @@
 	// set if the file is edited or not
 	EditArea.prototype.set_file_edited_mode= function(id, to){
 		// change CSS for edited tab
-		if(this.files[id] && $(this.files[id]['html_id']))
+		if(this.files[id] && _$(this.files[id]['html_id']))
 		{
-			var link= $(this.files[id]['html_id']).getElementsByTagName('a')[0];
+			var link= _$(this.files[id]['html_id']).getElementsByTagName('a')[0];
 			if(to==true)
 			{
 				link.className= 'edited';