Commit c2af0518 authored by oleg@chromium.org's avatar oleg@chromium.org

Do not show 'No files match "..."' message when GDrive welcome page is shown.

BUG=128811
Review URL: https://chromiumcodereview.appspot.com/10409054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138106 0039d316-1c4b-4281-b951-d872f2087c98
parent d7fec8f4
...@@ -1286,9 +1286,14 @@ body:not([type='saveas-file']):not([type='full-page']) ...@@ -1286,9 +1286,14 @@ body:not([type='saveas-file']):not([type='full-page'])
#no-search-results { #no-search-results {
bottom: 0; bottom: 0;
display: none;
left: 0; left: 0;
padding: 10px; padding: 10px;
position: absolute; position: absolute;
right: 0; right: 0;
top: 28px; /* Leave room for the file list header. */ top: 28px; /* Leave room for the file list header. */
} }
.dialog-container:not([gdrive-welcome='page']) #no-search-results[show] {
display: block;
}
...@@ -4531,14 +4531,14 @@ FileManager.prototype = { ...@@ -4531,14 +4531,14 @@ FileManager.prototype = {
if (this.directoryModel_.getFileList().length === 0) { if (this.directoryModel_.getFileList().length === 0) {
var text = strf('SEARCH_NO_MATCHING_FILES', searchString); var text = strf('SEARCH_NO_MATCHING_FILES', searchString);
noResultsDiv.innerHTML = text; noResultsDiv.innerHTML = text;
noResultsDiv.hidden = false; noResultsDiv.setAttribute('show', 'true');
} else { } else {
noResultsDiv.hidden = true; noResultsDiv.removeAttribute('show');
} }
} }
function hideNoResultsDiv() { function hideNoResultsDiv() {
noResultsDiv.hidden = true; noResultsDiv.removeAttribute('show');
} }
this.directoryModel_.search(searchString, this.directoryModel_.search(searchString,
......
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
<grid class=thumbnail-grid tabindex=0></grid> <grid class=thumbnail-grid tabindex=0></grid>
<div class=spinner></div> <div class=spinner></div>
<div class="gdrive-welcome page"></div> <div class="gdrive-welcome page"></div>
<div id="no-search-results" hidden></div> <div id="no-search-results"></div>
</div> </div>
<div class=downloads-warning hidden> <div class=downloads-warning hidden>
<img src=images/warning_icon_square_26x26.png> <img src=images/warning_icon_square_26x26.png>
......
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