LSNBLDR-838 Delete button in edit textbox doesn't have confirm dialog (…

…sakaiproject#4638) * LSNBLDR-838 Delete button in edit textbox doesn't have confirm dialog * LSNBLDR-838 Delete button in edit textbox doesn't have confirm dialog Removing other referneces to 'confirmDelete'
JackyCheungBoy · Aug 9, 2017 · 64dcba1 · 64dcba1
1 parent e80f702
commit 64dcba1
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/lessonbuilder/tool/src/webapp/js/checklist.js b/lessonbuilder/tool/src/webapp/js/checklist.js
@@ -18,7 +18,7 @@
 
         loadPreviouslySavedChecklistItems();
 
-        var confirmMsg = $('#confirmDeleteLangSupp').html();
+        var confirmMsg = $('#deleteButtonLangSupp').html();
         $('.deleteButton').click(function () {
             return confirm(confirmMsg);
         });
@@ -258,4 +258,4 @@
         })
     }
 
-}(window.checklist = window.checklist || {}, jQuery));
+}(window.checklist = window.checklist || {}, jQuery));
diff --git a/lessonbuilder/tool/src/webapp/js/comments.js b/lessonbuilder/tool/src/webapp/js/comments.js
@@ -76,7 +76,7 @@ $(function() {
 			},
 
 			"Delete Comment": function() {
-				confirmDelete();
+				deleteButton();
 			}
 		}
 	});
@@ -296,7 +296,7 @@ function deleteComment(link) {
 	//setMainFrameHeight(window.name);
 }
 
-function confirmDelete() {
+function deleteButton() {
 	$(commentToReload).load(deleteDialogCommentURL, commentsLoaded);
 	//$("#delete-dialog").parents(".replaceWithComments").load($(dialog).children(".delete-dialog-comment-url").text());
 	setMainFrameHeight(window.name);

diff --git a/lessonbuilder/tool/src/webapp/templates/Checklist.html b/lessonbuilder/tool/src/webapp/templates/Checklist.html
@@ -109,7 +109,7 @@ <h3 id="groupHeader"><span rsf:id="msg=simplepage.group.settings" /></h3>
             </div>
         </div>
 
-        <span style="display:none;" id="confirmDeleteLangSupp" rsf:id="msg=simplepage.delete_page_confirm"></span>
+        <span style="display:none;" id="deleteButtonLangSupp" rsf:id="msg=simplepage.delete_page_confirm"></span>
         <p class="act">
             <input id="submitButton" accesskey ="s" rsf:id="save" value="Save" type="submit" class="active" />
             <input accesskey ="x" rsf:id="cancel" value="Cancel" type="submit"/>

diff --git a/lessonbuilder/tool/src/webapp/templates/EditPage.html b/lessonbuilder/tool/src/webapp/templates/EditPage.html
@@ -32,7 +32,7 @@ <h3><span rsf:id="title-label"></span><span class="bold" style="margin-left:5px;
             <input type="checkbox" id="question-prerequisite" rsf:id="question-prerequisite"/><label rsf:id="msg=simplepage.prerequisites_label" for="question-prerequisite"></label>
 	 </div>
 
-<span style="display:none;" id="confirmDeleteLangSupp" rsf:id="msg=simplepage.delete_page_confirm"></span>
+<span style="display:none;" id="deleteButtonLangSupp" rsf:id="msg=simplepage.delete_page_confirm"></span>
 <script type="text/javascript">
 
 $(function() {
@@ -47,8 +47,8 @@ <h3><span rsf:id="title-label"></span><span class="bold" style="margin-left:5px;
 });
 
 jQuery(document).ready(function($) {
-	var confirmMsg = document.getElementById('confirmDeleteLangSupp').innerHTML;
-    $('.ConfirmDelete').click(function() {
+	var confirmMsg = document.getElementById('deleteButtonLangSupp').innerHTML;
+    $('.deleteButton').click(function() {
         return confirm(confirmMsg);
     });
 });