Merge changes I2ef6b448,Ieb4d965f

* changes:
  Bug 1487222: Loading spinner problem with TinyMCE imagebrowser
  Bug 1487922: do the loading spinner in non .gif way

htdocs/artefact/file/js/filebrowser.js

@@ -99,7 +99,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
         // Display upload status
         self.nextupload++;
         var message = makeMessage(DIV(null,
-            IMG({'src':get_themeurl('images/loading.gif')}), ' ',
+            SPAN({'class': 'icon-spinner icon-pulse icon icon-lg'}), ' ',
             get_string('uploadingfiletofolder',e.name,self.foldername)
             ), 'info');
         setNodeAttribute(message, 'id', 'uploadstatusline' + self.nextupload);
@@ -120,7 +120,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
                     var localname = $(self.id + '_userfile').files[i].fileName;
                 }
                 var message = makeMessage(DIV(null,
-                    IMG({'src':get_themeurl('images/loading.gif')}), ' ',
+                    SPAN({'class': 'icon-spinner icon-pulse icon icon-lg'}), ' ',
                     get_string('uploadingfiletofolder',localname,self.foldername)
                     ), 'ok');
                 setNodeAttribute(message, 'id', 'uploadstatusline' + self.nextupload);

htdocs/js/mahara.js

@@ -785,7 +785,7 @@ function augment_tags_control(elem, returnContainer) {
 
     connect(showLink, 'onclick', function (e) {
         e.stop();
-        replaceChildNodes(tagContainer, get_string('loading') + ' ', IMG({'src':get_themeurl('images/loading.gif')}));
+        replaceChildNodes(tagContainer, get_string('loading') + ' ', SPAN({'class': 'icon-spinner icon-pulse icon icon-lg'}));
         sendjsonrequest(config.wwwroot + 'json/taglist.php', {}, 'GET', function (data) {
             replaceChildNodes(tagContainer);
             if (data.length == 0) {

htdocs/js/tinymce/plugins/imagebrowser/plugin.js

@@ -251,6 +251,7 @@ tinymce.PluginManager.add('imagebrowser', function(editor) {
                 });
                 jQuery('#imagebrowser').remove();
             }, 1);
+            processingStop();
         }
 
         function getFormVals() {