unageanu-jiji 1.1.4 → 1.2.1

data/html/js/edit_area/autocompletion.js

@@ -74,8 +74,8 @@ var EditArea_autocompletion= {
 		editArea.container.insertBefore( this.container, editArea.container.firstChild );
 		
 		// add event detection for hiding suggestion box
-		editArea.add_event( document, "click", function(){ editArea.plugins['autocompletion']._hide();} );
-		editArea.add_event( editArea.textarea, "blur", function(){ editArea.plugins['autocompletion']._hide();} );
+		parent.editAreaLoader.add_event( document, "click", function(){ editArea.plugins['autocompletion']._hide();} );
+		parent.editAreaLoader.add_event( editArea.textarea, "blur", function(){ editArea.plugins['autocompletion']._hide();} );
 		
 	}
 	
@@ -140,7 +140,7 @@ var EditArea_autocompletion= {
 		// show current suggestion list and do autoSelect if possible (no matter it's shown or hidden)
 		if( letter=="Space" && CtrlPressed(e) )
 		{
-			parent.console.log('SHOW SUGGEST');
+			//parent.console.log('SHOW SUGGEST');
 			this.forceDisplay 			= true;
 			this.autoSelectIfOneResult	= true;
 			this._checkLetter();
@@ -251,8 +251,7 @@ var EditArea_autocompletion= {
 	{
 		cursor_forced_position	= content.indexOf( '{@}' );
 		content	= content.replace(/{@}/g, '' );
-		if(editArea.nav['isIE'])
-			editArea.getIESelection();
+		editArea.getIESelection();
 		
 		// retrive the number of matching characters
 		var start_index	= Math.max( 0, editArea.textarea.selectionEnd - content.length );
@@ -308,7 +307,7 @@ var EditArea_autocompletion= {
 						tmp["match_word"]= new RegExp("(?:"+ datas["REGEXP"]["before_word"] +")("+ datas["REGEXP"]["possible_words_letters"] +")$", tmp["modifiers"]);
 						tmp["match_next_letter"]= new RegExp("^("+ datas["REGEXP"]["letter_after_word_must_match"] +")$", tmp["modifiers"]);
 						tmp["keywords"]= {};
-						console.log( datas["KEYWORDS"] );
+						//console.log( datas["KEYWORDS"] );
 						for( var prefix in datas["KEYWORDS"] )
 						{
 							tmp["keywords"][prefix]= {
@@ -352,19 +351,18 @@ var EditArea_autocompletion= {
 				this._parseSyntaxAutoCompletionDatas();
 			this.curr_syntax= parent.editAreaLoader.syntax[editArea.settings['syntax']]['autocompletion'];
 			this.curr_syntax_str = editArea.settings['syntax'];
-			console.log( this.curr_syntax );
+			//console.log( this.curr_syntax );
 		}
 		
 		if( editArea.is_editable )
 		{
 			time=new Date;
 			t1= time.getTime();
-			if(editArea.nav['isIE'])
-				editArea.getIESelection();
+			editArea.getIESelection();
 			this.selectIndex	= -1;
 			start=editArea.textarea.selectionStart;
 			var str	= editArea.textarea.value;
-			var results= new Array();
+			var results= [];
 			
 			
 			for(var i in this.curr_syntax)
@@ -385,7 +383,7 @@ var EditArea_autocompletion= {
 					{
 						var begin_word= match_word[1];
 						var match_curr_word= new RegExp("^"+ parent.editAreaLoader.get_escaped_regexp( begin_word ), this.curr_syntax[i]["modifiers"]);
-						console.log( match_curr_word );
+						//console.log( match_curr_word );
 						for(var prefix in this.curr_syntax[i]["keywords"])
 						{
 						//	parent.console.log( this.curr_syntax[i]["keywords"][prefix] );
@@ -451,7 +449,7 @@ var EditArea_autocompletion= {
 			// there is only one result, and we can select it automatically
 			if( results.length == 1 && this.autoSelectIfOneResult )
 			{
-				console.log( results );
+			//	console.log( results );
 				this._select( results[0][1]['replace_with'] );
 			}
 			else if( results.length == 0 )
@@ -473,7 +471,7 @@ var EditArea_autocompletion= {
 				// sort results
 				this.container.innerHTML		= '<ul>'+ lines.sort().join('') +'</ul>';
 				
-				var cursor	= $("cursor_pos");
+				var cursor	= _$("cursor_pos");
 				this.container.style.top		= ( cursor.cursor_top + editArea.lineHeight ) +"px";
 				this.container.style.left		= ( cursor.cursor_left + 8 ) +"px";
 				this._show();

data/html/js/edit_area/edit_area.css

@@ -4,7 +4,7 @@ body, html{
 	height: 100%;
 	border: none;
 	overflow: hidden;
-	background-color: #FFF;
+	background-color: #D0D0D0;
 }
 
 body, html, table, form, textarea{
@@ -12,18 +12,19 @@ body, html, table, form, textarea{
 }
 
 #editor{
-	border: solid #888 1px;
-	overflow: visible;
+	/*border: solid #888 1px;*/
+	overflow: hidden;
 }
 
 #result{
 	z-index: 4; 
 	overflow-x: auto;
 	overflow-y: scroll;
-	border-top: solid #888 1px;
-	border-bottom: solid #888 1px;
+	border-top: solid #FFF 1px;
+	border-bottom: solid #FFF 1px;
 	position: relative;
 	clear: both;
+	background-color: #e8e8e8;
 }
 
 #result.empty{
@@ -36,7 +37,6 @@ body, html, table, form, textarea{
 	position: relative; 
 	z-index: 10;
 	padding: 0 5px 0 45px;
-	/*padding-right: 5px;*/ 
 }
 
 #textarea{
@@ -50,11 +50,15 @@ body, html, table, form, textarea{
 	overflow: hidden;  
 	z-index: 7; 
 	border-width: 0;
-	background-color: transparent;
+	/*background-color: transparent;*/
+	resize: none;
+	color: #333;
+	background-color:  #E8E8E8;
 }
 
 #textarea, #textarea:hover{
 	outline: none;	/* safari outline fix */
+	color: #333;
 }
 
 #content_highlight{
@@ -67,10 +71,10 @@ body, html, table, form, textarea{
 }
 
 
-#selection_field{
+#selection_field, #selection_field_text{
 	margin: 0; 
-	background-color: #E1F2F9; 
-	height: 1px;  
+	background-color: #FFF; 
+/*	height: 1px; */  
 	position: absolute;
 	z-index: 5;
 	top: -100px;
@@ -79,13 +83,35 @@ body, html, table, form, textarea{
 	overflow: hidden;
 }
 
-#selection_field.show_colors{
+#selection_field.show_colors {
 	z-index: 3;
-	background-color:#EDF9FC;
-	color:transparent;
+	background-color:#FFF;
+	
+}
+
+#selection_field strong{
+	font-weight:normal;
+}
+
+#selection_field.show_colors *, #selection_field_text * {
+	visibility: hidden;
+}
+
+#selection_field_text{
+	background-color:transparent;
 }
 
-#container.wrap_text #content_highlight, #container.wrap_text #selection_field{
+#selection_field_text strong{
+	font-weight:normal;
+	background-color:#3399FE;
+	color: #FFF;
+	visibility:visible;
+}
+
+#container.word_wrap #content_highlight,
+#container.word_wrap #selection_field,
+#container.word_wrap #selection_field_text,
+#container.word_wrap #test_font_size{
 	white-space: pre-wrap;       /* css-3 */
 	white-space: -moz-pre-wrap !important;  /* Mozilla, since 1999 */
 	white-space: -pre-wrap;      /* Opera 4-6 */
@@ -97,13 +123,13 @@ body, html, table, form, textarea{
 #line_number{
 	position: absolute;
 	overflow: hidden;
-	border-right: solid black 1px;
+	border-right: solid #999999 1px;
 	z-index:8;
 	width: 38px;
 	padding: 0 5px 0 0;
 	margin: 0 0 0 -45px;
 	text-align: right;
-	color: #AAAAAA;
+	color: #999999;
 }
 
 #test_font_size{
@@ -120,8 +146,9 @@ pre{
 }
 
 .hidden{
-	opacity: 0.2; 
-	filter:alpha(opacity=20);
+	opacity: 0.6; 
+	filter:alpha(opacity=60);
+	background-color:  #E8E8E8;
 }
 
 #result .edit_area_cursor{
@@ -129,7 +156,7 @@ pre{
 	z-index:6; 
 	background-color: #FF6633;
 	top: -100px;
-	margin: 1px 0 0 0;
+	margin: 0;
 }
 
 #result .edit_area_selection_field .overline{
@@ -140,7 +167,7 @@ pre{
 /* area popup */
 .editarea_popup{
 	border: solid 1px #888888;
-	background-color: #ECE9D8; 
+	background-color: #D0D0D0; 
 	width: 250px; 
 	padding: 4px; 
 	position: absolute;
@@ -231,14 +258,20 @@ div#area_search_replace  #area_search_msg{
 }
 
 /* area_toolbar */
+#toolbar_1 {
+  padding-left : 10px;
+  height: 22px;
+}
+#toolbar_2 {
+  height: 22px;
+}
 .area_toolbar{
 	/*font: 11px sans-serif;*/
 	width: 100%; 
-	/*height: 21px; */
 	margin: 0; 
-	padding: 0;
-	background-color: #ECE9D8;
-	text-align: center;
+	padding: 0px 0px 0px 0px;
+	background-color: #D0D0D0;
+	/*text-align: center;*/
 }
 
 .area_toolbar, .area_toolbar table{
@@ -267,12 +300,15 @@ div#area_search_replace  #area_search_msg{
 
 table.statusbar{
 	width: 100%;
+	height: 22px;
+}
+table.statusbar td{
+  padding-top: 5px;
 }
-
 .area_toolbar td.infos{
 	text-align: center;
 	width: 130px;
-	border-right: solid 1px #888;
+	border-right: solid 1px #FFF;
 	border-width: 0 1px 0 0;
 	padding: 0;
 }
@@ -307,7 +343,7 @@ table.statusbar{
 }
 
 .editAreaButtonNormal {
-	border: 1px solid #ECE9D8 !important;
+	border: 1px solid #D0D0D0 !important;
 	cursor: pointer;
 }
 
@@ -326,20 +362,20 @@ table.statusbar{
 .editAreaButtonSelected {
 	border: 1px solid #C0C0BB !important;
 	cursor: pointer;
-	background-color: #F4F2E8;
+	background-color: #D0D0D0;
 }
 
 .editAreaButtonDisabled {
 	filter:progid:DXImageTransform.Microsoft.Alpha(opacity=30);
 	-moz-opacity:0.3;
 	opacity: 0.3;
-	border: 1px solid #F0F0EE !important;
+	border: 1px solid #D0D0D0 !important;
 	cursor: pointer;
 }
 
 .editAreaSeparatorLine {
-	margin: 1px 2px;
-	background-color: #C0C0BB;
+	margin: 1px 5px;
+	background-color: #B0B0B0;
 	width: 2px;
 	height: 18px;
 }
@@ -347,7 +383,7 @@ table.statusbar{
 /* waiting screen */
 #processing{
 	display: none; 
-	background-color:#ECE9D8; 
+	background-color:#D0D0D0; 
 	border: solid #888 1px;
 	position: absolute; 
 	top: 0; 
@@ -374,10 +410,13 @@ table.statusbar{
 /**** tab browsing area ****/
 #tab_browsing_area{
 	display: none;
-	background-color: #CCC9A8;
-	border-top: 1px solid #888;
+	background-color: #C5C5C5;
+	border-top: 1px solid #FFF;
 	text-align: left;
 	margin: 0;
+	padding: 0px 0px 0px 0px;
+	background-image: url("../../img/thead.gif");
+	background-repeat: repeat-x;
 }
 
 #tab_browsing_list {
@@ -402,8 +441,8 @@ table.statusbar{
 #tab_browsing_list a span {
 	display: block; 
 	color: #000; 
-	background: #ECE9D8; 
-	border:	1px solid #888; 
+	background: #D0D0D0; 
+	border:	1px solid #FFF; 
 	border-width: 1px 1px 0; 
 	text-align: center; 
 	padding: 2px 2px 1px 4px; 
@@ -412,7 +451,7 @@ table.statusbar{
 
 #tab_browsing_list a b {
 	display: block; 
-	border-bottom: 2px solid #617994;
+	border-bottom: 1px solid #346667;
 }
 
 #tab_browsing_list a .edited {
@@ -432,12 +471,12 @@ table.statusbar{
 }
 
 #tab_browsing_list a:hover span {
-	background: #F4F2E8;
-	border-color: #0A246A;
+	background: #D0D0D0; 
+	border-color: #66CDCC;
 }
 
 #tab_browsing_list .selected a span{
-	background: #046380;
+	background: #112933;
 	color: #FFF;
 }