summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 10:51:47 +0000
committerdgozman@chromium.org <dgozman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 10:51:47 +0000
commit5a062dc3ae4117eb1684b0bbea456266eec5b9fb (patch)
treeb26a7975b47ce3646f7995320d31d9874196eca5
parentf5532c494b0e7f23cb3b3269d464314903714860 (diff)
downloadchromium_src-5a062dc3ae4117eb1684b0bbea456266eec5b9fb.zip
chromium_src-5a062dc3ae4117eb1684b0bbea456266eec5b9fb.tar.gz
chromium_src-5a062dc3ae4117eb1684b0bbea456266eec5b9fb.tar.bz2
[filemanager] More clear disabled state in action choice dialog.
BUG=160882 TEST=manual Review URL: https://chromiumcodereview.appspot.com/11299106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169019 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/file_manager/css/action_choice.css4
-rw-r--r--chrome/browser/resources/file_manager/js/action_choice.js3
2 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/resources/file_manager/css/action_choice.css b/chrome/browser/resources/file_manager/css/action_choice.css
index 23ef1af..ea0d5a6 100644
--- a/chrome/browser/resources/file_manager/css/action_choice.css
+++ b/chrome/browser/resources/file_manager/css/action_choice.css
@@ -152,6 +152,10 @@ button:focus {
url('../images/media/2x/watch.png') 2x);
}
+.choices div[disabled] label {
+ opacity: 0.5;
+}
+
.footer {
-webkit-box-orient: horizontal;
-webkit-box-pack: end;
diff --git a/chrome/browser/resources/file_manager/js/action_choice.js b/chrome/browser/resources/file_manager/js/action_choice.js
index a276f87..f69b76d 100644
--- a/chrome/browser/resources/file_manager/js/action_choice.js
+++ b/chrome/browser/resources/file_manager/js/action_choice.js
@@ -95,10 +95,13 @@ ActionChoice.prototype.initDom_ = function() {
ActionChoice.prototype.checkDrive_ = function() {
var driveLabel = this.dom_.querySelector('label[for=import-photos-to-drive]');
var driveChoice = this.dom_.querySelector('#import-photos-to-drive');
+ var driveDiv = driveChoice.parentNode;
driveChoice.disabled = true;
+ driveDiv.setAttribute('disabled', '');
var onMounted = function() {
driveChoice.disabled = false;
+ driveDiv.removeAttribute('disabled');
driveLabel.textContent =
loadTimeData.getString('ACTION_CHOICE_PHOTOS_DRIVE');
};