mumuki-laboratory 9.0.6 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1923025a623999bd5e8c2c802f024660f71d980865e5b436cfdf7ee27a361445
-  data.tar.gz: 368eace9064bfe944f5abecce4f36c5b5f55e15f08f3d7ee949eca7033adb0c2
+  metadata.gz: 42ddcb38b3d3ff241bc81dd9b18c22afaf7a2078d3064e5e9e888155b3e16226
+  data.tar.gz: 0b244643dd954e25ca038c79d71fb79cf58a5bffd915d8824ac72ccaf49a920d
 SHA512:
-  metadata.gz: 126c58ab5c3d42c0055c85886cfdb49ae6714b797c7b2fb206417f97cdfd3bf3edd14bd66f268acc1ad79fcb1f6fa659073522a8ed91726ceda9a84fbee7b4a2
-  data.tar.gz: 43e8f6368254c0dff68d2194a68d7a4511c2732226463d1a77ba6e0cfe76b6b0ee0610a096480fc116ad8feec491a457657296316ab2b4e6039e72b5ec7883d3
+  metadata.gz: 52ec0f9e2703a88efe4949706020b6bb83516252ab389faecd8c838ce6094faa40149bdb7d5573d95b9ad9e6d7909bd0b3f03cd0f3787925f6e37eebfd5bed6b
+  data.tar.gz: 6b7412a1b79947d6426f43edb5f5c50163671658227281aa94676b77abf870f1695925310a64dfa5a9d37f13f797dd4f96587c19922c28f8d043dd6c7982d708

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

