Download as
Browse Code »

Commit 569fc5a6738e89c41405cd5f81a76f3385d67e23

Authored by Sergio Oliveira
1 parent 76d89ceb
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Updating converse.js 

Removing spinner after login attempt
Showing 1 changed file with 4 additions and 4 deletions   Show diff stats
src/colab/static/third-party/converse.js/converse.js
  Diff comments   View file @569fc5a
@@ -2517,21 +2517,21 @@ @@ -2517,21 +2517,21 @@
2517 console.log(__('Connected')); 2517 console.log(__('Connected'));
2518 converse.onConnected(connection); 2518 converse.onConnected(connection);
2519 } else if (status === Strophe.Status.DISCONNECTED) { 2519 } else if (status === Strophe.Status.DISCONNECTED) {
2520 - if ($button) { $button.show().siblings('img').remove(); } 2520 + if ($button) { $button.show().siblings('span').remove(); }
2521 converse.giveFeedback(__('Disconnected'), 'error'); 2521 converse.giveFeedback(__('Disconnected'), 'error');
2522 this.connect(null, connection.jid, connection.pass); 2522 this.connect(null, connection.jid, connection.pass);
2523 } else if (status === Strophe.Status.Error) { 2523 } else if (status === Strophe.Status.Error) {
2524 - if ($button) { $button.show().siblings('img').remove(); } 2524 + if ($button) { $button.show().siblings('span').remove(); }
2525 converse.giveFeedback(__('Error'), 'error'); 2525 converse.giveFeedback(__('Error'), 'error');
2526 } else if (status === Strophe.Status.CONNECTING) { 2526 } else if (status === Strophe.Status.CONNECTING) {
2527 converse.giveFeedback(__('Connecting')); 2527 converse.giveFeedback(__('Connecting'));
2528 } else if (status === Strophe.Status.CONNFAIL) { 2528 } else if (status === Strophe.Status.CONNFAIL) {
2529 - if ($button) { $button.show().siblings('img').remove(); } 2529 + if ($button) { $button.show().siblings('span').remove(); }
2530 converse.giveFeedback(__('Connection Failed'), 'error'); 2530 converse.giveFeedback(__('Connection Failed'), 'error');
2531 } else if (status === Strophe.Status.AUTHENTICATING) { 2531 } else if (status === Strophe.Status.AUTHENTICATING) {
2532 converse.giveFeedback(__('Authenticating')); 2532 converse.giveFeedback(__('Authenticating'));
2533 } else if (status === Strophe.Status.AUTHFAIL) { 2533 } else if (status === Strophe.Status.AUTHFAIL) {
2534 - if ($button) { $button.show().siblings('img').remove(); } 2534 + if ($button) { $button.show().siblings('span').remove(); }
2535 converse.giveFeedback(__('Authentication Failed'), 'error'); 2535 converse.giveFeedback(__('Authentication Failed'), 'error');
2536 } else if (status === Strophe.Status.DISCONNECTING) { 2536 } else if (status === Strophe.Status.DISCONNECTING) {
2537 converse.giveFeedback(__('Disconnecting'), 'error'); 2537 converse.giveFeedback(__('Disconnecting'), 'error');