Преглед изворни кода

Allow create Delineation questions - refs #7705

Angel Fernando Quiroz Campos пре 9 година
родитељ
комит
922876838a

+ 0 - 1
main/exercice/admin.php

@@ -348,7 +348,6 @@ $htmlHeadXtra[] = '<link rel="stylesheet" href="../plugin/hotspot2/css/hotspot.c
 $htmlHeadXtra[] = '<script src="../plugin/hotspot2/js/hotspot.js"></script>';
 
 $htmlHeadXtra[] = "<script type=\"text/javascript\" src=\"../plugin/hotspot/JavaScriptFlashGateway.js\"></script>
-<script src=\"../plugin/hotspot/hotspot.js\" type=\"text/javascript\"></script>
 <script language=\"JavaScript\" type=\"text/javascript\">
 <!--
 // -----------------------------------------------------------------------------

+ 0 - 1
main/exercice/exercise.class.php

@@ -2102,7 +2102,6 @@ class Exercise
     public function show_lp_javascript()
     {
         return "<script type=\"text/javascript\" src=\"../plugin/hotspot/JavaScriptFlashGateway.js\"></script>
-                <script src=\"../plugin/hotspot/hotspot.js\" type=\"text/javascript\"></script>
                 <script language=\"JavaScript\" type=\"text/javascript\">
                 <!--
                 // -----------------------------------------------------------------------------

+ 13 - 5
main/exercice/hotspot_admin.inc.php

@@ -1032,11 +1032,19 @@ if ($modifyAnswers) {
     </form>
     <script>
         $(document).on('ready', function () {
-            HotspotQuestion.init({
-                questionId: <?php echo $modifyAnswers ?>,
-                selector: '#hotspot-container',
-                for: 'admin'
-            });
+            <?php if ($answerType == HOT_SPOT_DELINEATION) { ?>
+                DelineationQuestion.init({
+                    questionId: <?php echo $modifyAnswers ?>,
+                    selector: '#hotspot-container',
+                    for: 'admin'
+                });
+            <?php } else { ?>
+                HotspotQuestion.init({
+                    questionId: <?php echo $modifyAnswers ?>,
+                    selector: '#hotspot-container',
+                    for: 'admin'
+                });
+            <?php } ?>
         });
     </script>
     <?php

+ 7 - 6
main/inc/lib/exercise.lib.php

@@ -1172,12 +1172,12 @@ HOTSPOT;
 
             $canClick = isset($_GET['editQuestion']) ? '0' : (isset($_GET['modifyAnswers']) ? '0' : '1');
 
-            $s .= <<<HOTSPOT
-                            <div class="col-sm-8 col-md-9">
-                                <div class="hotspot-image"></div>
+            $s .= "
+                            <div class=\"col-sm-8 col-md-9\">
+                                <div class=\"hotspot-image\"></div>
                                 <script>
                                     $(document).on('ready', function () {
-                                        HotspotQuestion.init({
+                                        " . ($answerType == HOT_SPOT_DELINEATION ? 'DelineationQuestion' : 'HotspotQuestion') . ".init({
                                             questionId: $questionId,
                                             selector: '#question_div_' + $questionId + ' .hotspot-image',
                                             for: 'user'
@@ -1185,10 +1185,11 @@ HOTSPOT;
                                     });
                                 </script>
                             </div>
-                            <div class="col-sm-4 col-md-3">
+                            <div class=\"col-sm-4 col-md-3\">
                                 $answerList
                             </div>
-HOTSPOT;
+            ";
+
             echo <<<HOTSPOT
                             $s
                         </div>