paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-12 09:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make make_loading_indicator take its optional text via an options argument

Browse Source 
(imported from commit 935f9049c00183f52bad80d54520f81efceb3e49)
This commit is contained in:
Zev Benjamin
2013-07-10 13:33:00 -04:00
parent b372c516cc
commit be0c29252e
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
zephyr/static/js/settings.js
View File

@@ -131,7 +131,7 @@ $(function () {
jQuery.each($('#bot_avatar_file_input')[0].files, function (i, file) { jQuery.each($('#bot_avatar_file_input')[0].files, function (i, file) {
formData.append('file-'+i, file); formData.append('file-'+i, file);
}); });
util.make_loading_indicator($('#create_bot_spinner'), 'Adding bot'); util.make_loading_indicator($('#create_bot_spinner'), {text: 'Adding bot'});
$('#create_bot_button').hide(); $('#create_bot_button').hide();
$.ajax({ $.ajax({
url: '/json/create_bot', url: '/json/create_bot',

2
zephyr/static/js/setup.js
View File

@@ -5,7 +5,7 @@ $(function () {
// Display loading indicator. This disappears after the first // Display loading indicator. This disappears after the first
// get_updates completes. // get_updates completes.
if (page_params.have_initial_messages) { if (page_params.have_initial_messages) {
util.make_loading_indicator($('#page_loading_indicator'), 'Loading...'); util.make_loading_indicator($('#page_loading_indicator'), {text: 'Loading...'});
} else if (!page_params.needs_tutorial) { } else if (!page_params.needs_tutorial) {
util.show_first_run_message(); util.show_first_run_message();
} }

7
zephyr/static/js/util.js
View File

@@ -32,15 +32,16 @@ exports.set_favicon = function (url) {
} }
}; };
exports.make_loading_indicator = function (container, text) { exports.make_loading_indicator = function (container, opts) {
opts = $.extend({}, opts);
container.empty(); container.empty();
var spinner_elem = $('<div class="loading_indicator_spinner"></div>'); var spinner_elem = $('<div class="loading_indicator_spinner"></div>');
container.append(spinner_elem); container.append(spinner_elem);
var text_width = 0; var text_width = 0;
if (text !== '' && text !== undefined) { if (opts.text !== undefined && opts.text !== '') {
var text_elem = $('<span class="loading_indicator_text"></span>'); var text_elem = $('<span class="loading_indicator_text"></span>');
text_elem.text(text); text_elem.text(opts.text);
container.append(text_elem); container.append(text_elem);
// See note, below // See note, below
text_width = 20 + text_elem.width(); text_width = 20 + text_elem.width();