diff options
| -rw-r--r-- | ui/file_manager/video_player/js/video_player.js | 12 | ||||
| -rw-r--r-- | ui/file_manager/video_player/js/video_player_scripts.js | 3 | ||||
| -rw-r--r-- | ui/file_manager/video_player/video_player.html | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/ui/file_manager/video_player/js/video_player.js b/ui/file_manager/video_player/js/video_player.js index b941805..074cd2f 100644 --- a/ui/file_manager/video_player/js/video_player.js +++ b/ui/file_manager/video_player/js/video_player.js @@ -93,8 +93,7 @@ FullWindowVideoControls.prototype = { __proto__: VideoControls.prototype }; */ FullWindowVideoControls.prototype.showErrorMessage = function(message) { var errorBanner = document.querySelector('#error'); - errorBanner.textContent = - loadTimeData.getString(message); + errorBanner.textContent = loadTimeData.getString(message); errorBanner.setAttribute('visible', 'true'); // The window is hidden if the video has not loaded yet. @@ -257,10 +256,6 @@ VideoPlayer.prototype.prepare = function(videos) { else videoPlayerElement.removeAttribute('multiple'); - document.querySelector('#cast-menu').setAttribute( - 'playon-text', - loadTimeData.getString('VIDEO_PLAYER_PLAY_ON')); - document.addEventListener('keydown', reloadVideo); document.addEventListener('click', reloadVideo); }; @@ -331,8 +326,6 @@ VideoPlayer.prototype.loadVideo_ = function(video, opt_callback) { if (this.currentCast_) { videoPlayerElement.setAttribute('casting', true); - document.querySelector('#cast-name-label').textContent = - loadTimeData.getString('VIDEO_PLAYER_PLAYING_ON'); document.querySelector('#cast-name').textContent = this.currentCast_.friendlyName; @@ -567,6 +560,7 @@ VideoPlayer.prototype.setCastList = function(casts) { var item = new cr.ui.MenuItem(); item.label = loadTimeData.getString('VIDEO_PLAYER_PLAY_THIS_COMPUTER'); + item.setAttribute('aria-label', item.label); item.castLabel = ''; item.addEventListener('activate', this.onCastSelected_.wrap(this, null)); menu.appendChild(item); @@ -574,6 +568,7 @@ VideoPlayer.prototype.setCastList = function(casts) { for (var i = 0; i < casts.length; i++) { var item = new cr.ui.MenuItem(); item.label = casts[i].friendlyName; + item.setAttribute('aria-label', item.label); item.castLabel = casts[i].label; item.addEventListener('activate', this.onCastSelected_.wrap(this, casts[i])); @@ -662,6 +657,7 @@ var player = new VideoPlayer(); function initStrings(callback) { chrome.fileManagerPrivate.getStrings(function(strings) { loadTimeData.data = strings; + i18nTemplate.process(document, loadTimeData); callback(); }.wrap(null)); } diff --git a/ui/file_manager/video_player/js/video_player_scripts.js b/ui/file_manager/video_player/js/video_player_scripts.js index 13da825..0285273 100644 --- a/ui/file_manager/video_player/js/video_player_scripts.js +++ b/ui/file_manager/video_player/js/video_player_scripts.js @@ -27,6 +27,9 @@ (function() { 'use strict'; +//<include src="../../../webui/resources/js/load_time_data.js"/> +//<include src="../../../webui/resources/js/i18n_template_no_process.js"/> + //<include src="../../file_manager/common/js/async_util.js"/> //<include src="../../file_manager/common/js/util.js"/> //<include src="../../file_manager/foreground/js/mouse_inactivity_watcher.js"/> diff --git a/ui/file_manager/video_player/video_player.html b/ui/file_manager/video_player/video_player.html index c51ffcc..c5dc707 100644 --- a/ui/file_manager/video_player/video_player.html +++ b/ui/file_manager/video_player/video_player.html @@ -20,10 +20,12 @@ </head> <body> <div id="video-player" tools> - <menu id='cast-menu' class='cast-menu tool'></menu> + <menu id='cast-menu' class='cast-menu tool' + i18n-values="playon-text:VIDEO_PLAYER_PLAY_ON"></menu> <div id="cast-container"> <div id="cast-info"> - <div class="first-line" id='cast-name-label'></div> + <div class="first-line" id='cast-name-label' + i18n-content="VIDEO_PLAYER_PLAYING_ON"></div> <div class="second-line" id="cast-name"></div> </div> </div> @@ -36,7 +38,8 @@ <div id="header-container" class="header tool"> <div id="title"> </div> <button class="cast-button menubutton hidden tool" - menu="#cast-menu"></button> + menu="#cast-menu" + i18n-values="aria-label:VIDEO_PLAYER_PLAY_ON"></button> <button class="minimize-button tool" tabindex="-1"></button> <button class="maximize-button tool" tabindex="-1"></button> <button class="close-button tool" tabindex="-1"></button> |