r1721 - branches/bxe_2_0/js

Author: chregu
Date: Mon Aug 13 11:36:31 2007
New Revision: 1721

Log:
show modalbox during save

BXEB-25


Modified:
   branches/bxe_2_0/js/bxeFunctions.js
   branches/bxe_2_0/js/widget.js

Modified: branches/bxe_2_0/js/bxeFunctions.js
==============================================================================
--- branches/bxe_2_0/js/bxeFunctions.js	(original)
+++ branches/bxe_2_0/js/bxeFunctions.js	Mon Aug 13 11:36:31 2007
@@ -61,7 +61,10 @@
 		 eval(bxe_config.options['onSaveBefore'] +"(xml,'onSaveBefore')");
 	}
 	bxe_status_bar.showMessage(bxe_i18n.getText("Document saving..."));
-		
+	var widg = mozilla.getWidgetModalBox(bxe_i18n.getText("Saving"));
+	widg.addText(bxe_i18n.getText("Document saving..."));
+	widg.show((window.innerWidth- 500)/2,50, "fixed");
+	
 	var xmlstr =xml.saveXML(xml);
 	
 	function callback (e) {
@@ -76,6 +79,7 @@
 		}
 		bxe_lastSavedXML = bxe_getXmlDocument();
 		bxe_status_bar.showMessage(bxe_i18n.getText("Document successfully saved"));
+		widg.submitAndClose();
 		bxe_history_reset();
 		if	(e.status == 201 && bxe_config.options['onSaveFileCreated']) {
 			eval(bxe_config.options['onSaveFileCreated']);

Modified: branches/bxe_2_0/js/widget.js
==============================================================================
--- branches/bxe_2_0/js/widget.js	(original)
+++ branches/bxe_2_0/js/widget.js	Mon Aug 13 11:36:31 2007
@@ -1168,8 +1168,12 @@
 	tr.appendChild(td);
 }
 Widget_ModalBox.prototype.submitAndClose = function (e) {
-	var Widget = e.currentTarget.Widget;
-	e.preventDefault();
+	if (e) {
+		var Widget = e.currentTarget.Widget;
+		e.preventDefault();
+	} else {
+		var Widget = this;
+	}
 	
 	var __submit = document.getElementById("__submit");
 	if (__submit) {
@@ -1177,29 +1181,32 @@
 	}
 	Widget.hide();
 	bxe_registerKeyHandlers();
-	var elem = e.currentTarget.elements;
-	var returnValues = new Array();
-	for (var i =0; i < elem.length; i++ in elem) {
-		if (elem[i].name.substr(0,2) != "__") {
-			returnValues[elem[i].name.replace(/ +\*/,"")] = elem[i].value;
+	if (e) {
+		var elem = e.currentTarget.elements;
+		var returnValues = new Array();
+		for (var i =0; i < elem.length; i++ in elem) {
+			if (elem[i].name.substr(0,2) != "__") {
+				returnValues[elem[i].name.replace(/ +\*/,"")] = elem[i].value;
+			}
+		}
+		var sel = window.getSelection();
+		try {
+			sel.collapse(Widget.selAnchorNode,Widget.selAnchorOffset);
+			sel.extend(Widget.selFocusNode,Widget.selFocusOffset);
+		} catch (f) {
+			sel.selectEditableRange(Widget.cssr);
 		}
-	}
-	var sel = window.getSelection();
-	try {
-		sel.collapse(Widget.selAnchorNode,Widget.selAnchorOffset);
-		sel.extend(Widget.selFocusNode,Widget.selFocusOffset);
-	} catch (e) {
-		 sel.selectEditableRange(Widget.cssr);
-	}
 		
-	
-	
-	//sel.selectEditableRange(Widget.cssr);
-	if (Widget.callback) {
-		Widget.callback(returnValues);
+		
+		
+		//sel.selectEditableRange(Widget.cssr);
+		if (Widget.callback) {
+			Widget.callback(returnValues);
+		}
+		e.preventDefault();
+		e.stopPropagation();
 	}
-	e.preventDefault();
-	e.stopPropagation();
+	
 	if (typeof BxeTextClipboard_keyhandler == 'function') {
 		document.removeEventListener("keypress", BxeTextClipboard_keyhandler, true);
 	}
-- 
Bx-editor-cvs mailing list
[email protected]
http://lists.bitflux.ch/cgi-bin/listinfo/bx-editor-cvs