summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-17 01:21:59 +0000
committerdhg@chromium.org <dhg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-17 01:21:59 +0000
commite1861014b2062fd8f830180ded7eeb452b00d2b2 (patch)
tree38e2ce222e282cb84953279f39034d4b58f7276c /chrome
parent669fa97eb245c29382fad5383aaf8a3baeb97538 (diff)
downloadchromium_src-e1861014b2062fd8f830180ded7eeb452b00d2b2.zip
chromium_src-e1861014b2062fd8f830180ded7eeb452b00d2b2.tar.gz
chromium_src-e1861014b2062fd8f830180ded7eeb452b00d2b2.tar.bz2
Fixing the open dialog of the filebrowser
Review URL: http://codereview.chromium.org/606071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/browser_resources.grd2
-rw-r--r--chrome/browser/resources/filebrowse.html10
2 files changed, 9 insertions, 3 deletions
diff --git a/chrome/browser/browser_resources.grd b/chrome/browser/browser_resources.grd
index dfb9438..8c778b7 100644
--- a/chrome/browser/browser_resources.grd
+++ b/chrome/browser/browser_resources.grd
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This comment is only here because changes to resources are not picked up
-without changes to the corresponding grd file. dhg -->
+without changes to the corresponding grd file. -->
<grit latest_public_release="0" current_release="1">
<outputs>
<output filename="grit/browser_resources.h" type="rc_header">
diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html
index 4edc7f2..ce484a8 100644
--- a/chrome/browser/resources/filebrowse.html
+++ b/chrome/browser/resources/filebrowse.html
@@ -233,7 +233,7 @@ li.filebrowserow:hover span.namelink {
-webkit-transition: color 0.0s ease-out ;
}
-.selected {
+li.selected {
background-color: #b1c8f2;
}
@@ -708,6 +708,9 @@ function getDataForPath(path) {
newfolderbutton.className = 'filebutton newfolderbutton disabled';
var savebutton = $('savebutton');
savebutton.className = 'filebutton openbutton disabled';
+ } else if (inSelectMode) {
+ var openbutton = $('openbutton');
+ openbutton.className = 'filebutton openbutton disabled';
}
chrome.send('getRoots', []);
} else {
@@ -716,6 +719,9 @@ function getDataForPath(path) {
newfolderbutton.className = 'filebutton newfolderbutton';
var savebutton = $('savebutton');
savebutton.className = 'filebutton openbutton';
+ } else if (inSelectMode) {
+ var openbutton = $('openbutton');
+ openbutton.className = 'filebutton openbutton';
}
chrome.send('getChildren', [path]);
}
@@ -965,7 +971,6 @@ function load() {
mainColumn = $('main');
if(document.documentElement.clientWidth <= 600) {
inFullMode = false;
-
if (chrome.dialogArguments) {
var args = JSON.parse(chrome.dialogArguments);
if (args.type == 'open') {
@@ -1023,6 +1028,7 @@ function load() {
var openmenu = document.createElement('div');
openmenu.className = 'opencontainer';
var openbutton = document.createElement('div');
+ openbutton.id = 'openbutton';
openbutton.className = 'filebutton openbutton disabled';
var cancelbutton = document.createElement('div');
cancelbutton.className = 'filebutton cancelbutton';