RubyGems - mumuki-laboratory - Versions diffs - 7.7.6 → 7.10.0 - Mend

mumuki-laboratory 7.7.6 → 7.10.0

Files changed (92) hide show

data/app/assets/javascripts/mumuki_laboratory/application/inputs.js CHANGED

@@ -1,12 +1,14 @@
-(() => {
+mumuki.onInputsReady = (() => {
   // Declares a `document.ready` handler that will be
   // activated only when there is at least one element that match
   // the given selector
-	mumuki.onInputsReady = (inputsSelector, callback) => {
+	function onInputsReady(inputsSelector, callback) {
 		$(document).ready((event) => {
 			if ($(inputsSelector).length === 0) return;
 			callback(event);
 		})
 	}
+	return onInputsReady;
 })();

data/app/assets/javascripts/mumuki_laboratory/application/interval.js CHANGED

@@ -1,6 +1,4 @@
-var mumuki = mumuki || {};
-(function (mumuki) {
+(function () {
   // When using Turbolinks, intervals loaded inside <body> aren't destroyed on page changes
   // Use this function instead if you want the behaviour of a regular setInterval
   mumuki.setInterval = function (intervalFunction, milliseconds) {
@@ -14,4 +12,4 @@ var mumuki = mumuki || {};
     return interval;
   }.bind(this);
-}(mumuki));
+}());

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

@@ -1,4 +1,4 @@
-mumuki.load(function () {
+mumuki.load(() => {
   let $bubble = $('.mu-kids-character-speech-bubble').children('.mu-kids-character-speech-bubble-normal');
   let availableTabs = ['.description', '.hint'];

data/app/assets/javascripts/mumuki_laboratory/application/load-analytics.js CHANGED

@@ -1,4 +1,4 @@
-mumuki.load(function(){
+mumuki.load(() => {
   ga('create', 'UA-58353823-1', 'auto');
   ga('send', 'pageview');
 });

data/app/assets/javascripts/mumuki_laboratory/application/load-error-svg.js CHANGED

@@ -1,4 +1,4 @@
-mumuki.load(function () {
+mumuki.load(() => {
   var error_svgs = ['403', '404', '500', 'timeout_1', 'timeout_2', 'timeout_3'];
   mumuki.errors = mumuki.errors || {};

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

@@ -1,4 +1,4 @@
-mumuki.load(function () {
+mumuki.load(() => {
   var Chat = {
     $body: function () {
       return $('body')
@@ -61,7 +61,7 @@ mumuki.load(function () {
         Chat.readMessages(readUrl);
       }
-      function error(xhr) {
+      function error(_xhr) {
         Chat.tokenRequest({
           url: errorUrl,
           success: renderHTML,

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

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

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

@@ -1,6 +1,4 @@
-var mumuki = mumuki || {};
-(function (mumuki) {
+mumuki.MultipleScenarios = (() => {
   const setControlVisibility = function ($control, visible) {
     visible ? $control.show() : $control.hide();
@@ -147,6 +145,5 @@ var mumuki = mumuki || {};
     }
   }
-  mumuki.MultipleScenarios = MultipleScenarios;
-}(mumuki));
+  return MultipleScenarios;
+})();

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

@@ -1,12 +1,10 @@
-var mumuki = mumuki || {};
-(function (mumuki) {
+mumuki.pin = (() => {
   function smoothScrollToElement(domElement) {
     var SPEED = 1000;
     $('html, body').animate({scrollTop: domElement.offset().top}, SPEED);
   }
-  mumuki.pin = {
+  return {
     scroll: function () {
       var scrollPin = $('.scroll-pin');
       if (scrollPin.length) {
@@ -14,4 +12,4 @@ var mumuki = mumuki || {};
       }
     }
   }
-})(mumuki);
+})();

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

@@ -0,0 +1,71 @@
+mumuki.load(function() {
+  let $userForm = $("#mu-user-form");
+  let $userAvatar = $('#mu-user-avatar');
+  let $editButton = $('#mu-edit-profile-btn');
+  let $avatarPicker = $('#mu-avatar-picker');
+  let $avatarItem = $('.mu-avatar-item');
+  let userImage = "";
+  let avatarId = "";
+  let originalData = $userForm.serialize();
+  let originalProfilePicture = $userAvatar.attr('src');
+  $userForm.on('change keyup', function() {
+    toggleEditButtonIfThereAreChanges();
+  });
+  $avatarItem.on('click', function() {
+    $userAvatar.attr('src', $(this).attr('src'));
+    $avatarPicker.modal('hide');
+    const clickedAvatarId = $(this).attr('mu-avatar-id');
+    avatarId = clickedAvatarId || "";
+    toggleEditButtonIfThereAreChanges();
+  });
+  function toggleEditButtonIfThereAreChanges() {
+    let shouldEnable = requiredFieldsAreFilled() && (dataChanged() || avatarChanged());
+    $editButton.prop('disabled', !shouldEnable);
+  }
+  const requiredFieldsAreFilled = () =>
+    $userForm.find('select, textarea, input').toArray().every(elem => {
+      const $elem = $(elem);
+      return !($elem.prop('required')) || !!$elem.val();
+    });
+  const dataChanged = () => $userForm.serialize() !== originalData;
+  const avatarChanged = () => $userAvatar.attr('src') !== originalProfilePicture;
+  $('#mu-user-image').on('click', function(){
+    userImage = $userAvatar.attr('src');
+  });
+  $userForm.on('submit', function(){
+    if (userImage) {
+      setImageUrl($(this), userImage);
+      setAvatarId($(this), "");
+    }
+    if (avatarId) {
+      setAvatarId($(this), avatarId);
+    }
+  });
+  function setImageUrl(form, url) {
+    form.append(`<input type="hidden" name="user[image_url]" value="${url}"/>`);
+  }
+  function setAvatarId(form, id) {
+    form.append(`<input type="hidden" name="user[avatar_id]" value=${id}/>`);
+  }
+  $("#mu-edit-avatar-icon").on('click', function(){
+    $avatarPicker.modal();
+  });
+});

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

@@ -1,13 +1,31 @@
-var mumuki = mumuki || {};
-(function (mumuki) {
+mumuki.progress = (() => {
   /**
    * Updates the current exercise progress indicator
+   *
+   * @param {SubmissionResult} data
    * */
-  mumuki.updateProgressBarAndShowModal = function (data) {
+  function updateProgressBarAndShowModal(data) {
     $('.progress-list-item.active').attr('class', data.class_for_progress_list_item);
     if(data.guide_finished_by_solution) $('#guide-done').modal();
+  }
+  /**
+   * Update all links in the progress bar with the given function
+   *
+   * @param {(anchor: JQuery) => string} f
+   */
+  function updateWholeProgressBar(f) {
+    $('.progress-list-item').each((_, it) => {
+      const $anchor = $(it);
+      $anchor.attr('class', f($anchor))
+    });
+  }
+  return {
+    updateProgressBarAndShowModal,
+    updateWholeProgressBar
   };
+})();
-})(mumuki);
+/** @deprecated use {@code mumuki.progress.updateProgressBarAndShowModal} instead */
+mumuki.updateProgressBarAndShowModal = mumuki.progress.updateProgressBarAndShowModal;

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

@@ -1,4 +1,6 @@
-(() => {
+mumuki.renderers = mumuki.renderers || {};
+mumuki.renderers.results = (() => {
   // ==========================
   // View function for building
@@ -6,7 +8,7 @@
   // ==========================
   /**
-   * @param {string} status
+   * @param {SubmissionStatus} status
    * @returns {string}
    */
   function iconForStatus(status) {
@@ -20,8 +22,7 @@
   }
   /**
-   *
-   * @param {string} status
+   * @param {SubmissionStatus} status
    * @returns {string}
    */
   function classForStatus(status) {
@@ -32,20 +33,28 @@
       case "passed":               return "success";
       case "pending":              return "muted";
     }
-  };
+  }
   /**
-   * @param {string} status
+   * @param {SubmissionStatus} status
    * @param {boolean} [active]
    * @returns {string}
    */
   function progressListItemClassForStatus(status, active = false) {
     return `progress-list-item text-center ${classForStatus(status)} ${active ? 'active' : ''}`;
-  };
+  }
-  mumuki.renderers = mumuki.renderers || {};
-  mumuki.renderers.classForStatus = classForStatus;
-  mumuki.renderers.iconForStatus = iconForStatus;
-  mumuki.renderers.progressListItemClassForStatus = progressListItemClassForStatus;
+  return {
+    classForStatus,
+    iconForStatus,
+    progressListItemClassForStatus
+  }
 })();
+/** @deprecated use {@code mumuki.renderers.results.classForStatus} instead */
+mumuki.renderers.classForStatus = mumuki.renderers.results.classForStatus;
+/** @deprecated use {@code mumuki.renderers.results.iconForStatus} instead */
+mumuki.renderers.iconForStatus = mumuki.renderers.results.iconForStatus;
+/** @deprecated use {@code mumuki.renderers.results.progressListItemClassForStatus} instead */
+mumuki.renderers.progressListItemClassForStatus = mumuki.renderers.results.progressListItemClassForStatus;

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

@@ -1,4 +1,5 @@
-((mumuki)=> {
+mumuki.renderers = mumuki.renderers || {};
+mumuki.renderers.speechBubble = (()=> {
   function renderSpeechBubbleResultItem(item) {
     return `
@@ -93,7 +94,13 @@
     }
   }
-  mumuki.renderers = mumuki.renderers || {};
-  mumuki.renderers.SpeechBubbleRenderer = SpeechBubbleRenderer;
-  mumuki.renderers.renderSpeechBubbleResultItem = renderSpeechBubbleResultItem;
-})(mumuki)
+  return {
+    SpeechBubbleRenderer,
+    renderSpeechBubbleResultItem
+  }
+})();
+/** @deprecated use {@code mumuki.renderers.speechBubble.SpeechBubbleRenderer} instead */
+mumuki.renderers.SpeechBubbleRenderer = mumuki.renderers.speechBubble.SpeechBubbleRenderer;
+/** @deprecated use {@code mumuki.renderers.speechBubble.renderSpeechBubbleResultItem} instead */
+mumuki.renderers.renderSpeechBubbleResultItem = mumuki.renderers.speechBubble.renderSpeechBubbleResultItem;

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

@@ -1,6 +1,4 @@
-var mumuki = mumuki || {};
-(function (mumuki) {
+mumuki.submission = (() => {
   // =============
   // UI Components
@@ -14,32 +12,31 @@ var mumuki = mumuki || {};
       .play();
   }
-  function ResultsBox(submissionsResults) {
-    this.submissionsResultsArea = submissionsResults;
-    this.processingTemplate = $('#processing-template');
-    this.submissionsErrorTemplate = $(".submission-result-error");
-  }
-  ResultsBox.prototype = {
-    waiting: function () {
+  class ResultsBox {
+    constructor(submissionsResults) {
+      this.submissionsResultsArea = submissionsResults;
+      this.processingTemplate = $('#processing-template');
+      this.submissionsErrorTemplate = $(".submission-result-error");
+    }
+    waiting() {
       this.submissionsResultsArea.html(this.processingTemplate.html());
       this.submissionsErrorTemplate.hide();
-    },
-    success: function (data, submitButton) {
+    }
+    success(data, submitButton) {
       this.submissionsResultsArea.html(data.html);
       data.status === 'aborted' ? this.error(submitButton) : submitButton.enable();
       mumuki.updateProgressBarAndShowModal(data);
-    },
-    error: function (submitButton) {
+    }
+    error(submitButton) {
       this.submissionsResultsArea.html('');
       this.submissionsErrorTemplate.show();
       animateTimeoutError(submitButton);
-    },
-    done: function (data, submitButton) {
+    }
+    done(data, submitButton) {
       submitButton.updateAttemptsLeft(data);
       mumuki.pin.scroll();
     }
-  };
+  }
   class SubmitButton extends mumuki.Button {
@@ -59,78 +56,6 @@ var mumuki = mumuki || {};
     }
   }
-  // ============
-  // Content Sync
-  // ============
-  /**
-   * Syncs and returns the content objects of the standard editor form
-   *
-   * This content object may include keys like {@code content},
-   * {@code content_extra} and {@code content_test}
-   *
-   * @returns {EditorProperty[]}
-   */
-  function getStandardEditorContents() {
-    mumuki.submission._syncContent();
-    return $('.new_solution').serializeArray();
-  }
-  /**
-   * Answers a content object with a key for each of the current
-   * editor sources.
-   *
-   * This method will use CustomEditor's sources if availble, or
-   * standard editor's content sources otherwise
-   */
-  function getContent() {
-    let content = {};
-    let contents;
-    if (mumuki.CustomEditor.hasSources) {
-      contents = mumuki.CustomEditor.getContents();
-    } else {
-      contents = mumuki.submission.getStandardEditorContents();
-    }
-    contents.forEach((it) => {
-      content[it.name] = it.value;
-    });
-    return content;
-  }
-  /**
-   * Copies current solution from it native rendering components
-   * to the appropriate submission form elements.
-   *
-   * Both editors and runners with a custom editor that don't register a source should
-   * register its own syncer function in order to {@link syncContent} work properly.
-   *
-   * @see registerContentSyncer
-   * @see CustomEditor#addSource
-   */
-  function _syncContent() {
-    if (mumuki.submission._contentSyncer) {
-      mumuki.submission._contentSyncer();
-    }
-  }
-  /**
-   * Sets a content syncer, that will be used by {@link _syncContent}
-   * in ordet to dump solution into the submission form fields.
-   *
-   * Each editor should have its own syncer registered - otherwise previous or none may be used
-   * causing unpredicatble behaviours - or cleared by passing {@code null}.
-   *
-   * As a particular case, runners with custom editors that don't add sources using {@link CustomEditor#addSource}
-   * should set the {@code #mu-custom-editor-value} value within its syncer.
-   *
-   * @param {() => void} [syncer] the syncer, or null, if no sync'ing is needed
-   */
-  function registerContentSyncer(syncer = null) {
-    mumuki.submission._contentSyncer = syncer;
-  }
   // ==========
   // Processing
@@ -212,7 +137,7 @@ var mumuki = mumuki || {};
   // Entry Point
   // ===========
-  mumuki.load(function () {
+  mumuki.load(() => {
     var $submissionsResults = $('.submission-results');
     if (!$submissionsResults) return;
@@ -222,8 +147,7 @@ var mumuki = mumuki || {};
     mumuki.submission._selectSolutionProcessor(submitButton, $submissionsResults);
     submitButton.start(() => {
-      var solution = mumuki.submission.getContent();
-      mumuki.submission.processSolution(solution);
+      mumuki.submission.processSolution(mumuki.editors.getSubmission());
     });
     submitButton.checkAttemptsLeft();
@@ -244,18 +168,12 @@ var mumuki = mumuki || {};
    *
    * @module mumuki.submission
    */
-  mumuki.submission = {
+  return {
     processSolution,
     _registerSolutionProcessor,
     _selectSolutionProcessor,
-    _syncContent,
-    registerContentSyncer,
-    getStandardEditorContents,
-    getContent,
     animateTimeoutError,
     SubmitButton,
   };
-})(mumuki);
+})();