From 009ea8e827f35b62b287d4666b1130a8a6e59931 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Mon, 10 Feb 2020 16:02:12 +0100
Subject: [PATCH] Fix jsplumb graph when loading images BT#16602

---
 main/exercise/answer.class.php | 11 ++++++-----
 main/inc/lib/exercise.lib.php  |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/main/exercise/answer.class.php b/main/exercise/answer.class.php
index 13d2d85003..754010e79a 100755
--- a/main/exercise/answer.class.php
+++ b/main/exercise/answer.class.php
@@ -1029,12 +1029,13 @@ class Answer
      */
     public function getJs()
     {
-        //if ($this->questionId == 2)
         return "<script>
-                jsPlumb.ready(function() {
-                    if ($('#drag{$this->questionId}_question').length > 0) {
-                        MatchingDraggable.init('{$this->questionId}');
-                    }
+                $(window).on('load', function() {
+                    jsPlumb.ready(function() {
+                        if ($('#drag{$this->questionId}_question').length > 0) {
+                            MatchingDraggable.init('{$this->questionId}');
+                        }
+                    });
                 });
             </script>";
     }
diff --git a/main/inc/lib/exercise.lib.php b/main/inc/lib/exercise.lib.php
index 818fa7154a..3d3a538ce1 100644
--- a/main/inc/lib/exercise.lib.php
+++ b/main/inc/lib/exercise.lib.php
@@ -1277,7 +1277,7 @@ HTML;
                                     $s .= "
                                         <script>
                                             $(function() {
-                                                jsPlumb.ready(function() {
+                                                $(window).on('load', function() {
                                                     jsPlumb.connect({
                                                         source: 'window_$windowId',
                                                         target: 'window_{$questionId}_{$selectedIndex}_answer',