tags[i].parentNode.insertBefore(children[j],tags[i]);
}
}
- while (tags.length > 0) {
+ for (var i = 0;tags.length > i;i++) {
tags[0].parentNode.removeChild(tags[0]);
}
}
// len1 = unlocked.innerHTML.length;
// len2 = len0 - len1;
var len2 = parsedtxt.length;
- var metasenv = xml.getElementsByTagName("meta");
+ metasenv = xml.getElementsByTagName("meta");
statements = listcons(len2,statements);
unlocked.scrollIntoView(true);
return len;
disambcell.appendChild(okbutton);
disambcell.appendChild(cancelbutton);
- disable_toparea();
-
matita.disambMode = true;
updateSide();
throw "Stop";
}
else if (is_defined(disamberr)) {
- set_cps(disamberr.childNodes);
- matita.unlockedbackup = unlocked.innerHTML.html_to_matita();
- matita.disambMode = true;
- disable_toparea();
- next_cp(0);
+ // must be fixed in a daemon: it makes sense to return a
+ // disambiguation error with no choices
+ if (disamberr.childNodes.length > 0) {
+ set_cps(disamberr.childNodes);
+ matita.unlockedbackup = unlocked.innerHTML.html_to_matita();
+ matita.disambMode = true;
+ next_cp(0);
+ }
throw "Stop";
}
else {
var href = choices[j].getAttribute("href");
var title = choices[j].getAttribute("title");
var desc;
- if (is_defined(title)) {
+ if (is_defined(title) && title != null) {
desc = title;
- } else if (is_defined(href)) {
+ } else if (is_defined(href) && href != null) {
desc = href;
} else {
- desc = "Preliminary error";
+ desc = null;
}
res[j] = document.createElement("input");
res[j].setAttribute("choiceno",j);
res[j].setAttribute("href",href);
res[j].setAttribute("title",title);
- res[j].setAttribute("desc",desc);
+ if (desc != null) res[j].setAttribute("desc",desc);
if (j == 0) res[j].setAttribute("checked","");
}
var mid = unlockedtxt.substring(start,stop).matita_to_html();
var post = unlockedtxt.substring(stop).matita_to_html();
unlocked.innerHTML = pre +
- "<span class=\"error\" title=\"disambiguation failed\">" +
+ "<span class=\"error\" title=\"error location\">" +
mid + "</span>" + post;
- var title = "<H3>Disambiguation failed</H3>";
+ var title = "<H3>Error diagnostics</H3>";
disambcell.innerHTML = title;
var choices = get_choice_opts(curcp);
for (var i = 0;i < choices.length;i++) {
disambcell.appendChild(choices[i]);
- disambcell.appendChild(document.createTextNode(choices[i].getAttribute("desc")));
+ var desc = choices[i].getAttribute("desc");
+ if (!is_defined(desc) || desc == null) {
+ desc = "Interpretation " + i;
+ }
+ disambcell.appendChild(document.createTextNode(desc));
disambcell.appendChild(document.createElement("br"));
}
var choiceno = parseInt(choice.getAttribute("choiceno"));
var choicedesc = choice.getAttribute("desc");
- var title = "<H3>Disambiguation failed</H3>";
- var subtitle = "<p>Errors at node " + cpno + " = " + choicedesc + "</p>";
+ var title = "<H3>Error diagnostics</H3>";
+ var subtitle;
+ if (is_defined(choicedesc) && choicedesc != null) {
+ subtitle = "<p>Errors at node " + cpno + " = " + choicedesc + "</p>";
+ } else {
+ subtitle = "<p>Global errors:</p>";
+ }
disambcell.innerHTML = title + subtitle;
var failures = get_failure_opts(cpno,choiceno);
var localized = xml.getElementsByTagName("localized")[0];
var ambiguity = xml.getElementsByTagName("ambiguity")[0];
var generic_err = xml.getElementsByTagName("error")[0];
+ var disamberr = xml.getElementsByTagName("disamberror")[0];
for (var i = 0;i < parsed.length; i++) {
var len = parsed[i].getAttribute("length");
// len0 = unlocked.innerHTML.length;
disambcell.appendChild(okbutton);
disambcell.appendChild(cancelbutton);
- disable_toparea();
-
matita.disambMode = true;
updateSide();
}
- if (is_defined(localized)) {
- unlocked.innerHTML = localized.wholeText;
+ else if (is_defined(disamberr)) {
+ // must be fixed in a daemon: it makes sense to return a
+ // disambiguation error with no choices
+ if (disamberr.childNodes.length > 0) {
+ set_cps(disamberr.childNodes);
+ matita.unlockedbackup = unlocked.innerHTML.html_to_matita();
+ matita.disambMode = true;
+ next_cp(0);
+ }
+ throw "Stop";
+ }
+ else if (is_defined(localized)) {
+ unlocked.innerHTML = localized.childNodes[0].wholeText;
}
- if (is_defined(generic_err)) {
- debug("Unmanaged error:\n" ^ generic_err.wholeText);
+ else if (is_defined(generic_err)) {
+ debug("Unmanaged error:\n" ^ generic_err.childNodes[0].wholeText);
}
} else {
debug("goto bottom failed");
}
resume();
};
- debug("retract 1");
pause();
callServer("retract",processor);
- debug("retract 2");
}
function openFile()
{
if (is_defined(xml)) {
changeFile(thefile);
+ matita.disambMode = false;
+ matita.proofMode = false;
+ updateSide();
lockedbackup = ""
locked.innerHTML = lockedbackup;
// code originally used in google chrome (problems with mozilla)
debug("file open failed");
}
};
- abortDialog();
+ abortDialog("dialogBox");
callServer("open",processor,"file=" + escape(thefile));
}
function uploadOK()
{
var file = document.getElementById("uploadFilename").files[0];
- if (file) {
- var filecontent = file.getAsText("UTF-8");
- locked.innerHTML = lockedbackup;
- unlocked.innerHTML = filecontent;
- uploadBox.style.display = "none";
- }
// if (file) {
-// var reader = new FileReader();
-// reader.readAsText(file, "UTF-8");
-// reader.onloadend = function (evt) {
-// lockedbackup = "";
-// locked.innerHTML = lockedbackup
-// unlocked.innerHTML = evt.target.result;
-// uploadBox.style.display = "none";
-// }
-// reader.onerror = function (evt) {
-// debug("file open failed");
-// uploadBox.style.display = "none";
-// }
+// var filecontent = file.getAsText("UTF-8");
+// locked.innerHTML = lockedbackup;
+// unlocked.innerHTML = filecontent;
+// uploadBox.style.display = "none";
// }
+ if (file) {
+ var reader = new FileReader();
+ reader.onerror = function (evt) {
+ debug("file open failed");
+ }
+ reader.onload = function (evt) {
+ lockedbackup = "";
+ locked.innerHTML = lockedbackup;
+ unlocked.innerHTML = "";
+ unlocked.appendChild(document.createTextNode(evt.target.result));
+ uploadBox.style.display = "none";
+ }
+ try { reader.readAsText(file, "UTF-8"); }
+ catch (err) { /* nothing to do */ };
+ uploadBox.style.display = "none";
+ }
}
function openDialog()
function saveDialog()
{
callback = function (fname) {
- abortDialog();
+ abortDialog("dialogBox");
saveFile(fname,
(locked.innerHTML.html_to_matita()).sescape(),
(unlocked.innerHTML.html_to_matita()).sescape(),
function newDialog()
{
callback = function (fname) {
- abortDialog();
+ abortDialog("dialogBox");
saveFile(fname,"","",false,newDialog,true);
};
showLibrary("Create new file", callback, newDialog);
}
function createDir() {
- abortDialog();
+ abortDialog("dialogBox");
dirname = prompt("New directory name:\ncic:/matita/","newdir");
if (dirname != null) {
processor = function(xml) {
alert("Commit executed: see details in the log.\n\n" +
"NOTICE: this message does NOT imply (yet) that the commit was successful.");
} else {
- alert("Commit failed!");
+ alert("Commit failed!\n(maybe you don't have permissionis to commit?)");
}
resume();
};
"Details:\n" +
xml.getElementsByTagName("details")[0].textContent);
} else {
- alert("Update failed!");
+ alert("Update failed!\n(maybe you don't have permissions to update?)");
}
resume();
};
}
function abortDialog(dialog) {
+ document.getElementById(dialog).style.display = "none";
$('#mask').hide();
- dialogBox.style.display = "none";
}
function removeElement(id) {
function cancel_disambiguate() {
matita.disambMode = false;
- enable_toparea();
- enable_editing();
+ resume();
+ // enable_toparea();
+ // enable_editing();
+ strip_tags("span","error");
updateSide();
}
// retractButton.disabled = false;
// cursorButton.disabled = false;
// bottomButton.disabled = false;
- enable_toparea();
- enable_editing();
+ if (!matita.disambMode) {
+ enable_toparea();
+ enable_editing();
+ }
}
projects / helm.git / blobdiff