From kcardineaud@users.nuiton.org Wed Jun 29 17:48:15 2011
From: kcardineaud@users.nuiton.org
To: scmwebeditor-commits@list.nuiton.org
Subject: [Scmwebeditor-commits] r145 - trunk/src/main/webapp
Date: Wed, 29 Jun 2011 17:48:15 +0200
Message-ID: <20110629154815.2F4791591A@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2304598395943723881=="

--===============2304598395943723881==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: kcardineaud
Date: 2011-06-29 17:48:15 +0200 (Wed, 29 Jun 2011)
New Revision: 145

Url: http://nuiton.org/repositories/revision/scmwebeditor/145

Log:
Simplify javascript for the exit button


Removed:
   trunk/src/main/webapp/cancelRedirectDelete.js
Modified:
   trunk/src/main/webapp/ModificationViewer.jsp

Modified: trunk/src/main/webapp/ModificationViewer.jsp
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/ModificationViewer.jsp	2011-06-29 15:34:45 UTC (rev=
 144)
+++ trunk/src/main/webapp/ModificationViewer.jsp	2011-06-29 15:48:15 UTC (rev=
 145)
@@ -185,7 +185,7 @@
=20
     =20
     <script src=3D"GereSession.js" type=3D"text/javascript"></script>
-    <script src=3D"cancelRedirectDelete.js" type=3D"text/javascript"></scrip=
t>
+    <script src=3D"cancelRedirect.js" type=3D"text/javascript"></script>
     <script src=3D"pictureUpload.js" type=3D"text/javascript"></script>
     <noscript><h4>Javascript is not activated. You can't only use Save and Q=
uit or Reset button.</h4></noscript>
     <noscript><h4>For a better use of SCMWebEditor please activate JavaScrip=
t.</h4></noscript>
@@ -257,7 +257,7 @@
    =20
     <input title=3D"Reset text as current repository HEAD revision." type=3D=
"reset"  value=3D"Reset" name=3D"Reset" />
     <input type=3D"hidden" value=3D"<%=3Drequest.getAttribute("ProjectUrl")%=
>" name=3D"ProjectUrl">
-    <input title=3D"Exit ScmWebEditor without saving." type=3D"button" value=
=3D"Exit" name=3D"Cancel" onclick=3D"javascript:cancelRedirectDelete(this.for=
m.origText, this.form.username, this.form.pw, this.form.commitMessage, this.f=
orm.ProjectUrl, this.form.scmEditorUrl);"/>
+    <input title=3D"Exit ScmWebEditor without saving." type=3D"button" value=
=3D"Exit" name=3D"Cancel" onclick=3D"javascript:cancelRedirect(this.form.Proj=
ectUrl);"/>
   =20
   =20
     <br/>

Deleted: trunk/src/main/webapp/cancelRedirectDelete.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/src/main/webapp/cancelRedirectDelete.js	2011-06-29 15:34:45 UTC (re=
v 144)
+++ trunk/src/main/webapp/cancelRedirectDelete.js	2011-06-29 15:48:15 UTC (re=
v 145)
@@ -1,44 +0,0 @@
-/**
- * @author geoffroy lorieux
- */
-
-
-
-function createRequestObjec()
-{
-    var req;
-    if(window.XMLHttpRequest)
-    {
-        //For Firefox, Safari, Opera
-        req =3D new XMLHttpRequest();
-    }
-    else if(window.ActiveXObject)
-    {
-        //For IE 5+
-        req =3D new ActiveXObject("Microsoft.XMLHTTP");
-    }
-    else
-    {
-        //Error for an old browser
-        alert('Your browser is not IE 5 or higher, or Firefox or Safari or O=
pera');
-    }
-    return req;
-}
-
-//Make the XMLHttpRequest Object
-var http=3D createRequestObjec();
-
-function sendRe(method, url, text, login, pass, message)
-{
-        http.open(method, url.value, true);
-        http.setRequestHeader("Content-type", "application/x-www-form-urlenc=
oded");
-        http.send("Mytext=3D"+text.value+"&username=3D"+login.value+"&pw=3D"=
+pass.value+"&Commit_message=3D"+message.value+"&Orig_text=3D"+text.value);
-}
-
-function cancelRedirectDelete(orig_text, login, pass, message, url_return, s=
cmEditorUrl)
-    {
-	  if (confirm("Exit SCMWebEditor ?")){
-	      	sendRe("POST", scmEditorUrl, orig_text, login, pass, message);
-	        window.location.replace(url_return.value);
-	      }
-    }
\ No newline at end of file


--===============2304598395943723881==--