From 9f73b7fac0fa59eea92731b3919f1a1335acb7af Mon Sep 17 00:00:00 2001 From: "dhg@chromium.org" Date: Wed, 6 Oct 2010 17:42:40 +0000 Subject: fixing the layout of the filebrowser for open/ save-as so it more closely resembles the mocks. BUG=5362 TEST=none Review URL: http://codereview.chromium.org/3625001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61668 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/resources/filebrowse.html | 103 ++++++++++++++++++++++--------- 1 file changed, 75 insertions(+), 28 deletions(-) (limited to 'chrome/browser/resources/filebrowse.html') diff --git a/chrome/browser/resources/filebrowse.html b/chrome/browser/resources/filebrowse.html index 12ed9dc..3b1a9f1 100644 --- a/chrome/browser/resources/filebrowse.html +++ b/chrome/browser/resources/filebrowse.html @@ -3,6 +3,7 @@ + @@ -692,6 +713,11 @@ function enabledResult(info) { filenameprompt.textContent = localStrings.getString('filenameprompt'); savemenu.appendChild(filenameprompt); + var backbutton = $('back'); + if (backbutton) { + backbutton.style.top = '5px'; + } + var filename = document.createElement('input'); filename.className = 'filename'; filename.id = 'filename'; @@ -724,6 +750,10 @@ function enabledResult(info) { openbutton.textContent = localStrings.getString('open'); cancelbutton.textContent = localStrings.getString('confirmcancel'); document.body.appendChild(openmenu); + var backbutton = $('back'); + if (backbutton) { + backbutton.style.top = '5px'; + } } } } else { @@ -1107,11 +1137,15 @@ function downloadsList(results) { downloadUpdated(results); } -function allowDownload(id) { +function allowDownload(id, path) { + var element = $(path); + element.removeAttribute('dangerous'); chrome.send('allowDownload', ['' + id]); } -function cancelDownload(id) { +function cancelDownload(id, path) { + var element = $(path); + element.removeAttribute('dangerous'); chrome.send('cancelDownload', ['' + id]); } @@ -1223,6 +1257,7 @@ function downloadUpdated(results) { pauseDiv.onclick = partial(pauseToggleDownload, results[x].id); pauseDiv.className = 'downloadpause'; if (results[x].state == "DANGEROUS") { + element.setAttribute('dangerous', 'true'); pauseDiv.onClick = undefined; var prompt = document.createElement('div'); prompt.textContent = localStrings.getString('allowdownload'); @@ -1231,9 +1266,13 @@ function downloadUpdated(results) { var yes = document.createElement('div'); yes.className = 'link'; yes.textContent = localStrings.getString('confirmyes'); - yes.onclick = partial(allowDownload, results[x].id); + yes.onclick = partial(allowDownload, + results[x].id, + results[x].file_path); var no = document.createElement('div'); - no.onclick = partial(cancelDownload, results[x].id); + no.onclick = partial(cancelDownload, + results[x].id, + results[x].file_path); no.textContent = localStrings.getString('confirmcancel'); no.className = 'link'; pauseDiv.onclick = undefined; @@ -1420,6 +1459,9 @@ function findInArray(arr, element) { function selectItem(elementid, path) { var element = $(elementid); + if (element.className == 'filebrowserow downloading') { + return; + } var index; if ((index = findInArray(currentlySelectedItems, element)) != -1) { // the user must want to toggle @@ -1439,6 +1481,11 @@ function selectItem(elementid, path) { element.className = 'selected filebrowserow'; currentlySelectedItems.push(element); currentlySelectedPaths.push(path); + if (inSaveMode) { + var extracted = getPathAndFilenameForPath(path); + var file = $('filename'); + file.value = extracted[2]; + } } } @@ -1688,7 +1735,7 @@ function createNewList(title, results, main, path) { i18n-values=".style.fontFamily:fontfamily">
-- cgit v1.1