diff options
| author | fukino@chromium.org <fukino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 06:42:03 +0000 |
|---|---|---|
| committer | fukino@chromium.org <fukino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-10 06:42:03 +0000 |
| commit | c40ff2f637f184e64f83290b5475d05fe260a32a (patch) | |
| tree | d2680750a5b1c993435687cca2cb028aa323d718 /ui/file_manager | |
| parent | 57ab47ddad51f3d05ce249f92ce58991fcd25ac7 (diff) | |
| download | chromium_src-c40ff2f637f184e64f83290b5475d05fe260a32a.zip chromium_src-c40ff2f637f184e64f83290b5475d05fe260a32a.tar.gz chromium_src-c40ff2f637f184e64f83290b5475d05fe260a32a.tar.bz2 | |
Keep base direction 'ltr' for entry names consistently.
In RTL languages, entry names (file names, directory names, volume names,...) look strange around the neutral characters (' ', '.', ')'...).
This can be avoided by keeping base direction of bidi algorithm 'ltr' consistently and it is same behavior as Windows 8.
BUG=371232
TEST=manually tested
Review URL: https://codereview.chromium.org/273983002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/file_manager')
7 files changed, 14 insertions, 5 deletions
diff --git a/ui/file_manager/file_manager/foreground/css/common.css b/ui/file_manager/file_manager/foreground/css/common.css index b010df2..6cdaf42 100644 --- a/ui/file_manager/file_manager/foreground/css/common.css +++ b/ui/file_manager/file_manager/foreground/css/common.css @@ -377,6 +377,14 @@ div.watch-single-video-icon { url('../images/media/2x/watch.png') 2x); } +/* Entry names (File names, Folder names, Volume names, ...). */ +/* Their base bidi direction should be ltr even in RTL languages. */ +html[dir='rtl'] .entry-name { + direction: ltr; + text-align: right; + unicode-bidi: embed; +} + /* Pop-up dialogs. */ .cr-dialog-container { diff --git a/ui/file_manager/file_manager/foreground/js/directory_tree.js b/ui/file_manager/file_manager/foreground/js/directory_tree.js index cfb5f17..50f2083 100644 --- a/ui/file_manager/file_manager/foreground/js/directory_tree.js +++ b/ui/file_manager/file_manager/foreground/js/directory_tree.js @@ -173,7 +173,7 @@ DirectoryItem.prototype.decorate = function( '<div class="tree-row">' + ' <span class="expand-icon"></span>' + ' <span class="icon"></span>' + - ' <span class="label"></span>' + + ' <span class="label entry-name"></span>' + '</div>' + '<div class="tree-children"></div>'; diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js index 07aa224..4fc7a04 100644 --- a/ui/file_manager/file_manager/foreground/js/file_manager.js +++ b/ui/file_manager/file_manager/foreground/js/file_manager.js @@ -810,7 +810,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52; this.document_.addEventListener('keyup', this.onKeyUp_.bind(this)); this.renameInput_ = this.document_.createElement('input'); - this.renameInput_.className = 'rename'; + this.renameInput_.className = 'rename entry-name'; this.renameInput_.addEventListener( 'keydown', this.onRenameInputKeyDown_.bind(this)); diff --git a/ui/file_manager/file_manager/foreground/js/file_table.js b/ui/file_manager/file_manager/foreground/js/file_table.js index 60594ba..5a217a9 100644 --- a/ui/file_manager/file_manager/foreground/js/file_table.js +++ b/ui/file_manager/file_manager/foreground/js/file_table.js @@ -798,6 +798,7 @@ filelist.renderFileNameLabel = function(doc, entry) { var box = doc.createElement('div'); box.className = 'filename-label'; var fileName = doc.createElement('span'); + fileName.className = 'entry-name'; fileName.textContent = entry.name; box.appendChild(fileName); diff --git a/ui/file_manager/file_manager/foreground/js/ui/breadcrumbs_controller.js b/ui/file_manager/file_manager/foreground/js/ui/breadcrumbs_controller.js index 83173c2..ef38efa 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/breadcrumbs_controller.js +++ b/ui/file_manager/file_manager/foreground/js/ui/breadcrumbs_controller.js @@ -135,7 +135,7 @@ BreadcrumbsController.prototype.updateInternal_ = function(entries) { // Add a component. var entry = entries[i]; var div = doc.createElement('div'); - div.className = 'breadcrumb-path'; + div.className = 'breadcrumb-path entry-name'; div.textContent = util.getEntryLabel(this.volumeManager_, entry); div.entry = entry; this.bc_.appendChild(div); diff --git a/ui/file_manager/file_manager/foreground/js/ui/navigation_list.js b/ui/file_manager/file_manager/foreground/js/ui/navigation_list.js index ee42443..8de5027 100644 --- a/ui/file_manager/file_manager/foreground/js/ui/navigation_list.js +++ b/ui/file_manager/file_manager/foreground/js/ui/navigation_list.js @@ -33,7 +33,7 @@ NavigationListItem.prototype.decorate = function() { this.appendChild(this.iconDiv_); this.label_ = cr.doc.createElement('div'); - this.label_.className = 'root-label'; + this.label_.className = 'root-label entry-name'; this.appendChild(this.label_); cr.defineProperty(this, 'lead', cr.PropertyKind.BOOL_ATTR); diff --git a/ui/file_manager/file_manager/main.html b/ui/file_manager/file_manager/main.html index d622ca1..f1b0aa0 100644 --- a/ui/file_manager/file_manager/main.html +++ b/ui/file_manager/file_manager/main.html @@ -412,7 +412,7 @@ </button> <div id="filename-input-box"> <div class="filename-label" i18n-content="FILENAME_LABEL"></div> - <input type="text" spellcheck="false" tabindex="1"> + <input class="entry-name" type="text" spellcheck="false" tabindex="1"> </div> <div class="preparing-label" i18n-content="PREPARING_LABEL"></div> <div class="progress-bar"> |