Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git range-diff origin/MOODLE_37_STABLE...MOODLE_37_STABLE origin/master...master
- 1: fbbf84ebd49 ! 1: 95f04970e63 MDL-65493 message: JS fixes for random behat fails
- @@ -5,6 +5,9 @@
- diff --git a/message/amd/build/message_drawer.min.js b/message/amd/build/message_drawer.min.js
- Binary files a/message/amd/build/message_drawer.min.js and b/message/amd/build/message_drawer.min.js differ
- + diff --git a/message/amd/build/message_drawer.min.js.map b/message/amd/build/message_drawer.min.js.map
- + Binary files a/message/amd/build/message_drawer.min.js.map and b/message/amd/build/message_drawer.min.js.map differ
- +
- diff --git a/message/amd/src/message_drawer.js b/message/amd/src/message_drawer.js
- --- a/message/amd/src/message_drawer.js
- +++ b/message/amd/src/message_drawer.js
- @@ -34,16 +37,16 @@
- + // These are theme-specific to help us fix random behat fails.
- + // These events target those events defined in BS3 and BS4 onwards.
- -+ root.on('hide', '.collapse', function(e) {
- ++ root.on('hide.bs.collapse', '.collapse', function(e) {
- + var pendingPromise = new Pending();
- -+ $(e.target).one('hidden', function() {
- ++ $(e.target).one('hidden.bs.collapse', function() {
- + pendingPromise.resolve();
- + });
- + });
- +
- -+ root.on('show', '.collapse', function(e) {
- ++ root.on('show.bs.collapse', '.collapse', function(e) {
- + var pendingPromise = new Pending();
- -+ $(e.target).one('shown', function() {
- ++ $(e.target).one('shown.bs.collapse', function() {
- + pendingPromise.resolve();
- + });
- + });
- 2: bcafdad6188 = 2: 2ca2473e21c MDL-65493 message: The execute wrapper MUST be used
- 3: 54f012aae17 < -: ----------- MDL-65493 core: Add pendingJS around pubsub.publish
- -: ----------- > 3: 0c181c18cd4 MDL-65493 core: Add pendingJS around pubsub.publish
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement