From 953bb3672d3f997a0b42bd85e3d69bce89348095 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Fri, 5 Oct 2018 12:27:51 +0200
Subject: [PATCH] OO-3620: don't intercept clicks in modal panel to close
edited fragment
---
.../org/olat/modules/portfolio/ui/_content/binder_list.html | 2 --
.../webapp/static/js/jquery/openolat/jquery.contenteditor.js | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/modules/portfolio/ui/_content/binder_list.html b/src/main/java/org/olat/modules/portfolio/ui/_content/binder_list.html
index 7479ee90549..7a6d7b509a3 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/_content/binder_list.html
+++ b/src/main/java/org/olat/modules/portfolio/ui/_content/binder_list.html
@@ -17,11 +17,9 @@ jQuery(function() {
return false;
},
accepts: function (el, target) {
- console.log('accepts');
return true;
},
moves: function (el, container, handle) {
- console.log('moves');
return handle.classList.contains('panel-heading') || handle.classList.contains('panel-title');
}
}).on('drop', function(el, target, source, sibling) {
diff --git a/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.js b/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.js
index ff37a2227a5..58e421dffb9 100644
--- a/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.js
+++ b/src/main/webapp/static/js/jquery/openolat/jquery.contenteditor.js
@@ -71,7 +71,7 @@
} else {
var edited = jQuery(e.target).closest(".o_page_fragment_edit").length > 0
|| jQuery(e.target).closest(".o_page_side_options").length > 0;
- if(!edited) {
+ if(!edited && jQuery(".o_layered_panel .modal-dialog").length == 0) {
o_XHREvent(componentUrl, false, false, 'cid', 'close_edit_fragment');
}
}
--
GitLab