Commit a51c604c authored by Son Nguyen's avatar Son Nguyen Committed by Gerrit Code Review
Browse files

Merge changes I2ef6b448,Ieb4d965f

* changes:
  Bug 1487222: Loading spinner problem with TinyMCE imagebrowser
  Bug 1487922: do the loading spinner in non .gif way
parents 51f2729f 2b224d46
...@@ -99,7 +99,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) { ...@@ -99,7 +99,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
// Display upload status // Display upload status
self.nextupload++; self.nextupload++;
var message = makeMessage(DIV(null, 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) get_string('uploadingfiletofolder',e.name,self.foldername)
), 'info'); ), 'info');
setNodeAttribute(message, 'id', 'uploadstatusline' + self.nextupload); setNodeAttribute(message, 'id', 'uploadstatusline' + self.nextupload);
...@@ -120,7 +120,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) { ...@@ -120,7 +120,7 @@ function FileBrowser(idprefix, folderid, config, globalconfig) {
var localname = $(self.id + '_userfile').files[i].fileName; var localname = $(self.id + '_userfile').files[i].fileName;
} }
var message = makeMessage(DIV(null, 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) get_string('uploadingfiletofolder',localname,self.foldername)
), 'ok'); ), 'ok');
setNodeAttribute(message, 'id', 'uploadstatusline' + self.nextupload); setNodeAttribute(message, 'id', 'uploadstatusline' + self.nextupload);
......
...@@ -785,7 +785,7 @@ function augment_tags_control(elem, returnContainer) { ...@@ -785,7 +785,7 @@ function augment_tags_control(elem, returnContainer) {
connect(showLink, 'onclick', function (e) { connect(showLink, 'onclick', function (e) {
e.stop(); 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) { sendjsonrequest(config.wwwroot + 'json/taglist.php', {}, 'GET', function (data) {
replaceChildNodes(tagContainer); replaceChildNodes(tagContainer);
if (data.length == 0) { if (data.length == 0) {
......
...@@ -251,6 +251,7 @@ tinymce.PluginManager.add('imagebrowser', function(editor) { ...@@ -251,6 +251,7 @@ tinymce.PluginManager.add('imagebrowser', function(editor) {
}); });
jQuery('#imagebrowser').remove(); jQuery('#imagebrowser').remove();
}, 1); }, 1);
processingStop();
} }
function getFormVals() { function getFormVals() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment