Author: kcardineaud Date: 2011-06-20 14:41:21 +0200 (Mon, 20 Jun 2011) New Revision: 127 Url: http://nuiton.org/repositories/revision/scmwebeditor/127 Log: Add save and continue option Modified: trunk/src/main/webapp/ModificationViewer.jsp trunk/src/main/webapp/Preview.js trunk/src/main/webapp/Saver.js trunk/src/main/webapp/css/main.css Modified: trunk/src/main/webapp/ModificationViewer.jsp =================================================================== --- trunk/src/main/webapp/ModificationViewer.jsp 2011-06-20 09:40:04 UTC (rev 126) +++ trunk/src/main/webapp/ModificationViewer.jsp 2011-06-20 12:41:21 UTC (rev 127) @@ -46,7 +46,7 @@ <input type="hidden" NAME=username /> <input type="hidden" NAME=pw /><% }%> - <input type="hidden" name="origText" value=<%=request.getAttribute("OrigText")%>/> + <input type="hidden" name="origText" value="<%=request.getAttribute("OrigText")%>"/> <input type="hidden" name="scmEditorUrl" value="<%=request.getAttribute("scmEditorUrl")%>"/> <input type="hidden" name="previewServletUrl" value="<%=request.getAttribute("previewServletUrl")%>"/> <input title="Save your work and continue editing this file." type="button" value="Save and Continue Editing" name="SaveandC" onclick="javascript:saver(this.form.newText, this.form.username, this.form.pw, this.form.commitMessage, this.form.origText, this.form.scmEditorUrl);"/> Modified: trunk/src/main/webapp/Preview.js =================================================================== --- trunk/src/main/webapp/Preview.js 2011-06-20 09:40:04 UTC (rev 126) +++ trunk/src/main/webapp/Preview.js 2011-06-20 12:41:21 UTC (rev 127) @@ -41,7 +41,7 @@ { var response = http.responseText; document.getElementById("prevtitle").innerHTML = "Preview : "; - document.getElementById("prev").innerHTML ="<div id=\"preview\" "+response+"</div>"; + document.getElementById("prev").innerHTML ="<div id=\"preview\" >"+response+"</div>"; } else if (http.readyState == 4 && http.status == 406) { Modified: trunk/src/main/webapp/Saver.js =================================================================== --- trunk/src/main/webapp/Saver.js 2011-06-20 09:40:04 UTC (rev 126) +++ trunk/src/main/webapp/Saver.js 2011-06-20 12:41:21 UTC (rev 127) @@ -28,10 +28,10 @@ function sendReq(method, url, text, login, pass, message, orig_text) { - http.open(method, url.value, true); + http.open(method, url, true); http.onreadystatechange = handleResp; http.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); - http.send("Mytext="+text.value+"&username="+login.value+"&pw="+pass.value+"&Commit_message="+message.value+"&Orig_text="+orig_text.value); + http.send("newText="+text.value+"&username="+login.value+"&pw="+pass.value+"&commitMessage="+message.value+"&origText="+orig_text.value); } function handleResp() @@ -46,14 +46,12 @@ function saver(my_text, login, pass, message, orig_text, scmEditorUrl) { + if (my_text.value != orig_text.value){ if (confirm("Do you really want to save?")){ - if (message.value == ""){ - alert("You must enter a Commit message!!!", ""); - } - else { - sendReq("POST", scmEditorUrl, my_text, login, pass, message, orig_text); - } + + sendReq("POST", "commit.action", my_text, login, pass, message, orig_text); + } } else{ alert("File don't need to be save."); Modified: trunk/src/main/webapp/css/main.css =================================================================== --- trunk/src/main/webapp/css/main.css 2011-06-20 09:40:04 UTC (rev 126) +++ trunk/src/main/webapp/css/main.css 2011-06-20 12:41:21 UTC (rev 127) @@ -12,7 +12,7 @@ } #prevtitle { - margin-left:12%; + margin-left:13%; } #preview {