chrome/browser/resources/file_manager/js/file_manager.js - Issue 10834062: In case of search add "Searching..." string to the spinner in the center.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/file_manager/js/file_manager.js

Issue 10834062: In case of search add "Searching..." string to the spinner in the center. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Move spinner-without-text into spinner-container. Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/resources/file_manager/css/file_manager.css ('K') | « chrome/browser/resources/file_manager/css/file_manager.css ('k') | chrome/browser/resources/file_manager/js/mock_chrome.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/file_manager/js/file_manager.js

diff --git a/chrome/browser/resources/file_manager/js/file_manager.js b/chrome/browser/resources/file_manager/js/file_manager.js

index 11aef95b42c630a0ad5a3e94cda60114bf298a59..ae3d29e1fb14436fe8365c1ec8de8ac80e3e4f25 100644

--- a/chrome/browser/resources/file_manager/js/file_manager.js

+++ b/chrome/browser/resources/file_manager/js/file_manager.js

@@ -609,7 +609,8 @@ FileManager.prototype = {

this.deleteButton_ = this.dialogDom_.querySelector('#delete-button');

this.table_ = this.dialogDom_.querySelector('.detail-table');

this.grid_ = this.dialogDom_.querySelector('.thumbnail-grid');

- this.spinner_ = this.dialogDom_.querySelector('.spinner');

+ this.spinner_ = this.dialogDom_.querySelector('#spinner-without-text');

+ this.textSpinner_ = this.dialogDom_.querySelector('#spinner-with-text');

this.showSpinner_(false);

this.butter_ = this.dialogDom_.querySelector('.butter-bar');

this.unmountedPanel_ = this.dialogDom_.querySelector('#unmounted-panel');

@@ -3314,7 +3315,20 @@ FileManager.prototype = {

FileManager.prototype.showSpinner_ = function(on) {

this.cancelSpinnerTimeout_();

- this.spinner_.style.display = on ? '' : 'none';

+ if (on) {

+ if (this.directoryModel_.isSearching()) {

Vladislav Kaznacheev 2012/07/30 11:19:46 I suggest keeping a single DOM element for both us

Oleg Eterevsky 2012/07/30 12:21:10 Done.

Oleg Eterevsky 2012/07/30 12:22:09 Done.

+ this.spinner_.style.display = 'none';

+ this.textSpinner_.textContent = str('SEARCH_SPINNER');

+ this.textSpinner_.style.display = 'block';

+ } else {

+ this.spinner_.style.display = 'block';

+ this.textSpinner_.style.display = 'none';

+ }

+ } else {

+ this.spinner_.style.display = 'none';

+ this.textSpinner_.style.display = 'none';

+ }

};

FileManager.prototype.onNewFolderCommand_ = function(event) {