mumuki-laboratory 9.0.3 → 9.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b2e50b039758471cfb6e6ce92b5c72de56a3d6edbcc1ddbcdfd12422b51f34
-  data.tar.gz: 69b54d57063273a7f3dee32e42126eff821332dbe8acec8f8337f91f1b929b90
+  metadata.gz: 22e07e5d159d6e1e49fd972414dc27da7a622885670bd3d4a60695682bd9cdc4
+  data.tar.gz: de76a5fe5a591b7aa2783f83ae0a50e15796ae5ba7cf1852a7bd5896c2f7950f
 SHA512:
-  metadata.gz: 4acb2a84b7b526ceebc4be7daf104e9a9d614c5659ab853da9614b16b1d3caffdc42c2cfce3fcdb22ee69e364d1339405291644dcf8b8f213e3756daf29d11de
-  data.tar.gz: 83e3a2120935b9b87c004d11fbd599ffe3a92093ab2decc2f787a905a4d0c50edb964390275f06452883213d42c03c35832281ad5963340d8f41f5b691b1e23c
+  metadata.gz: 0e00878630e1bb812eafc6ca76e67b71e09a246d379de4c3f8ceca39b3d9cdaf216bc322859a0c90ae313a554dbe54c706742296e9d6a04421534485bced4604
+  data.tar.gz: e529d54a82cba3b40e6642a7f3d4fd4f4bbf211fcceab823b6b255a793df5258389901966319fda2506b28787507d61c4904f556f4ec0f8316bc77bade066eee

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

@@ -20,12 +20,20 @@ mumuki.page.editors = [];
     $("#exercise_language_id").change(updateCodeMirrorLanguage);
   }
 
-  function resetEditor() {
+  function resetSimpleEditor() {
     mumuki.page.dynamicEditors.forEach(function (e) {
       setDefaultContent(e, $('#default_content').val());
     });
   }
 
+  function resetEditor(isMultipleFiles) {
+    if (!isMultipleFiles) {
+      resetSimpleEditor();
+    } else {
+      mumuki.multipleFileEditor.resetEditor();
+    }
+  }
+
   function formatContent() {
     mumuki.page.editors.each(function (_, editor) {
       editor.setSelection({line: 0, ch: 0}, {line: editor.lineCount()});
@@ -87,7 +95,7 @@ mumuki.page.editors = [];
     $('.editor-reset').click(function (event) {
       event.stopPropagation();
       const selection = confirm(this.getAttribute('data-confirm'));
-      if(selection) resetEditor();
+      if (selection) resetEditor($(event.target).parent().data('multiple-files'));
     });
 
     $('.editor-resize').click(function () {

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

@@ -1,9 +1,13 @@
 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');
+  let $newMessagePreview = $('#discussion-new-message-preview');
 
   function createNewMessageEditor() {
-    var $textarea = $("#new-discussion-message");
+    var $textarea = $("#discussion-new-message");
     var textarea = $textarea[0];
     if (!textarea) return;
 
@@ -26,11 +30,11 @@ mumuki.load(() => {
   }
 
   createReadOnlyEditors();
-  createNewMessageEditor();
+  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) {
@@ -44,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));
@@ -67,9 +71,46 @@ mumuki.load(() => {
       const params = new URLSearchParams(location.search);
       elem.is(':checked') ? params.set(key, elem.val()) : params.delete(key);
       location.search = params.toString();
+    },
+    discussionMessagePreview: function (url) {
+      return Forum.tokenRequest({
+        url: url,
+        method: 'GET',
+        processData: false,
+        dataType: 'json',
+        data: new URLSearchParams({ content: editor.getValue() } ),
+        success: function (response) {
+          showPreview(response.preview);
+        },
+        error: function (e) {
+          error = $messagePreviewButton.attr('error-text');
+          showPreview(error);
+        },
+        xhrFields: {withCredentials: true}
+      });
+    },
+    hidePreviewAndShowEditor: function(elem) {
+      togglePreviewAndEditButtons();
+      togglePreviewAndContentMessage();
     }
   };
 
+  function showPreview(preview) {
+    $newMessagePreview.html($.parseHTML(preview));
+    togglePreviewAndEditButtons();
+    togglePreviewAndContentMessage();
+  }
+
+  function togglePreviewAndEditButtons() {
+    $messagePreviewButton.toggleClass('d-none');
+    $messageEditButton.toggleClass('d-none');
+  }
+
+  function togglePreviewAndContentMessage() {
+    $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');
     }
   }
 
@@ -135,6 +135,13 @@ mumuki.load(() => {
       });
     }
 
+    resetEditor() {
+      const defaultContents = this._getDataFromHiddenInput('#multifile-default-content');
+      mumuki.page.editors.each(function (i, editor) {
+        editor.getDoc().setValue(defaultContents[i] ? defaultContents[i].content : '');
+      });
+    }
+
     _addFile() {
       let name = prompt(this.locales.insert_file_name);
       const alreadyExists = this.files.toArray().some(it => it.name === name);
@@ -157,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;
     }
@@ -184,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/organization.js

@@ -0,0 +1,32 @@
+ mumuki.organization = {
+
+  /**
+   * The current organization's id
+   *
+   * @type {number?}
+   * */
+  _id: null,
+
+  /**
+   * The current organization's id
+   *
+   * @type {number?}
+   * */
+  get id() {
+    return this._id;
+  },
+
+  /**
+   * Set global current organization information
+   */
+  load() {
+    const $muOrganizationId = $('#mu-organization-id');
+    if ($muOrganizationId.length) {
+      this._id = $muOrganizationId.val();
+    } else {
+      this._id = null;
+    }
+  }
+};
+
+mumuki.load(() => mumuki.organization.load());

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);
         });
     }