@@ -1,6 +1,6 @@
 mumuki.load(() => {
-  var $subscriptionSpans = $('.discussion-subscription > span');
-  var $upvoteSpans = $('.discussion-upvote > span');
+  var $subscriptionButtons = $('.discussion-subscription > button');
+  var $upvoteButtons = $('.discussion-upvote > button');
   let $messagePreviewButton = $('.discussion-new-message-preview-button.preview');
   let $messageEditButton = $('.discussion-new-message-preview-button.edit');
   let $newMessageContent = $('.discussion-new-message-content');
@@ -33,8 +33,8 @@ mumuki.load(() => {
   let editor = createNewMessageEditor();
 
   var Forum = {
-    toggleButton: function (spans) {
-      spans.toggleClass('hidden');
+    toggleButton: function (elements) {
+      elements.toggleClass('d-none');
     },
     token: new mumuki.CsrfToken(),
     tokenRequest: function (data) {
@@ -48,10 +48,10 @@ mumuki.load(() => {
       });
     },
     discussionSubscription: function (url) {
-      Forum.discussionPostAndToggle(url, $subscriptionSpans);
+      Forum.discussionPostAndToggle(url, $subscriptionButtons);
     },
     discussionUpvote: function (url) {
-      Forum.discussionPostAndToggle(url, $upvoteSpans);
+      Forum.discussionPostAndToggle(url, $upvoteButtons);
     },
     discussionPostAndToggle: function (url, elem) {
       Forum.discussionPost(url).done(Forum.toggleButton(elem));
@@ -102,13 +102,13 @@ mumuki.load(() => {
   }
 
   function togglePreviewAndEditButtons() {
-    $messagePreviewButton.toggleClass('hidden');
-    $messageEditButton.toggleClass('hidden');
+    $messagePreviewButton.toggleClass('d-none');
+    $messageEditButton.toggleClass('d-none');
   }
 
   function togglePreviewAndContentMessage() {
-    $newMessagePreview.toggleClass('hidden');
-    $newMessageContent.toggleClass('hidden');
+    $newMessagePreview.toggleClass('d-none');
+    $newMessageContent.toggleClass('d-none');
   }
 
   mumuki.Forum = Forum;

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

@@ -82,11 +82,11 @@ mumuki.gamification = (() => {
 
     defaultGainedExperienceAction() {
       $('#mu-exp-points').html(this.lastEarnedExp);
-      $('#mu-exp-earned-message').removeClass('hidden');
+      $('#mu-exp-earned-message').removeClass('d-none');
     }
 
     defaultLevelUpAction(_levelUpHtml) {
-      $('#mu-level-up').modal();
+      new bootstrap.Modal('#mu-level-up').show();
     }
 
     registerLevelUpAction(action) {
@@ -118,7 +118,7 @@ mumuki.gamification = (() => {
     updateTooltip() {
       const $muLevelTooltip = $('.mu-level-tooltip');
 
-      $muLevelTooltip.attr("data-original-title", `${$muLevelTooltip.attr("level")} ${this.currentLevel()}`);
+      $muLevelTooltip.attr("data-bs-original-title", `${$muLevelTooltip.attr("level")} ${this.currentLevel()}`);
       $muLevelTooltip.attr("title", "");
     }
 

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

@@ -51,10 +51,13 @@ mumuki.Kids = class {
   }
 
   showContext() {
-    this.$contextModal.modal({
-      backdrop: 'static',
-      keyboard: false
-    });
+    let context = document.getElementById('mu-kids-context');
+    if (context) {
+      new bootstrap.Modal(context, {
+        backdrop: 'static',
+        keyboard: false
+      }).show();
+    }
   }
 
   showNonAbortedPopup(data, animation_name, open_modal_delay_ms = 0) {
@@ -66,7 +69,7 @@ mumuki.Kids = class {
 
   showAbortedPopup(_data) {
     this.submitButton.disable();
-    this.$resultsAbortedModal.modal();
+    new bootstrap.Modal(document.getElementById('kids-results-aborted')).show();
   }
 
   showOverlay() {
@@ -114,11 +117,12 @@ mumuki.Kids = class {
   // =================
 
   _openSubmissionResultModal(data) {
-    this.$resultsModal.modal({ backdrop: 'static', keyboard: false });
+    let modal = new bootstrap.Modal(document.getElementById('kids-results'), { backdrop: 'static', keyboard: false });
+    modal.show();
     this.$resultsModal.find('.modal-header').first().html(data.title_html);
     mumuki.gamification.currentLevelProgression.setExpMessage(data);
     this.$resultsModal.find('.modal-footer').first().html(data.button_html);
-    $('.mu-close-modal').click(() => this.$resultsModal.modal('hide'));
+    $('.mu-close-modal').click(() => modal.hide());
     this.onSubmissionResultModalOpen(data);
   }
 

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

@@ -116,8 +116,8 @@ mumuki.load(() => {
         _action(add, remove, isPlaying, callback) {
           callback(window.speechSynthesis);
           const $button = $('.mu-kindergarten-play-description');
-          $button.find(`.mu-kindergarten-${add}`).addClass('hidden');
-          $button.find(`.mu-kindergarten-${remove}`).removeClass('hidden');
+          $button.find(`.mu-kindergarten-${add}`).addClass('d-none');
+          $button.find(`.mu-kindergarten-${remove}`).removeClass('d-none');
           this._isPlaying = isPlaying;
         },
         verifyBrowserSupport() {
@@ -146,7 +146,7 @@ mumuki.load(() => {
         showOrHideExpandHintButton() {
           const $button = $('.expand-or-collapse-hint-media');
           const $hintMedia = $('.mu-kindergarten-hint-media');
-          if (!$hintMedia.get(0)) $button.addClass('hidden');
+          if (!$hintMedia.get(0)) $button.addClass('d-none');
         },
       };
     }

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

@@ -10,12 +10,12 @@ mumuki.load(() => {
       return Chat.$newMessageModal().find('.modal-body, .modal-footer');
     },
     collapseNewMessageModal: function () {
-      Chat.$newMessageModalComponents().toggleClass('hidden');
+      Chat.$newMessageModalComponents().toggleClass('d-none');
     },
     token: new mumuki.CsrfToken(),
     setMessages: function (data) {
       $('.badge-notifications').html(data.messages_count);
-      $('.notifications-box').toggleClass('notifications-box-empty', !data.has_messages);
+      $('.notifications-box').toggleClass('d-none', !data.has_messages);
       $('.pending-messages-filter').removeClass('pending-messages-filter');
       $('button.btn-submit').removeClass('disabled');
       $('.pending-messages-text').remove();
@@ -53,7 +53,7 @@ mumuki.load(() => {
       function renderHTML(data) {
         $container.empty();
         $container.html(data);
-        $("a[data-target='#messages']").click();
+        $("a[data-bs-target='#messages']").click();
       }
 
       function success(data) {

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

@@ -34,14 +34,14 @@ mumuki.ModalCarrousel = (() => {
       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);
+      this._addClassIf($next, 'd-none', () => isLastChild);
+      this._addClassIf($close, 'd-none', () => !isLastChild);
+      this._addClassIf($footer, 'd-none', () => !isLastChild);
     }
 
     _hidePreviousButtonIfFirstSlide() {
       const $prev = $('.mu-kids-modal-button.mu-previous');
-      this._addClassIf($prev, 'hidden', () => this._activeSlide().is(':first-child'));
+      this._addClassIf($prev, 'd-none', () => this._activeSlide().is(':first-child'));
     }
 
     _showFirstSlide() {

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

@@ -28,7 +28,7 @@ mumuki.load(() => {
     }
 
     get isSelected() {
-      return this.tab.hasClass("active");
+      return this.tab.children().first().hasClass("active");
     }
 
     setUpOnRemove(handler) {
@@ -58,12 +58,12 @@ mumuki.load(() => {
 
     _selectElement(element) {
       element.addClass('active');
-      element.addClass('in');
+      element.addClass('show');
     }
 
     _unselectElement(element) {
       element.removeClass('active');
-      element.removeClass('in');
+      element.removeClass('show');
     }
   }
 
@@ -138,7 +138,7 @@ mumuki.load(() => {
     resetEditor() {
       const defaultContents = this._getDataFromHiddenInput('#multifile-default-content');
       mumuki.page.editors.each(function (i, editor) {
-        editor.getDoc().setValue(defaultContents[i].content);
+        editor.getDoc().setValue(defaultContents[i] ? defaultContents[i].content : '');
       });
     }
 
@@ -164,14 +164,18 @@ mumuki.load(() => {
       const previousIndex = Math.max(index - 1, 0);
 
       const wasSelected = file.remove();
-      if (wasSelected) this.files[previousIndex].select();
+      if (wasSelected) {
+        this.tabs.children()[previousIndex].click();
+      }
 
       this.updateButtonsVisibility();
     }
 
     _createTab(name, id) {
       const tab = this.tabs.last().clone();
-      tab.attr('data-target', `#${id}`);
+      let link = tab.children().first();
+      link.attr('data-bs-target', `#${id}`);
+      link.removeClass('active');
 
       return tab;
     }
@@ -191,6 +195,8 @@ mumuki.load(() => {
         .setupLanguage(highlightMode)
         .build();
 
+      mumuki.page.editors.push(codeMirrorEditor);
+
       codeMirrorEditor.on("change", (event) => {
         textarea.val(event.getValue());
       });

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

@@ -60,7 +60,7 @@ mumuki.MultipleScenarios = (() => {
       this.createControls();
       this.createIndicators();
       this.setActiveIndex(0);
-      $('.mu-scenario-control').removeClass('hidden');
+      $('.mu-scenario-control').removeClass('d-none');
     }
 
     validScenarioIndex (index) {

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

@@ -79,12 +79,12 @@ mumuki.load(() => {
 
       this._$speechTabs.each((i) => {
         const $tab = $(this._$speechTabs[i]);
-        if ($tab.data('target')) {
+        if ($tab.data('bs-target')) {
           $tab.click(() => {
             this._$speechTabs.removeClass('active');
             $tab.addClass('active');
             this._$texts.hide();
-            this.$characterSpeechBubbleNormal.children('.' + $tab.data('target')).show();
+            this.$characterSpeechBubbleNormal.children('.' + $tab.data('bs-target')).show();
             this._updateSpeechParagraphs();
           });
         }
@@ -151,7 +151,7 @@ mumuki.load(() => {
       const $bubble = this.$characterSpeechBubble;
       $bubble.find('.mu-kids-character-speech-bubble-tabs').show();
       $bubble.find('.mu-kids-character-speech-bubble-normal').show();
-      $bubble.find('.mu-kids-character-speech-bubble-failed').hide();
+      $bubble.find('.mu-kids-character-speech-bubble-failed').addClass('d-none').removeClass('d-block');
       $bubble.find('.mu-kids-discussion-link').remove();
       Object.keys(this.resultActions).forEach($bubble.removeClass.bind($bubble));
     }
@@ -225,7 +225,7 @@ mumuki.load(() => {
     }
 
     _getSelectedTabName() {
-      return this._$speechTabs.filter('.active').data('target') || 'description';
+      return this._$speechTabs.filter('.active').data('bs-target') || 'description';
     }
 
   }

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

@@ -72,12 +72,6 @@ mumuki.load(function() {
     form.append(`<input type="hidden" name="user[avatar_type]" value="${type}"/>`);
   }
 
-  $("#mu-edit-avatar-icon").on('keypress click', function(e) {
-    onClickOrSpacebarOrEnter($(this), e, function() {
-      $avatarPicker.modal();
-    });
-  });
-
   function onClickOrSpacebarOrEnter(element, e, func) {
     if (e.which === 13 || e.which === 32 || e.type === 'click') {
       func.apply(element);

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

@@ -6,7 +6,7 @@ mumuki.progress = (() => {
    * */
   function updateProgressBarAndShowModal(data) {
     $('.progress-list-item.active').attr('class', data.class_for_progress_list_item);
-    if(data.guide_finished_by_solution) $('#guide-done').modal();
+    if(data.guide_finished_by_solution) new bootstrap.Modal('#guide-done').show();
   }
 
   /**

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

@@ -87,7 +87,7 @@ mumuki.renderers.speechBubble = (()=> {
     render() {
       this.$bubble.find('.mu-kids-character-speech-bubble-tabs').hide();
       this.$bubble.find('.mu-kids-character-speech-bubble-normal').hide();
-      this.$failedArea.show().html(this.responseData.title_html);
+      this.$failedArea.removeClass('d-none').addClass('d-block').html(this.responseData.title_html);
       this._addClass(this._responseStatus());
       this._chooseResultItem();
       this._appendDiscussionsLinkHtml();

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

@@ -20,7 +20,7 @@ mumuki.submission = (() => {
     }
     waiting() {
       this.submissionsResultsArea.html(this.processingTemplate.html());
-      this.submissionsErrorTemplate.hide();
+      this.submissionsErrorTemplate.addClass('d-none');
     }
     success(data, submitButton) {
       this.submissionsResultsArea.html(data.html);
@@ -30,7 +30,8 @@ mumuki.submission = (() => {
     }
     error(submitButton) {
       this.submissionsResultsArea.html('');
-      this.submissionsErrorTemplate.show();
+      this.submissionsErrorTemplate.addClass('d-block');
+      this.submissionsErrorTemplate.removeClass('d-none');
       animateTimeoutError(submitButton);
     }
     done(data, submitButton) {
@@ -69,7 +70,7 @@ mumuki.submission = (() => {
         .done((data) => resultsBox.success(data, this))
         .fail(() => resultsBox.error(this))
         .always((data) => {
-          $(document).renderMuComponents();
+          $(document).renderMuComponents({ webBrowser: { allowScript: true } });
           resultsBox.done(data, this);
         });
     }

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

@@ -0,0 +1,3 @@
+mumuki.load(() => {
+  document.querySelectorAll('.toast').forEach((toast) => new bootstrap.Toast(toast).show());
+});

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

@@ -1,3 +1,3 @@
 mumuki.load(() => {
-    $('[title]').tooltip();
+  document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach((tooltip) => new bootstrap.Tooltip(tooltip));
 });

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

@@ -35,14 +35,14 @@ mumuki.upload = (() => {
     }
 
     showFileExceedsMaxSize() {
-      this.$uploadFileLimitExceeded.removeClass('hidden');
+      this.$uploadFileLimitExceeded.removeClass('d-none');
       this.$uploadLabel.text(this.$uploadLabelText);
       this.$uploadIcon.addClass('fa-upload').removeClass('fa-file-alt');
       this.$btnSubmit.addClass('disabled');
     }
 
     allowSubmissionFor(filename) {
-      this.$uploadFileLimitExceeded.addClass('hidden');
+      this.$uploadFileLimitExceeded.addClass('d-none');
       this.$uploadLabel.text(filename);
       this.$uploadIcon.removeClass('fa-upload').addClass('fa-file-alt');
       this.$btnSubmit.removeClass('disabled');

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

@@ -8,7 +8,6 @@ $da-font-path: asset-path('assets');
 @import "application/vendor";
 @import "application/locked";
 @import "application/tooltip";
-@import "application/hovers";
 @import "application/mixins";
 @import "application/layout";
 @import "application/invitations";

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

@@ -19,7 +19,7 @@
         width: calc(100%);
         object-position: 50% 50%;
         overflow: hidden;
-        @media (max-width: $screen-lg) {
+        @include media-breakpoint-down(xl) {
           object-fit: none;
         }
       }

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

@@ -1,8 +1,3 @@
-html {
-  position: relative;
-  min-height: 100%;
-}
-
 .navbar-brand {
   padding-top: 0;
   padding-bottom: 0;
@@ -21,10 +16,6 @@ html {
   }
 }
 
-body {
-  margin-bottom: 110px;
-}
-
 .mu-footer {
   &.container {
     margin-top: 45px;
@@ -76,17 +67,12 @@ body {
 
 .editor-tab {
   padding: 5px 10px 5px 10px !important;
-  cursor: pointer;
 }
 
 .mu-input-panel {
   margin-top: 5px;
 }
 
-h1 {
-  margin-top: 10px;
-}
-
 .text-box {
   text-align: justify;
 
@@ -123,16 +109,8 @@ hr {
 /* TODO: move to mumuki-styles */
 .mu-inline-block-left {
   display: flex;
+  flex-grow: 1;
   align-items: center;
-
-  margin-left: 15px;
-}
-
-.mu-inline-block-right {
-  float: right !important;
-  display: inline-block;
-  margin-right: 15px;
-  margin-left: 10px;
 }
 
 .mu-org-link {
@@ -147,7 +125,3 @@ hr {
     padding: 0;
   }
 }
-
-h3 {
-  margin-top: 20px;
-}