mumuki-laboratory 8.1.1 → 8.3.0

data/app/assets/javascripts/mumuki_laboratory/application/kindergarten.js

@@ -13,7 +13,7 @@ mumuki.load(() => {
       this.$contextModalButton = new mumuki.Button($('#mu-kids-context .mu-kids-modal-button.mu-close'));
 
       this.resultActions.passed = this._showSuccessPopup.bind(this);
-      this.resultActions.passed_with_warnings = this._showSuccessPopup.bind(this);
+      this.resultActions.passed_with_warnings = this._showPassedWithWarnings.bind(this);
       this.resultActions.failed = this._showFailurePopup.bind(this);
       this.resultActions.errored = this._showFailurePopup.bind(this);
       this.resultActions.pending = this._showFailurePopup.bind(this);
@@ -50,6 +50,10 @@ mumuki.load(() => {
       this.showNonAbortedPopup(data, 'success2_l');
     }
 
+    _showPassedWithWarnings(data) {
+      this.showNonAbortedPopup(data, 'passed_with_warnings');
+    }
+
     _showFailurePopup(data) {
       this.showNonAbortedPopup(data, 'failure');
     }
@@ -78,6 +82,7 @@ mumuki.load(() => {
 
     restart() {
       mumuki.presenterCharacter.playAnimation('talk', this.$bubbleCharacterAnimation);
+      this.hideOverlay();
     }
 
     // =======================
@@ -103,27 +108,27 @@ mumuki.load(() => {
           this._action('play', 'stop', true, (speech) => {
             mumuki.presenterCharacter.playAnimation('talk', mumuki.kids.$bubbleCharacterAnimation);
             speech.speak(msg);
-          })
+          });
         },
         stop() {
-          this._action('stop', 'play', false, (speech) => speech.cancel())
+          this._action('stop', 'play', false, (speech) => speech.cancel());
         },
         _action(add, remove, isPlaying, callback) {
           callback(window.speechSynthesis);
-          const $button = $('.mu-kindergarten-play-description')
+          const $button = $('.mu-kindergarten-play-description');
           $button.find(`.mu-kindergarten-${add}`).addClass('hidden');
           $button.find(`.mu-kindergarten-${remove}`).removeClass('hidden');
           this._isPlaying = isPlaying;
         },
         verifyBrowserSupport() {
           if (!window.speechSynthesis) {
-            const $button = $('.mu-kindergarten-play-description')
+            const $button = $('.mu-kindergarten-play-description');
             $button.prop('disabled', true);
             $button.css('cursor', 'not-allowed');
-            this._action('play', 'stop', false)
+            this._action('play', 'stop', false);
           }
         }
-      }
+      };
 
     }
 
@@ -143,7 +148,7 @@ mumuki.load(() => {
           const $hintMedia = $('.mu-kindergarten-hint-media');
           if (!$hintMedia.get(0)) $button.addClass('hidden');
         },
-      }
+      };
     }
 
     get context() {

data/app/assets/javascripts/mumuki_laboratory/application/messages.js

@@ -1,7 +1,7 @@
 mumuki.load(() => {
   var Chat = {
     $body: function () {
-      return $('body')
+      return $('body');
     },
     $newMessageModal: function () {
       return $('.new-message-modal');
@@ -18,7 +18,7 @@ mumuki.load(() => {
       $('.notifications-box').toggleClass('notifications-box-empty', !data.has_messages);
       $('.pending-messages-filter').removeClass('pending-messages-filter');
       $('button.btn-submit').removeClass('disabled');
-      $('.pending-messages-text').remove()
+      $('.pending-messages-text').remove();
     },
     readMessages: function (url) {
       Chat.tokenRequest({
@@ -26,10 +26,10 @@ mumuki.load(() => {
         method: 'POST',
         success: Chat.setMessages,
         xhrFields: {withCredentials: true}
-      })
+      });
     },
     tokenRequest: function (data) {
-      $.ajax(Chat.token.newRequest(data))
+      $.ajax(Chat.token.newRequest(data));
     },
     getMessages: function () {
       if ($('.badge-messages').length == 0) {
@@ -74,7 +74,7 @@ mumuki.load(() => {
         success: success,
         error: error,
         xhrFields: {withCredentials: true}
-      })
+      });
     },
     openNewMessageModal: function () {
       Chat.$newMessageModal().modal({backdrop: false, keyboard: false});
@@ -89,5 +89,5 @@ mumuki.load(() => {
   Chat.setMessagesInterval();
   mumuki.Chat = Chat;
 
-})
+});
 

data/app/assets/javascripts/mumuki_laboratory/application/mu-modal-carrousel.js

@@ -41,7 +41,7 @@ mumuki.ModalCarrousel = (() => {
 
     _hidePreviousButtonIfFirstSlide() {
       const $prev = $('.mu-kids-modal-button.mu-previous');
-      this._addClassIf($prev, 'hidden', () => this._activeSlide().is(':first-child'))
+      this._addClassIf($prev, 'hidden', () => this._activeSlide().is(':first-child'));
     }
 
     _showFirstSlide() {

data/app/assets/javascripts/mumuki_laboratory/application/multiple-choice.js

@@ -1,7 +1,7 @@
 mumuki.load(() => {
 	function dumpChoices(_evt) {
 		var indexes = $('.solution-choice:checked').map(function () {
-			return $(this).data('index')
+			return $(this).data('index');
 		}).get().join(':');
 		$('#solution_content').attr('value', indexes);
 	}

data/app/assets/javascripts/mumuki_laboratory/application/multiple-files.js

@@ -103,11 +103,11 @@ mumuki.load(() => {
     }
 
     get highlightModes() {
-      return this._getDataFromHiddenInput('#highlight-modes')
+      return this._getDataFromHiddenInput('#highlight-modes');
     }
 
     get locales() {
-      return this._getDataFromHiddenInput('#multifile-locales')
+      return this._getDataFromHiddenInput('#multifile-locales');
     }
 
     setUpAddFile() {
@@ -131,7 +131,7 @@ mumuki.load(() => {
 
       this._setVisibility(this._addFileButton, filesCount < this.MAX_TABS);
       this.files.toArray().forEach(file => {
-        this._setVisibility(file.deleteButton, file.name !== this.mainFile && filesCount > 1)
+        this._setVisibility(file.deleteButton, file.name !== this.mainFile && filesCount > 1);
       });
     }
 

data/app/assets/javascripts/mumuki_laboratory/application/multiple-scenarios.js

@@ -73,7 +73,7 @@ mumuki.MultipleScenarios = (() => {
         if (this.validScenarioIndex(newScenarioIndex)) {
           this.setActiveIndex(newScenarioIndex);
         }
-      })
+      });
     }
 
     createControls () {

data/app/assets/javascripts/mumuki_laboratory/application/pin.js

@@ -11,5 +11,5 @@ mumuki.pin = (() => {
         smoothScrollToElement(scrollPin);
       }
     }
-  }
+  };
 })();

data/app/assets/javascripts/mumuki_laboratory/application/primary.js

@@ -16,7 +16,6 @@ mumuki.load(() => {
       super.initialize();
       this.$characterSpeechBubble = $('.mu-kids-character-speech-bubble');
       this.$characterSpeechBubbleNormal = this.$characterSpeechBubble.children('.mu-kids-character-speech-bubble-normal');
-      this.$overlay = $('.mu-kids-overlay');
       this.$contextModalButton = new mumuki.Button($('.mu-kids-context .modal-footer button'));
 
       this._paragraphHeight = undefined;
@@ -58,6 +57,10 @@ mumuki.load(() => {
       this.showNonAbortedPopup(data, 'success2_l', 4000);
     }
 
+    _showPassedWithWarnings(data) {
+      this.showNonAbortedPopup(data, 'passed_with_warnings', 4000);
+    }
+
     _showFailurePopup(data) {
       this._showOnCharacterBubble(data);
     }
@@ -83,7 +86,7 @@ mumuki.load(() => {
             this._$texts.hide();
             this.$characterSpeechBubbleNormal.children('.' + $tab.data('target')).show();
             this._updateSpeechParagraphs();
-          })
+          });
         }
       });
 
@@ -137,6 +140,7 @@ mumuki.load(() => {
       const $bubble = this.$characterSpeechBubble;
       Object.keys(this.resultActions).forEach($bubble.removeClass.bind($bubble));
       mumuki.presenterCharacter.playAnimation('talk', this.$bubbleCharacterAnimation);
+      this.hideOverlay();
     }
 
     // =======================
@@ -150,7 +154,6 @@ mumuki.load(() => {
       $bubble.find('.mu-kids-character-speech-bubble-failed').hide();
       $bubble.find('.mu-kids-discussion-link').remove();
       Object.keys(this.resultActions).forEach($bubble.removeClass.bind($bubble));
-      this.$overlay.hide();
     }
 
     _showMessageOnCharacterBubble(data) {
@@ -158,7 +161,6 @@ mumuki.load(() => {
       renderer.setDiscussionsLinkHtml($('#mu-kids-discussion-link-html').html());
       renderer.setResponseData(data);
       renderer.render();
-      this.$overlay.show();
     }
 
     _showOnCharacterBubble(data) {

data/app/assets/javascripts/mumuki_laboratory/application/progress.js

@@ -17,7 +17,7 @@ mumuki.progress = (() => {
   function updateWholeProgressBar(f) {
     $('.progress-list-item').each((_, it) => {
       const $anchor = $(it);
-      $anchor.attr('class', f($anchor))
+      $anchor.attr('class', f($anchor));
     });
   }
 

data/app/assets/javascripts/mumuki_laboratory/application/results-renderer.js

@@ -35,6 +35,32 @@ mumuki.renderers.results = (() => {
     }
   }
 
+  /**
+   * @param {SubmissionStatus} status
+   * @param {Boolean} isGamifiedContext
+   * @returns {string}
+   */
+  function translatedTitleHtml(status, isGamifiedContext) {
+    return `
+      <h4 class="text-${classForStatus(status)} %>">
+        <strong><i class="fa-fw fas ${iconForStatus(status)}"></i> ${mumuki.I18n.t(status)}</strong>
+        ${gamifiedContextHtml(isGamifiedContext)}
+      </h4>
+    `
+  }
+
+  /**
+   * @param {Boolean} isGamifiedContext
+   * @returns {string}
+   */
+  function gamifiedContextHtml(isGamifiedContext) {
+    return (!isGamifiedContext) ? '' : `
+      <strong><small class="text-success">
+        <span class="mu-experience"></span>
+      </small></strong>
+    `
+  }
+
 
   /**
    * @param {SubmissionStatus} status
@@ -48,8 +74,9 @@ mumuki.renderers.results = (() => {
   return {
     classForStatus,
     iconForStatus,
-    progressListItemClassForStatus
-  }
+    progressListItemClassForStatus,
+    translatedTitleHtml
+  };
 })();
 
 /** @deprecated use {@code mumuki.renderers.results.classForStatus} instead */

data/app/assets/javascripts/mumuki_laboratory/application/speech-bubble-renderer.js

@@ -20,7 +20,7 @@ mumuki.renderers.speechBubble = (()=> {
 
     _chooseResultItem() {
       if (this._responseStatus() !== 'passed' && this._hasTips()) {
-        this._appendFirstTip()
+        this._appendFirstTip();
       } else if (this._responseStatus() === 'failed') {
         this._appendFirstFailedTestResultSummary();
       } else if (this._responseStatus() === 'passed_with_warnings') {
@@ -29,7 +29,7 @@ mumuki.renderers.speechBubble = (()=> {
     }
 
     _appendFirstFailedTestResultSummary() {
-      const failedTestResult = this._failedTestResults()[0]
+      const failedTestResult = this._failedTestResults()[0];
       if (failedTestResult && failedTestResult.summary) {
         this._appendResultItem(mumuki.renderers.renderSpeechBubbleResultItem(failedTestResult.summary));
       }
@@ -67,7 +67,7 @@ mumuki.renderers.speechBubble = (()=> {
     }
 
     _hasTips() {
-      return this.responseData.tips && this.responseData.tips.length
+      return this.responseData.tips && this.responseData.tips.length;
     }
 
     _failedTestResults() {
@@ -97,7 +97,7 @@ mumuki.renderers.speechBubble = (()=> {
   return {
     SpeechBubbleRenderer,
     renderSpeechBubbleResultItem
-  }
+  };
 })();
 
 /** @deprecated use {@code mumuki.renderers.speechBubble.SpeechBubbleRenderer} instead */

data/app/assets/javascripts/mumuki_laboratory/application/submission.js

@@ -55,8 +55,50 @@ mumuki.submission = (() => {
         this.preventClick();
       }
     }
+
+    solutionSender(bridge, solution) {
+      return bridge._submitSolution(solution);
+    }
+
+    solutionProcessor(bridge, $submissionsResults, solution) {
+      const resultsBox = new ResultsBox($submissionsResults);
+      this.disable();
+      this.setWaitingText();
+      resultsBox.waiting();
+      return this.solutionSender(bridge, solution)
+        .done((data) => resultsBox.success(data, this))
+        .fail(() => resultsBox.error(this))
+        .always((data) => {
+          $(document).renderMuComponents();
+          resultsBox.done(data, this);
+        });
+    }
   }
 
+  class KidsSubmitButton extends SubmitButton {
+
+    wait() {
+      mumuki.kids.showOverlay();
+      super.wait();
+    }
+
+    continue() {
+      mumuki.kids.hideOverlay();
+      super.continue();
+    }
+
+    solutionProcessor(bridge, $submissionsResults, solution) {
+      this.wait();
+      return this.solutionSender(bridge, solution)
+        .then((data) => mumuki.kids.showResult(data))
+        .always((data) => {
+          this.ready(() => {
+            mumuki.kids.restart();
+            this.continue();
+          });
+        });
+    }
+  }
 
   // ==========
   // Processing
@@ -67,14 +109,28 @@ mumuki.submission = (() => {
    * restoring buttons state.
    *
    * The actual implementation of this method depends on contextual {@link _solutionProcessor}, which can
-   * be configured using {@link _registerSolutionProcessor}. Currently there are only two available processors -
-   * {@link _kidsSolutionProcessor} and {@link _classicSolutionProcessor} - which are automatically choosen depending
-   * on the exercise DOM.
+   * be configured using {@link _registerSolutionProcessor}. Currently there are only two available processors
+   * which are automatically choosen depending on the exercise DOM.
    *
    * @param {Submission} solution
   */
   function processSolution(solution) {
-    mumuki.submission._solutionProcessor(solution);
+    return mumuki.submission._solutionProcessor(solution);
+  }
+
+  /**
+   * Just sends solution to the server without any further processing afterwards.
+   *
+   * Consider using {@link processSolution} instead if you want the whole functionality (making buttons wait, sending to server, rendering results,
+   * restoring buttons state).
+   * The implementation of this method isn't contextual, it always sends the solution using bridge module.
+   *
+   * @see mumuki.bridge
+   *
+   * @param {Submission} solution
+   */
+  function sendSolution(solution) {
+    return mumuki.submission._solutionSender(solution);
   }
 
   /**
@@ -84,53 +140,19 @@ mumuki.submission = (() => {
    * and should normally not be called by runners editor, but is exposed
    * for further non-standard customizations.
    *
-   * @param {({solution: object}) => void} processor
+   * @param {SubmitButton} submitButton
+   * @param {$ElementType} $submissionsResults
+   * @param {mumuki.bridge} bridge
    */
-  function _registerSolutionProcessor(processor) {
-    mumuki.submission._solutionProcessor = processor;
-  }
-
-  /** Processor for kids layouts */
-  function _kidsSolutionProcessor(bridge, submitButton) {
-    return (solution) => {
-      submitButton.wait();
-      bridge._submitSolution(solution).always(function (data) {
-        submitButton.ready(() => {
-          mumuki.kids.restart();
-          submitButton.continue();
-        });
-        mumuki.kids.showResult(data);
-      });
-    }
-  }
-
-  /** Processor for non-kids layouts */
-  function _classicSolutionProcessor(bridge, submitButton, resultsBox) {
-    return (solution) => {
-      submitButton.disable();
-      submitButton.setWaitingText();
-      resultsBox.waiting();
-      bridge._submitSolution(solution).done(function (data) {
-        resultsBox.success(data, submitButton);
-      }).fail(function () {
-        resultsBox.error(submitButton);
-      }).always(function (data) {
-        $(document).renderMuComponents();
-        resultsBox.done(data, submitButton);
-      });
-    }
+  function _registerSolutionProcessor(submitButton, $submissionsResults, bridge) {
+    mumuki.submission._solutionSender = submitButton.solutionSender.bind(submitButton, bridge);
+    mumuki.submission._solutionProcessor = submitButton.solutionProcessor.bind(submitButton, bridge, $submissionsResults);
   }
 
   /** Selects the most appropriate solution processor */
   function _selectSolutionProcessor(submitButton, $submissionsResults) {
     const bridge = new mumuki.bridge.Laboratory();
-    let processor;
-    if ($('.mu-kids-exercise').length) {
-      processor = _kidsSolutionProcessor(bridge, submitButton);
-    } else {
-      processor = _classicSolutionProcessor(bridge, submitButton, new ResultsBox($submissionsResults));
-    }
-    mumuki.submission._registerSolutionProcessor(processor);
+    mumuki.submission._registerSolutionProcessor(submitButton, $submissionsResults, bridge);
   }
 
 
@@ -143,8 +165,8 @@ mumuki.submission = (() => {
     if (!$submissionsResults) return;
 
     const $btnSubmit = $('.btn-submit');
-    const submitButton = new SubmitButton($btnSubmit, $('.submission_control'));
-
+    const buttonClass = mumuki.isKidsExercise() ? KidsSubmitButton : SubmitButton;
+    const submitButton = new buttonClass($btnSubmit, $('.submission_control'));
     mumuki.submission._selectSolutionProcessor(submitButton, $submissionsResults);
 
     submitButton.start(() => {
@@ -154,7 +176,6 @@ mumuki.submission = (() => {
     submitButton.checkAttemptsLeft();
   });
 
-
   /**
    * This module contains methods for submitting solution  in at high level, dealing with network communication,
    * and layout-sensitive UI updates. It is intended to be both used internally by standard editors and by runners
@@ -171,10 +192,13 @@ mumuki.submission = (() => {
    */
   return {
     processSolution,
+    sendSolution,
+
     _registerSolutionProcessor,
     _selectSolutionProcessor,
 
     animateTimeoutError,
     SubmitButton,
+    KidsSubmitButton,
   };
 })();