r1708 - branches/bxe_2_0/mozile

[email protected] Sun, 12 Aug 2007 16:37:48 +0200 (CEST)
Newsgroups gmane.editors.bitflux.cvs
Message-ID <[email protected]>
Author: chregu
Date: Sun Aug 12 16:37:47 2007
New Revision: 1708

Log:
WS only


Modified:
   branches/bxe_2_0/mozile/mozilekb.js

Modified: branches/bxe_2_0/mozile/mozilekb.js
==============================================================================
--- branches/bxe_2_0/mozile/mozilekb.js	(original)
+++ branches/bxe_2_0/mozile/mozilekb.js	Sun Aug 12 16:37:47 2007
@@ -588,89 +588,89 @@
 
 function bxe_deleteEventKey(sel, backspace, noTransform,makeDefault) {
 	if (sel.isCollapsed) {
-			sel.deleteSelection(backspace);
-			return true;
+		sel.deleteSelection(backspace);
+		return true;
 	}
 	
 	//switch focus and anchor, if focus is before anchor
 	
 	sel.fixFocus();
-		if (sel.anchorOffset >= sel.anchorNode.nodeValue.strip().length) {
-			var _pos = sel.focusOffset;
-			sel.collapse(sel.focusNode,0);
-			sel.extend(sel.focusNode,_pos);
-			
-		}
-		if (sel.anchorNode.nodeType == 3 && sel.anchorOffset == 0) {
-			// if only one textnode and fully selected
+	if (sel.anchorOffset >= sel.anchorNode.nodeValue.strip().length) {
+		var _pos = sel.focusOffset;
+		sel.collapse(sel.focusNode,0);
+		sel.extend(sel.focusNode,_pos);
 		
-			if (sel.anchorNode == sel.focusNode) {
-		
-				if (sel.focusOffset >= sel.anchorNode.nodeValue.strip().length) {
+	}
+	if (sel.anchorNode.nodeType == 3 && sel.anchorOffset == 0) {
+		// if only one textnode and fully selected
 		
-					var xmlnode = bxe_getXMLNodeByHTMLNodeRecursive(sel.anchorNode);
-					//xmlnode.parentNode.appendChild(xmlnode.ownerDocument.createTextNode(" "));
-					var _par = bxe_getXMLNodeByHTMLNodeRecursive(sel.anchorNode.parentNode);
-					if (_par) {
-						if (_par.nodeType == 2) {
-							if (_par.XMLNode.vdom && _par.XMLNode.vdom.bxeDefaultcontent) {
-								_par.nodeValue = _par.XMLNode.vdom.bxeDefaultcontent;
-							} else {
-								_par.nodeValue = "#";
-								
-							}
-							//sel.anchorNode.nodeValue = _par.nodeValue;
-							//_par.XMLNode.makeDefaultNodes();
+		if (sel.anchorNode == sel.focusNode) {
+			
+			if (sel.focusOffset >= sel.anchorNode.nodeValue.strip().length) {
+				
+				var xmlnode = bxe_getXMLNodeByHTMLNodeRecursive(sel.anchorNode);
+				//xmlnode.parentNode.appendChild(xmlnode.ownerDocument.createTextNode(" "));
+				var _par = bxe_getXMLNodeByHTMLNodeRecursive(sel.anchorNode.parentNode);
+				if (_par) {
+					if (_par.nodeType == 2) {
+						if (_par.XMLNode.vdom && _par.XMLNode.vdom.bxeDefaultcontent) {
+							_par.nodeValue = _par.XMLNode.vdom.bxeDefaultcontent;
 						} else {
-							if (_par.childNodes.length == 1) {
-								_par.removeChild(_par.firstChild);
-								bxe_checkEmpty(_par.XMLNode,makeDefault);
-							} else {
-								_par.replaceChild(_par.ownerDocument.createTextNode(" "),xmlnode);
-							}
+							_par.nodeValue = "#";
+							
 						}
-						
-						
+						//sel.anchorNode.nodeValue = _par.nodeValue;
+						//_par.XMLNode.makeDefaultNodes();
 					} else {
-						bxe_deleteWholeSelection(sel,backspace);
-						sel = window.getSelection();
-						sel.deleteSelection(false);
+						if (_par.childNodes.length == 1) {
+							_par.removeChild(_par.firstChild);
+							bxe_checkEmpty(_par.XMLNode,makeDefault);
+						} else {
+							_par.replaceChild(_par.ownerDocument.createTextNode(" "),xmlnode);
+						}
 					}
-				} else {
-					bxe_history_snapshot();
-					sel.deleteSelection(backspace);
 					
-				}
-			} else  {
-				var xmlnode = bxe_getXMLNodeByHTMLNode(sel.anchorNode);
-				var _par = xmlnode.parentNode;
-				
-				sel = window.getSelection();
-				bxe_deleteWholeSelection(sel,backspace);
-				sel.deleteSelection(false,true);
-				try {
-					if (_par.childNodes.length == 1 && _par.firstChild.nodeValue.strip().length == 0) {
-						_par.removeChild(_par.firstChild);
-						bxe_checkEmpty(_par.XMLNode,makeDefault);
-					}
-				} catch(e) {
-					//console.log(e);
 					
+				} else {
+					bxe_deleteWholeSelection(sel,backspace);
+					sel = window.getSelection();
+					sel.deleteSelection(false);
 				}
+			} else {
+				bxe_history_snapshot();
+				sel.deleteSelection(backspace);
 				
 			}
-			bxe_Transform();
-			  
-		} else {
-			bxe_history_snapshot();
-			sel.deleteSelection(backspace);
+		} else  {
+			var xmlnode = bxe_getXMLNodeByHTMLNode(sel.anchorNode);
+			var _par = xmlnode.parentNode;
 			
-			if (!noTransform) {
-				//	bxe_Transform();
+			sel = window.getSelection();
+			bxe_deleteWholeSelection(sel,backspace);
+			sel.deleteSelection(false,true);
+			try {
+				if (_par.childNodes.length == 1 && _par.firstChild.nodeValue.strip().length == 0) {
+					_par.removeChild(_par.firstChild);
+					bxe_checkEmpty(_par.XMLNode,makeDefault);
+				}
+			} catch(e) {
+				//console.log(e);
+				
 			}
 			
 		}
-		return true;
+		bxe_Transform();
+		
+	} else {
+		bxe_history_snapshot();
+		sel.deleteSelection(backspace);
+		
+		if (!noTransform) {
+			//	bxe_Transform();
+		}
+		
+	}
+	return true;
 }
 
 function bxe_goToNextNode(cssr,shift) {
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs