r1566 - branches/bxe_2_0/mozile

[email protected] Mon, 23 Oct 2006 07:37:55 +0200 (CEST)
Newsgroups gmane.editors.bitflux.cvs
Message-ID <[email protected]>
Author: chregu
Date: Mon Oct 23 07:37:53 2006
New Revision: 1566

Modified:
   branches/bxe_2_0/mozile/mozCE.js
   branches/bxe_2_0/mozile/mozilekb.js
Log:
some selection insertion fixes

Modified: branches/bxe_2_0/mozile/mozCE.js
==============================================================================
--- branches/bxe_2_0/mozile/mozCE.js	(original)
+++ branches/bxe_2_0/mozile/mozCE.js	Mon Oct 23 07:37:53 2006
@@ -218,9 +218,11 @@
 							return true;
 						}
 					} 
-				
 					if (! (par.XMLNode.vdom.bxeTabletype == "table-cell" || par.XMLNode.vdom.bxeTabletype == "table-col" )){
 						parpar.removeChild(par);
+					} else {
+						par.appendChild(document.createTextNode(" "));
+						par.removeChild(par.firstChild);
 					}
 					
 				}
@@ -822,6 +824,7 @@
 				}
 			}
 			bxe_insertContent_async(content,BXE_SELECTION,BXE_SPLIT_IF_INLINE);
+			
 		} else {
 			window.getSelection().insertNode(content);
 		}

Modified: branches/bxe_2_0/mozile/mozilekb.js
==============================================================================
--- branches/bxe_2_0/mozile/mozilekb.js	(original)
+++ branches/bxe_2_0/mozile/mozilekb.js	Mon Oct 23 07:37:53 2006
@@ -128,15 +128,8 @@
 			return false;
 		}
 		return window.getSelection().paste(true);
-		if (mozilla.__allowedNativeCalls) {
 		
-			return window.getSelection().paste();
-		} else {
-			return false;
-		}
-	}
-		else if(String.fromCharCode(event.charCode) == "T")
-	{
+	} else if(String.fromCharCode(event.charCode) == "T") {
 		bxe_Transform();
 		return true;
 	}
@@ -638,9 +631,18 @@
 			sel.deleteSelection(backspace);
 		}
 		else if (!sel.isCollapsed && sel.anchorNode.nodeType == 3 && sel.anchorOffset == 0) {
-			bxe_deleteWholeSelection(sel,backspace);
-			sel = window.getSelection();
-			sel.deleteSelection(false);
+			
+			if (sel.anchorNode == sel.focusNode && sel.focusOffset == sel.anchorNode.length) {
+				
+				var xmlnode = bxe_getXMLNodeByHTMLNode(sel.anchorNode);
+				xmlnode.parentNode.appendChild(xmlnode.ownerDocument.createTextNode(" "));
+				xmlnode.parentNode.removeChild(xmlnode);
+				bxe_Transform();
+			} else {
+				bxe_deleteWholeSelection(sel,backspace);
+				sel = window.getSelection();
+				sel.deleteSelection(false);
+			}
 			
 		} else {
 			bxe_history_snapshot();
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs