Merge branch 'MDL-82909' of https://github.com/paulholden/moodle

lib/amd/src/inplace_editable.js

@@ -36,14 +36,14 @@ define(
         'core/config',
         'core/url',
         'core/form-autocomplete',
+        'core/loadingicon',
         'core/pending',
         'core/local/inplace_editable/events',
     ],
-    function($, ajax, templates, notification, str, cfg, url, autocomplete, Pending, Events) {
+    function($, ajax, templates, notification, str, cfg, url, autocomplete, LoadingIcon, Pending, Events) {
 
         const removeSpinner = function(element) {
-            element.removeClass('updating');
-            element.find('img.spinner').hide();
+            element.find('.loading-icon').hide();
         };
 
         /**
@@ -61,9 +61,10 @@ define(
                 mainelement.attr('data-component'),
                 mainelement.attr('data-itemtype'),
             ].join('-');
-            var pendingPromise = new Pending(pendingId);
 
-            addSpinner(mainelement);
+            var pendingPromise = new Pending(pendingId);
+            LoadingIcon.addIconToContainerRemoveOnCompletion(mainelement, pendingPromise);
+
             ajax.call([{
                 methodname: 'core_update_inplace_editable',
                 args: {
@@ -104,20 +105,6 @@ define(
                 });
         };
 
-        const addSpinner = function(element) {
-            element.addClass('updating');
-            var spinner = element.find('img.spinner');
-            if (spinner.length) {
-                spinner.show();
-            } else {
-                spinner = $('<img/>')
-                    .attr('src', url.imageUrl('i/loading_small'))
-                    .addClass(['spinner', 'icon'])
-                    ;
-                element.append(spinner);
-            }
-        };
-
         $('body').on('click keypress', '[data-inplaceeditable] [data-inplaceeditablelink]', function(e) {
             if (e.type === 'keypress' && e.keyCode !== 13) {
                 return;

theme/boost/scss/moodle/tables.scss

@@ -71,7 +71,7 @@ table {
     }
 }
 
-.table-dynamic .loading-icon {
+.table-dynamic > .loading-icon {
     position: absolute;
     left: calc(50% - 1.5rem);
     top: 200px;

theme/boost/style/moodle.css

@@ -35558,12 +35558,12 @@ table .sticky-column {
   background-color: inherit;
 }
 
-.table-dynamic .loading-icon {
+.table-dynamic > .loading-icon {
   position: absolute;
   left: calc(50% - 1.5rem);
   top: 200px;
 }
-.table-dynamic .loading-icon .icon {
+.table-dynamic > .loading-icon .icon {
   max-height: 3rem;
   max-width: 3rem;
   font-size: 3rem;

theme/classic/style/moodle.css

@@ -35558,12 +35558,12 @@ table .sticky-column {
   background-color: inherit;
 }
 
-.table-dynamic .loading-icon {
+.table-dynamic > .loading-icon {
   position: absolute;
   left: calc(50% - 1.5rem);
   top: 200px;
 }
-.table-dynamic .loading-icon .icon {
+.table-dynamic > .loading-icon .icon {
   max-height: 3rem;
   max-width: 3rem;
   font-size: 3rem;