Commit 3565c049 authored by zvorygin@chromium.org's avatar zvorygin@chromium.org

[FileBrowser] Fixed tab navigation for detail-thumbnail-settings buttons.

BUG=10411018
TEST=Manual: notice that tab navigation now always works for buttons in top-right corner of filebrowser(earlier it didn't work after showing-hiding any modal dialog).

Review URL: https://chromiumcodereview.appspot.com/10409093

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138477 0039d316-1c4b-4281-b951-d872f2087c98
parent ee16913a
...@@ -446,19 +446,12 @@ div.root-eject:hover { ...@@ -446,19 +446,12 @@ div.root-eject:hover {
padding-left: 22px; padding-left: 22px;
} }
/* button:hover and button[disabled]:hover rules must be override by placing /* When detail-view is not disabled (thus thumbnail view is disabled), push
* the following four rules after them. it up a little, to make it's right glowing border visible while focused.*/
*/ button#detail-view:not([disabled]) {
div.detail-view { z-index: 2;
background-image: url('../images/icon_list_view.png');
}
div.thumbnail-view {
background-image: url('../images/icon_thumb_view.png');
margin-left: -1px;
} }
button.settings { button.settings {
display: none; display: none;
/* Temporary solution not to uglify settings button */ /* Temporary solution not to uglify settings button */
......
...@@ -140,20 +140,20 @@ ...@@ -140,20 +140,20 @@
<div class="right buttonbar"> <div class="right buttonbar">
<div> <div>
<button class="left small" id="detail-view"> <button class="left small" id="detail-view" tabindex="5">
<img src="images/view_list_black_12x12.png"> <img src="images/view_list_black_12x12.png">
</button> </button>
<div class="tooltip" i18n-content=DETAIL_VIEW_TOOLTIP <div class="tooltip" i18n-content=DETAIL_VIEW_TOOLTIP
>[DETAIL VIEW]</div> >[DETAIL VIEW]</div>
</div> </div>
<div> <div>
<button class="right small" id="thumbnail-view"> <button class="right small" id="thumbnail-view" tabindex="6">
<img src="images/view_thumbs_black_12x12.png"> <img src="images/view_thumbs_black_12x12.png">
</button> </button>
<div class="tooltip" i18n-content=THUMBNAIL_VIEW_TOOLTIP <div class="tooltip" i18n-content=THUMBNAIL_VIEW_TOOLTIP
>[THUMBNAIL VIEW]</div> >[THUMBNAIL VIEW]</div>
</div> </div>
<button class="menubutton" id="gdata-settings" <button class="menubutton" id="gdata-settings" tabindex="7"
menu="#docs-settings" visibleif="full-page"> menu="#docs-settings" visibleif="full-page">
<img src="images/settings.svg"> <img src="images/settings.svg">
<span class="disclosureindicator"></span> <span class="disclosureindicator"></span>
......
...@@ -201,7 +201,7 @@ cr.define('cr.ui.dialogs', function() { ...@@ -201,7 +201,7 @@ cr.define('cr.ui.dialogs', function() {
for (var i = 0; i < this.deactivatedNodes_.length; i++) { for (var i = 0; i < this.deactivatedNodes_.length; i++) {
var node = this.deactivatedNodes_[i]; var node = this.deactivatedNodes_[i];
if (this.tabIndexes_[i] === null) if (this.tabIndexes_[i] === null)
node.removeAttribute('tabidex'); node.removeAttribute('tabindex');
else else
node.setAttribute('tabindex', this.tabIndexes_[i]); node.setAttribute('tabindex', this.tabIndexes_[i]);
} }
......
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