r1606 - branches/bxe_2_0/js
[email protected] Sun, 5 Nov 2006 19:13:58 +0100 (CET)
| Newsgroups | gmane.editors.bitflux.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: chregu
Date: Sun Nov 5 19:13:56 2006
New Revision: 1606
Modified:
branches/bxe_2_0/js/bxeFunctions.js
Log:
WS only :)
Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js (original)
+++ branches/bxe_2_0/js/bxeFunctions.js Sun Nov 5 19:13:56 2006
@@ -201,8 +201,7 @@
bxe_Transform();
}
}
- /*bxe_snapshots[bxe_snapshots_position] == xmlstr;
- bxe_snapshots_position++;*/
+
}
function bxe_getXmlDomDocument(clean) {
@@ -392,9 +391,7 @@
form.style.border = "0px";
form.style.height = editableArea.getCStyle("height");
form.style.width = editableArea.getCStyle("width");
- /*form.style.fontFamily = editableArea.getCStyle("font-family");
- form.style.fontSize = "12px";
- */
+
editableArea.removeAllChildren();
var xmlstr = document.saveChildrenXML(xmldoc,true);
@@ -450,10 +447,7 @@
editableArea.XMLNode.vdom = eaVDOM;
editableArea.removeAllChildren();
- /*
-
- innerhtmlValue.documentElement.insertIntoHTMLDocument(editableArea,true);
- */
+
editableArea.setStyle("white-space",null);
var xmlnode = editableArea.XMLNode._node;
@@ -504,21 +498,11 @@
node = node.parentNode;
}
- /*if (!bxe_checkIsAllowedChild( e.additionalInfo.namespaceURI,e.additionalInfo.localName,sel)) {
- return false;
- }*/
- /*var cb = bxe_getCallback(e.additionalInfo.localName, e.additionalInfo.namespaceURI);
- if (cb ) {
- bxe_doCallback(cb, BXE_SELECTION);
- return;
- }*/
if (sel.isCollapsed) {
var newNode = new XMLNodeElement(e.additionalInfo.namespaceURI,e.additionalInfo.localName, 1 , true) ;
sel.insertNode(newNode._node);
- /* debug("valid? : " + newNode.isNodeValid());
- */
newNode.makeDefaultNodes(false);
if (newNode._node.firstChild) {
var sel = window.getSelection();
@@ -699,12 +683,6 @@
_clipboardBxeName = _clipboardNodeName;
}
- /* else if (clip._clipboard.firstChild && clip._clipboard.firstChild.nodeType == 3) {
- _textOnly = clip._clipboard.firstChild.data;
- } else if (clip._clipboard.nodeType == 3) {
- _textOnly = clip._clipboard.data;
- } */
-
if (!_clipboardNamespaceUri) { _clipboardNamespaceUri = ""};
if (_clipboardNodeName && node.parentNode && node.parentNode.isAllowedChild(_clipboardNamespaceUri, _clipboardNodeName)) {
popup.addMenuItem(bxe_i18n.getText("Append {0} from Clipboard",new Array(_clipboardBxeName)), function (e) {
@@ -715,14 +693,7 @@
eDOMEventCall("appendNode",document,{"appendToNode":appNode, "node": clipNode})
});
- } /* else if (_textOnly) {
- popup.addMenuItem(bxe_i18n.getText("Insert Text from Clipboard"), function (e) {
- var sel = window.getSelection();
- sel.paste();
-
- });
-
- }*/
+ }
}
popup.addMenuItem(bxe_i18n.getText("Delete {0} Element",new Array(node.vdom.bxeName)), function (e) {
@@ -866,23 +837,6 @@
_par = _par.parentNode;
}
- /*if (_par && _par.localName == "tr") {
- var _parNext = _par.nextSibling;
- while (_parNext && _parNext.nodeType != 1) {
- _parNext = _parNext.nextSibling;
- }
-
- if (_parNext && _parNext.localName == "tr" ) {
-
- var menui = popup.addMenuItem("Merge down", function(e) {
- var widget = e.currentTarget.Widget;
- var _par = widget.MenuPopup.MainNode._node.parentNode;
- widget.MenuPopup.MainNode._node.TableCellMergeDown();
- bxe_Transform(true,false,widget.MenuPopup.MainNode.parentNode);
- //_par.updateXMLNode();
- });
- }
- }*/
var menui = popup.addMenuItem(bxe_i18n.getText("Merge down"), function(e) {
var widget = e.currentTarget.Widget;
var _par = widget.MenuPopup.MainNode._node.parentNode;
@@ -956,25 +910,6 @@
}
function bxe_NodeInsertedBefore(e) {
- /*try {
- var oldNode = e.target.XMLNode;
- var newNode = e.additionalInfo;
- newNode.XMLNode = bxe_XMLNodeInit(newNode);
- if (oldNode.parentNode) {
- oldNode.parentNode.insertBeforeIntern(newNode.XMLNode, oldNode);
- }
- if (newNode.firstChild ) {
- newNode.updateXMLNode();
- }
- if (oldNode.firstChild ) {
- oldNode.unlinkChildren();
- oldNode._node.updateXMLNode();
- }
- }
- catch(e) {
- bxe_catch_alert(e);
- }*/
-
}
@@ -983,14 +918,6 @@
bxe_history_snapshot();
if (e.additionalInfo.node) {
- /*var cb = bxe_getCallback(e.additionalInfo.node.localName, e.additionalInfo.node.namespaceURI);
- if (cb ) {
- if (bxe_doCallback(cb, aNode)) {
- return;
- }
- }
- */
- //var newNode = e.additionalInfo.node.init();
var newNode = e.additionalInfo.node;
if (newNode.nodeType == 11) {
while (newNode.lastChild) {
@@ -1008,12 +935,6 @@
bxe_Transform();
} else {
- /*ar cb = bxe_getCallback(e.additionalInfo.localName,e.additionalInfo.namespaceURI);
-
- if (cb ) {
- bxe_doCallback(cb, aNode);
- return;
- }*/
var newNode = bxe_config.xmldoc.createElementNS(e.additionalInfo.namespaceURI,e.additionalInfo.localName, 1 ) ;
newNode = aNode.parentNode.insertAfter(newNode,aNode._node);
@@ -1031,16 +952,6 @@
}
}
- /*
- if (newNode._node.firstChild) {
- var sel = window.getSelection();
- var startip = newNode._node.firstInsertionPoint();
- var lastip = newNode._node.lastInsertionPoint();
- sel.collapse(startip.ipNode, startip.ipOffset);
- sel.extend(lastip.ipNode, lastip.ipOffset);
-
- }*/
-
}
@@ -1325,11 +1236,6 @@
bxe_toolbar.draw();
bxe_status_bar = new Widget_StatusBar();
- /* var ea = bxe_getAll_bxeId();
- for (var i = 0; i < ea.length; i++) {
-
- ea[i].addEventListener("click",MouseClickEvent,false);
- } */
// if not content editable and ptb is enabled then hide the toolbar (watch out
// for selection within the toolbar itself though!)
@@ -1420,19 +1326,7 @@
if (node.XMLNode.nodeType != Node.ATTRIBUTE_NODE && node.XMLNode.vdom.bxeNoteditable) {
return false;
}
- /*if (node != e.target) {
- node = e.target;
- }
- var _n = node;
- while(_n.nodeType == 1) {
- if (_n == cssr.top) {
- break;
- }
- _n = _n.parentNode;
- }
- if (_n != cssr.top) {
- return false;
- }*/
+
bxe_context_menu.show(e,node);
e.stopPropagation();
e.returnValue = false;
@@ -1643,8 +1537,6 @@
alert(bxe_i18n.getText("Can't create table: invalid data"));
}
else if (window.bxe_ContextNode == BXE_SELECTION) {
- //te.setAttribute("class", bxe_config.options[OPTION_DEFAULTTABLECLASS]);
-
var sel = window.getSelection();
if (!bxe_checkIsAllowedChild("","table",sel, true)) {
@@ -1658,10 +1550,6 @@
bxe_table_createTableFinish(te, values["rows"], values["cols"]);
bxe_Transform();
- /*} else if (window.bxe_ContextNode){
- var newNode = te.init();
- window.bxe_ContextNode.parentNode.insertAfter(newNode, window.bxe_ContextNode);
- debug("valid? : " + newNode.isNodeValid());*/
} else if (replaceNode) {
replaceNode._node.parentNode.replaceChild(te, replaceNode._node);
@@ -1953,17 +1841,6 @@
if (this.metaTagNSResolver[prefix]) {
return this.metaTagNSResolver[prefix];
}
- /* there are no namespaces in even xhtml documents (or mozilla discards them somehow or i made a stupid mistake
- therefore no NS-lookup in document. */
- /*
- if (! this.htmlDocNSResolver) {
- this.htmlDocNSResolver = document.createNSResolver(document.documentElement);
- }
- url = this.htmlDocNSResolver.lookupNamespaceURI(prefix);
- if (url) {
- return url;
- }
- */
//create NSResolver, if not done yet
if (! this.xmlDocNSResolver) {
@@ -2288,10 +2165,6 @@
bxe_config.xmldoc.documentElement.init();
dump ("getDomDocument " + (new Date() - startTimer)/1000 + " sec\n");
- /*var processor = new XSLTProcessor();
- dump ("New Processor " + (new Date() - startTimer)/1000 + " sec\n");
- processor.importStylesheet(bxe_config.xsldoc);
- dump ("New importStylesheet " + (new Date() - startTimer)/1000 + " sec\n");*/
try {
var xmldoc = bxe_config.processor.transformToFragment(xml,document);
} catch (e) {
@@ -2365,13 +2238,6 @@
}
}
- /*die();
- */
- /*var ip = documentCreateInsertionPoint(_node.parentNode, _node, position);
- ip.forwardOne();*/
- //dump(bxe_getHTMLNodeByBxeId(xpath).firstChild.nodeValue + "\n");
- //sel.extend(bxe_getHTMLNodeByBxeId(xpath),2);
-
}
else if (!_topNode) {
--
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs