Merge pull request #403 from intersystems/modal-cancel-button

isc-tleavitt · web-flow · commit 46a6f416e40b · 2024-07-08T15:57:44.000-04:00
modal cancel button works
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2351,7 +2351,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                 }
             });
     
-            $('#confirmAction').find('#cancelAction, .close').click(function() {
+            $('#confirmAction').find('#cancelActionBtn, .close').click(function() {
                 removeWarningModal(popup);
             });
     }
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -2354,7 +2354,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                 }
             });
     
-            $('#confirmAction').find('#cancelAction, .close').click(function() {
+            $('#confirmAction').find('#cancelActionBtn, .close').click(function() {
                 removeWarningModal(popup);
             });
     }

Original file line number	Diff line number	Diff line change
`@@ -2351,7 +2351,7 @@ webui.NewChangedFilesView = function(workspaceView) {`
`2351`	`2351`	`}`
`2352`	`2352`	`});`
`2353`	`2353`
`2354`		`- $('#confirmAction').find('#cancelAction, .close').click(function() {`
	`2354`	`+ $('#confirmAction').find('#cancelActionBtn, .close').click(function() {`
`2355`	`2355`	`removeWarningModal(popup);`
`2356`	`2356`	`});`
`2357`	`2357`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2354,7 +2354,7 @@ webui.NewChangedFilesView = function(workspaceView) {`
`2354`	`2354`	`}`
`2355`	`2355`	`});`
`2356`	`2356`
`2357`		`- $('#confirmAction').find('#cancelAction, .close').click(function() {`
	`2357`	`+ $('#confirmAction').find('#cancelActionBtn, .close').click(function() {`
`2358`	`2358`	`removeWarningModal(popup);`
`2359`	`2359`	`});`
`2360`	`2360`	`}`