Advertisement
stronk7

Untitled

Sep 4th, 2019
302
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.05 KB | None | 0 0
  1. $ git range-diff origin/MOODLE_37_STABLE...MOODLE_37_STABLE origin/master...master
  2. 1: fbbf84ebd49 ! 1: 95f04970e63 MDL-65493 message: JS fixes for random behat fails
  3. @@ -5,6 +5,9 @@
  4. diff --git a/message/amd/build/message_drawer.min.js b/message/amd/build/message_drawer.min.js
  5. Binary files a/message/amd/build/message_drawer.min.js and b/message/amd/build/message_drawer.min.js differ
  6.  
  7. + diff --git a/message/amd/build/message_drawer.min.js.map b/message/amd/build/message_drawer.min.js.map
  8. + Binary files a/message/amd/build/message_drawer.min.js.map and b/message/amd/build/message_drawer.min.js.map differ
  9. +
  10. diff --git a/message/amd/src/message_drawer.js b/message/amd/src/message_drawer.js
  11. --- a/message/amd/src/message_drawer.js
  12. +++ b/message/amd/src/message_drawer.js
  13. @@ -34,16 +37,16 @@
  14.  
  15. + // These are theme-specific to help us fix random behat fails.
  16. + // These events target those events defined in BS3 and BS4 onwards.
  17. -+ root.on('hide', '.collapse', function(e) {
  18. ++ root.on('hide.bs.collapse', '.collapse', function(e) {
  19. + var pendingPromise = new Pending();
  20. -+ $(e.target).one('hidden', function() {
  21. ++ $(e.target).one('hidden.bs.collapse', function() {
  22. + pendingPromise.resolve();
  23. + });
  24. + });
  25. +
  26. -+ root.on('show', '.collapse', function(e) {
  27. ++ root.on('show.bs.collapse', '.collapse', function(e) {
  28. + var pendingPromise = new Pending();
  29. -+ $(e.target).one('shown', function() {
  30. ++ $(e.target).one('shown.bs.collapse', function() {
  31. + pendingPromise.resolve();
  32. + });
  33. + });
  34. 2: bcafdad6188 = 2: 2ca2473e21c MDL-65493 message: The execute wrapper MUST be used
  35. 3: 54f012aae17 < -: ----------- MDL-65493 core: Add pendingJS around pubsub.publish
  36. -: ----------- > 3: 0c181c18cd4 MDL-65493 core: Add pendingJS around pubsub.publish
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement