branch develop updated (c1bb575 -> c978066)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git from c1bb575 Add the ability to move a file on the repository new c978066 Improve the reload of the page when doing an operation on the repository through the popup windows The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit c97806693fb7a9abc918f4ebaa0d821266602182 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 29 12:16:44 2015 +0200 Improve the reload of the page when doing an operation on the repository through the popup windows Summary of changes: .../src/main/webapp/WEB-INF/content/modificationViewer.jsp | 5 ++--- .../webapp/WEB-INF/content/popups/createBranchSuccess.jsp | 2 +- .../webapp/WEB-INF/content/popups/createDirectorySuccess.jsp | 12 +++++++++++- .../main/webapp/WEB-INF/content/popups/moveFileSuccess.jsp | 12 +++++++++++- .../webapp/WEB-INF/content/popups/removeDirectorySuccess.jsp | 12 +++++++++++- .../main/webapp/WEB-INF/content/popups/removeFileSuccess.jsp | 12 +++++++++++- .../main/webapp/WEB-INF/content/popups/uploadFileSuccess.jsp | 12 +++++++++++- swe-ui-web/src/main/webapp/js/popup.js | 6 ------ 8 files changed, 58 insertions(+), 15 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit c97806693fb7a9abc918f4ebaa0d821266602182 Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Fri May 29 12:16:44 2015 +0200 Improve the reload of the page when doing an operation on the repository through the popup windows --- .../src/main/webapp/WEB-INF/content/modificationViewer.jsp | 5 ++--- .../webapp/WEB-INF/content/popups/createBranchSuccess.jsp | 2 +- .../webapp/WEB-INF/content/popups/createDirectorySuccess.jsp | 12 +++++++++++- .../main/webapp/WEB-INF/content/popups/moveFileSuccess.jsp | 12 +++++++++++- .../webapp/WEB-INF/content/popups/removeDirectorySuccess.jsp | 12 +++++++++++- .../main/webapp/WEB-INF/content/popups/removeFileSuccess.jsp | 12 +++++++++++- .../main/webapp/WEB-INF/content/popups/uploadFileSuccess.jsp | 12 +++++++++++- swe-ui-web/src/main/webapp/js/popup.js | 6 ------ 8 files changed, 58 insertions(+), 15 deletions(-) diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp index ac2ef6b..e7e8768 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/modificationViewer.jsp @@ -108,7 +108,6 @@ if (classAttr.contains("jstree-leaf")) { var scmType = $("#scmType").val(); - var selectedBranch = $("#selectedBranchDisplay").text().trim(); document.location.href = ("edit.action?address=" + item.attr("id") + "&scmType=" + scmType + '&selectedBranch=<s:property value="selectedBranch"/>'); @@ -362,8 +361,7 @@ <p> - <s:text name="scm.FileInEditor"/> <s:a href="%{address}"><s:property - value="address"/></s:a> + <s:text name="scm.FileInEditor"/><s:property value="address"/> <s:text name="scm.atRevision"/> <span id="numrevisionDiv"><s:property value="numRevision"/></span> @@ -446,6 +444,7 @@ <s:hidden key="address" label=''/> <s:hidden key="origText" label=''/> <s:hidden key="scmEditorUrl" label=''/> + <s:hidden key="selectedBranch" label=''/> <div id="scmButton"></div> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchSuccess.jsp index 91b0bdf..4b36521 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createBranchSuccess.jsp @@ -33,7 +33,7 @@ <title><s:text name="scm.titles.success"/></title> <script type="text/javascript"> - window.onbeforeunload = close_popup; + window.opener.document.location.reload(true); </script> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectorySuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectorySuccess.jsp index 76440ac..a2d17a8 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectorySuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/createDirectorySuccess.jsp @@ -33,7 +33,17 @@ <title><s:text name="scm.titles.success"/></title> <script type="text/javascript"> - window.onbeforeunload = close_popup; + if (window.opener.document.location.href.endsWith("edit.action")) { + var address = window.opener.document.getElementById("address").value; + var scmType = window.opener.document.getElementById("scmType").value; + var selectedBranch = window.opener.document.getElementById("selectedBranch").value; + + window.opener.document.location.href = "edit.action?address=" + address + "&scmType=" + scmType + + "&selectedBranch=" + selectedBranch; + } + else { + window.opener.document.location.reload(true); + } </script> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileSuccess.jsp index 0fff419..bf94320 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/moveFileSuccess.jsp @@ -33,7 +33,17 @@ <title><s:text name="scm.titles.success"/></title> <script type="text/javascript"> - window.onbeforeunload = close_popup; + if (window.opener.document.location.href.endsWith("edit.action")) { + var address = window.opener.document.getElementById("address").value; + var scmType = window.opener.document.getElementById("scmType").value; + var selectedBranch = window.opener.document.getElementById("selectedBranch").value; + + window.opener.document.location.href = "edit.action?address=" + address + "&scmType=" + scmType + + "&selectedBranch=" + selectedBranch; + } + else { + window.opener.document.location.reload(true); + } </script> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectorySuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectorySuccess.jsp index 5846f8f..1ff99e3 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectorySuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeDirectorySuccess.jsp @@ -33,7 +33,17 @@ <title><s:text name="scm.titles.success"/></title> <script type="text/javascript"> - window.onbeforeunload = close_popup; + if (window.opener.document.location.href.endsWith("edit.action")) { + var address = window.opener.document.getElementById("address").value; + var scmType = window.opener.document.getElementById("scmType").value; + var selectedBranch = window.opener.document.getElementById("selectedBranch").value; + + window.opener.document.location.href = "edit.action?address=" + address + "&scmType=" + scmType + + "&selectedBranch=" + selectedBranch; + } + else { + window.opener.document.location.reload(true); + } </script> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileSuccess.jsp index b920c05..1a3c511 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/removeFileSuccess.jsp @@ -33,7 +33,17 @@ <title><s:text name="scm.titles.success"/></title> <script type="text/javascript"> - window.onbeforeunload = close_popup; + if (window.opener.document.location.href.endsWith("edit.action")) { + var address = window.opener.document.getElementById("address").value; + var scmType = window.opener.document.getElementById("scmType").value; + var selectedBranch = window.opener.document.getElementById("selectedBranch").value; + + window.opener.document.location.href = "edit.action?address=" + address + "&scmType=" + scmType + + "&selectedBranch=" + selectedBranch; + } + else { + window.opener.document.location.reload(true); + } </script> </head> diff --git a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileSuccess.jsp b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileSuccess.jsp index 6c91195..c6d2d0b 100644 --- a/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileSuccess.jsp +++ b/swe-ui-web/src/main/webapp/WEB-INF/content/popups/uploadFileSuccess.jsp @@ -33,7 +33,17 @@ <title><s:text name="scm.titles.success"/></title> <script type="text/javascript"> - window.onbeforeunload = close_popup; + if (window.opener.document.location.href.endsWith("edit.action")) { + var address = window.opener.document.getElementById("address").value; + var scmType = window.opener.document.getElementById("scmType").value; + var selectedBranch = window.opener.document.getElementById("selectedBranch").value; + + window.opener.document.location.href = "edit.action?address=" + address + "&scmType=" + scmType + + "&selectedBranch=" + selectedBranch; + } + else { + window.opener.document.location.reload(true); + } </script> </head> diff --git a/swe-ui-web/src/main/webapp/js/popup.js b/swe-ui-web/src/main/webapp/js/popup.js index 46eb6c3..6fd3c5e 100644 --- a/swe-ui-web/src/main/webapp/js/popup.js +++ b/swe-ui-web/src/main/webapp/js/popup.js @@ -23,9 +23,3 @@ function open_popup(page, name, fileAddress, scmType) { window.open (page+'?address=' + fileAddress + '&scmType=' + scmType, name, config='top=200, left=300, height=600, width=700, toolbar=no, menubar=no, scrollbars=yes, resizable=yes, location=no, directories=no, status=no') } - -function close_popup() { - - window.opener.document.location.reload(true); - window.close(); -} -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm