From 83fa6fc1317f18af956b194b996afae10ec859a7 Mon Sep 17 00:00:00 2001
From: Wilmer Ricciotti <ricciott@cs.unibo.it>
Date: Thu, 8 Sep 2011 15:07:01 +0000
Subject: [PATCH] Matitaweb: New File functionality.

---
 matitaB/matita/index.html   |  3 ++-
 matitaB/matita/matitaweb.js | 38 +++++++++++++++++++++++++++----------
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/matitaB/matita/index.html b/matitaB/matita/index.html
index e16fe6d15..cdb283477 100644
--- a/matitaB/matita/index.html
+++ b/matitaB/matita/index.html
@@ -27,9 +27,10 @@
                                                title="Execute the script until the current position of the cursor."></A>
 	   <A href="javascript:gotoBottom()"><IMG src="icons/bottom.png" 
 						  id="bottom" alt="Bottom" title="Execute the whole script."></A>
+	   <INPUT type="BUTTON" value="New" id="showdialog" ONCLICK="newDialog()">
 	   <INPUT type="BUTTON" value="Browse library" id="showdialog" ONCLICK="openDialog()">
 	   <INPUT type="BUTTON" value="Save" id="savebutton" ONCLICK="saveFile()">
-	   <INPUT type="BUTTON" value="Save as" id="savebutton" ONCLICK="saveDialog()">
+	   <INPUT type="BUTTON" value="Save as" id="saveasbutton" ONCLICK="saveDialog()">
 	   <INPUT type="BUTTON" value="Commit" id="commitbutton" ONCLICK="commitAll()"></p>
 <!--	   <INPUT type="BUTTON" value="show sequent" id="showseq" ONCLICK="showSequent()">
 	   <INPUT type="BUTTON" value="hide sequent" id="hideseq" ONCLICK="hideSequent()">
diff --git a/matitaB/matita/matitaweb.js b/matitaB/matita/matitaweb.js
index 48acfe13e..fc90080d2 100644
--- a/matitaB/matita/matitaweb.js
+++ b/matitaB/matita/matitaweb.js
@@ -695,27 +695,45 @@ function saveDialog()
 {  
 	callback = function (fname) { 
 	  dialogBox.style.display = "none";
-  	  current_fname = fname;
-          saveFile(fname,false); 
+          saveFile(fname,
+		   (locked.innerHTML.html_to_matita()).sescape(),
+		   (unlocked.innerHTML.html_to_matita()).sescape(),
+	 	   false,saveDialog); 
         };
 	showLibrary("Save file as", callback);
 }
 
-function saveFile(fname,force)
+function newDialog()
+{
+	callback = function (fname) { 
+	  dialogBox.style.display = "none";
+	  saveFile(fname,"","",false,newDialog); 
+	};
+	showLibrary("Create new file", callback);
+}
+
+
+function saveFile(fname,lockedtxt,unlockedtxt,force,reloadDialog)
 {
         if (!is_defined(fname)) {
             fname = current_fname;
+	    lockedtxt = (locked.innerHTML.html_to_matita()).sescape();
+	    unlockedtxt = (unlocked.innerHTML.html_to_matita()).sescape();
+	    force = true;
+	    // when force is true, reloadDialog is not needed 
         }
 	processor = function(xml) {
 		if (is_defined(xml)) {
 		  if (xml.childNodes[0].textContent != "ok") {
-                    if (confirm("File already exists. Do you want to proceed anyway?")) {
-                       saveFile(fname,true);
+                    if (confirm("File already exists. All existing data will be lost.\nDo you want to proceed anyway?")) {
+                       saveFile(fname,lockedtxt,unlockedtxt,true);
 		    } else {
-                      saveDialog();
+                      reloadDialog();
 		    }
-		  } else
-			debug("file saved!");
+		  } else {
+  	            current_fname = fname;
+	            debug("file saved!");
+		  }
 		} else {
 			debug("save file failed");
 		}
@@ -724,8 +742,8 @@ function saveFile(fname,force)
 	if (is_defined(fname)) {
           pause();
           callServer("save",processor,"file=" + escape(fname) + 
-			            "&locked=" + (locked.innerHTML.html_to_matita()).sescape() +
-			            "&unlocked=" + (unlocked.innerHTML.html_to_matita()).sescape() +
+			            "&locked=" + lockedtxt +
+			            "&unlocked=" + unlockedtxt +
 				    "&force=" + force);
 	}
 	else { debug("no file selected"); }
-- 
2.39.2