mumuki-laboratory 8.0.0 → 8.2.0

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

@@ -10,7 +10,7 @@ mumuki.load(() => {
 
     initialize() {
       super.initialize();
-      this.$contextModalButton = new mumuki.Button($('#mu-kids-context .mu-kindergarten-modal-button.mu-close'));
+      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);
@@ -29,10 +29,9 @@ mumuki.load(() => {
     // ================
 
     showNonAbortedPopup(data, animation_name) {
-      data.guide_finished_by_solution = false;
       this.$submissionResult.html(data.title_html);
-      this.$resultsModal.find('.modal-content').removeClass().addClass('modal-content').addClass(data.status);
-      super.showNonAbortedPopup(data, animation_name, 1000);
+      this.$resultsModal.find('.modal-content').removeClass().addClass('modal-content kindergarten').addClass(data.status);
+      super.showNonAbortedPopup(data, animation_name);
     }
 
     showAbortedPopup(data) {
@@ -72,6 +71,11 @@ mumuki.load(() => {
     // == Called by the runner ==
     // ==========================
 
+    showResult(data) {
+      data.guide_finished_by_solution = false;
+      super.showResult(data);
+    }
+
     restart() {
       mumuki.presenterCharacter.playAnimation('talk', this.$bubbleCharacterAnimation);
     }
@@ -99,27 +103,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);
           }
         }
-      }
+      };
 
     }
 
@@ -139,56 +143,11 @@ mumuki.load(() => {
           const $hintMedia = $('.mu-kindergarten-hint-media');
           if (!$hintMedia.get(0)) $button.addClass('hidden');
         },
-      }
+      };
     }
 
     get context() {
-      return {
-        showContext() {
-          mumuki.kids.showContext();
-          this._showFirstSlideImage();
-        },
-        nextSlide() {
-          this._clickButton('next');
-        },
-        prevSlide() {
-          this._clickButton('prev');
-        },
-        _imageSlides() {
-          return $('.mu-kindergarten-context-image-slides');
-        },
-        _activeSlideImage() {
-          return this._imageSlides().find('.active');
-        },
-        _clickButton(prevOrNext) {
-          this._activeSlideImage().removeClass('active')[prevOrNext]().addClass('active');
-          this.showNextOrCloseButton();
-          this._hidePreviousButtonIfFirstImage();
-        },
-        showNextOrCloseButton() {
-          const $next = $('.mu-kindergarten-modal-button.mu-next');
-          const $close = $('.mu-kindergarten-modal-button.mu-close');
-          const isLastChild = this._activeSlideImage().is(':last-child');
-          this._addClassIf($next, 'hidden', () => isLastChild);
-          this._addClassIf($close, 'hidden', () => !isLastChild);
-        },
-        _hidePreviousButtonIfFirstImage() {
-          const $prev = $('.mu-kindergarten-modal-button.mu-previous');
-          this._addClassIf($prev, 'hidden', () => this._activeSlideImage().is(':first-child'))
-        },
-        _showFirstSlideImage() {
-          this._imageSlides().find('img').each((i, el) => this._addClassIf($(el), 'active', () => i === 0))
-          this.showNextOrCloseButton();
-          this._hidePreviousButtonIfFirstImage();
-        },
-        _addClassIf(element, clazz, criteria) {
-          if (criteria()) {
-            element.addClass(clazz)
-          } else {
-            element.removeClass(clazz);
-          }
-        }
-      }
+      return new mumuki.ModalCarrousel('.mu-kindergarten-context-image-slides', () => mumuki.kids.showContext());
     }
 
   }

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

@@ -0,0 +1,63 @@
+mumuki.ModalCarrousel = (() => {
+
+  class MuModalCarrousel {
+    constructor(containerSelector, onShow = () => {}) {
+      this.$container = $(containerSelector);
+      this.onShow = onShow;
+    }
+
+    show() {
+      this.onShow();
+      this._showFirstSlide();
+    }
+
+    nextSlide() {
+      this._clickButton('next');
+    }
+
+    prevSlide() {
+      this._clickButton('prev');
+    }
+
+    _activeSlide() {
+      return this.$container.find('.active');
+    }
+
+    _clickButton(prevOrNext) {
+      this._activeSlide().removeClass('active')[prevOrNext]().addClass('active');
+      this.showNextOrCloseButton();
+      this._hidePreviousButtonIfFirstSlide();
+    }
+
+    showNextOrCloseButton() {
+      const $next = $('.mu-kids-modal-button.mu-next');
+      const $close = $('.mu-kids-modal-button.mu-close');
+      const $footer = $('.modal-footer');
+      const isLastChild = this._activeSlide().is(':last-child');
+      this._addClassIf($next, 'hidden', () => isLastChild);
+      this._addClassIf($close, 'hidden', () => !isLastChild);
+      this._addClassIf($footer, 'hidden', () => !isLastChild);
+    }
+
+    _hidePreviousButtonIfFirstSlide() {
+      const $prev = $('.mu-kids-modal-button.mu-previous');
+      this._addClassIf($prev, 'hidden', () => this._activeSlide().is(':first-child'));
+    }
+
+    _showFirstSlide() {
+      this.$container.children().each((i, el) => this._addClassIf($(el), 'active', () => i === 0));
+      this.showNextOrCloseButton();
+      this._hidePreviousButtonIfFirstSlide();
+    }
+
+    _addClassIf(element, clazz, criteria) {
+      if (criteria()) {
+        element.addClass(clazz);
+      } else {
+        element.removeClass(clazz);
+      }
+    }
+  }
+
+  return MuModalCarrousel;
+})();

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/number-counter.js

