Merge branch 'MDL-60633-33' of git://github.com/andrewnicols/moodle i…

…nto MOODLE_33_STABLE
moodle · Nov 2, 2017 · ffb5996 · ffb5996
2 parents b09c936 + 0afb1ec
commit ffb5996
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/amd/build/inplace_editable.min.js b/lib/amd/build/inplace_editable.min.js
diff --git a/lib/amd/src/inplace_editable.js b/lib/amd/src/inplace_editable.js
@@ -60,6 +60,13 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
         };
 
         var updateValue = function(mainelement, value) {
+            var pendingId = [
+                    mainelement.attr('data-itemid'),
+                    mainelement.attr('data-component'),
+                    mainelement.attr('data-itemtype'),
+                ].join('-');
+            M.util.js_pending(pendingId);
+
             addSpinner(mainelement);
             ajax
                 .call([{
@@ -77,6 +84,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                             templates.replaceNode(mainelement, newelement, js);
                             newelement.find('[data-inplaceeditablelink]').focus();
                             newelement.trigger({type: 'updated', ajaxreturn: data, oldvalue: oldvalue});
+                            M.util.js_complete(pendingId);
                         });
                     },
                     fail: function(ex) {
@@ -85,6 +93,7 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/str'
                                 newvalue: value
                             });
                         removeSpinner(mainelement);
+                        M.util.js_complete(pendingId);
                         mainelement.trigger(e);
                         if (!e.isDefaultPrevented()) {
                             notification.exception(ex);