You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by mb...@apache.org on 2021/10/01 18:47:55 UTC
[roller] 01/02: fixed JS error during MediaFileView#deleteFolder
action.
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
commit 44172c6dd97a0c3617cdecd03af12b009a2dcb0c
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Tue Aug 10 18:43:26 2021 +0200
fixed JS error during MediaFileView#deleteFolder action.
---
app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
index fc255e6..4af8027 100644
--- a/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/editor/MediaFileView.jsp
@@ -288,15 +288,14 @@
<input id="moveButton" type="button" class="btn btn-primary" style="display: inline"
value='<s:text name="mediaFileView.moveSelected" />' onclick="onMoveSelected()"/>
-
</s:if>
<s:select id="moveTargetMenu" name="selectedDirectory" cssStyle="display: inline; width: 15em"
list="allDirectories" listKey="id" listValue="name"/>
<s:if test="currentDirectory.name != 'default' && !pager">
- <s:submit value="%{getText('mediaFileView.deleteFolder')}" cssClass="btn"
- action="mediaFileView!deleteFolder" onclick="onDeleteFolder();return false;"/>
+ <input id="deleteFolderButton" type="button" class="btn" style="display: inline"
+ value='<s:text name="mediaFileView.deleteFolder" />' onclick="onDeleteFolder()"/>
</s:if>
</div>
@@ -394,8 +393,8 @@
function onDeleteFolder() {
if (confirm("<s:text name='mediaFile.deleteFolder.confirm' />")) {
- document.bookmarks.action = '<s:url action="mediaFileView!deleteFolder" />';
- document.bookmarks.submit();
+ document.mediaFileViewForm.action = '<s:url action="mediaFileView!deleteFolder" />';
+ document.mediaFileViewForm.submit();
}
}