@@ -0,0 +1,18 @@
+mumuki.animateNumberCounter = (selector, valueTo, seconds = 1) => {
+  const $numberCounter = $(selector);
+
+  if ($numberCounter.text()) return;
+
+  const millis = seconds * 1000;
+  const incrementStep = valueTo / (millis / 10);
+
+  _increment();
+
+  function _increment(initValue = 0, delay = 10) {
+    if (initValue >= valueTo) return;
+    const nextValue = initValue + incrementStep;
+    // TODO: this one should be xp agnostic
+    $numberCounter.text(`+${Math.min(Math.round(nextValue), valueTo)}exp`);
+    setTimeout(() => _increment(nextValue), delay);
+  }
+};

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

@@ -83,7 +83,7 @@ mumuki.load(() => {
             this._$texts.hide();
             this.$characterSpeechBubbleNormal.children('.' + $tab.data('target')).show();
             this._updateSpeechParagraphs();
-          })
+          });
         }
       });
 
@@ -123,8 +123,9 @@ mumuki.load(() => {
       this._showMessageOnCharacterBubble(data);
     }
 
-    onSubmissionResultModalOpen(_data) {
+    onSubmissionResultModalOpen(data) {
       this._showCorollaryCharacter();
+      super.onSubmissionResultModalOpen(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

@@ -49,7 +49,7 @@ mumuki.renderers.results = (() => {
     classForStatus,
     iconForStatus,
     progressListItemClassForStatus
-  }
+  };
 })();
 
 /** @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

@@ -26,7 +26,7 @@ mumuki.submission = (() => {
       this.submissionsResultsArea.html(data.html);
       data.status === 'aborted' ? this.error(submitButton) : submitButton.enable();
       mumuki.updateProgressBarAndShowModal(data);
-      mumuki.gamification._currentLevelProgression.setExpMessage(data.current_exp);
+      mumuki.gamification.currentLevelProgression.setExpMessage(data);
     }
     error(submitButton) {
       this.submissionsResultsArea.html('');
@@ -101,7 +101,7 @@ mumuki.submission = (() => {
         });
         mumuki.kids.showResult(data);
       });
-    }
+    };
   }
 
   /** Processor for non-kids layouts */
@@ -118,7 +118,7 @@ mumuki.submission = (() => {
         $(document).renderMuComponents();
         resultsBox.done(data, submitButton);
       });
-    }
+    };
   }
 
   /** Selects the most appropriate solution processor */

data/app/assets/javascripts/mumuki_laboratory/application/submissions-store.js

@@ -96,7 +96,7 @@ mumuki.SubmissionsStore = (() => {
     _keyFor(exerciseId) {
       return `/exercise/${exerciseId}/submission`;
     }
-  };
+  }();
 
   return SubmissionsStore;
 })();
@@ -106,5 +106,5 @@ mumuki.load(() => {
     if (e.detail[0]) {
       mumuki.SubmissionsStore.clear();
     }
-  })
-})
+  });
+});

data/app/assets/javascripts/mumuki_laboratory/application/sync-mode.js

@@ -65,11 +65,11 @@ mumuki.syncMode = (() => {
 
     /** @type {ClientSyncMode|ServerSyncMode}*/
     _current: null
-  }
+  };
 })();
 
 mumuki.load(() => {
   mumuki.syncMode._selectSyncMode();
   mumuki.syncMode._current.syncProgress();
   mumuki.syncMode._current.syncEditorContent();
-})
+});

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

@@ -16,5 +16,5 @@ mumuki.startTimer = (() => {
       }
     }, intervalDuration);
   }
-  return startTimer
+  return startTimer;
 })();

data/app/assets/stylesheets/mumuki_laboratory/application/_layout.scss

@@ -25,13 +25,13 @@ body {
   margin-bottom: 110px;
 }
 
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  height: 110px;
-  .container {
-    margin-top: 33px;
+.mu-footer {
+  &.container {
+    margin-top: 45px;
+  }
+  .mu-footer-terms {
+    font-size: 15px;
+    text-align: center;
   }
 }