Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1283)

Unified Diff: chrome/browser/resources/chromeos/keyboard_overlay.js

Issue 10391044: retry 136193 - convert localStrings to loadTimeData for options page (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/keyboard_overlay.js
diff --git a/chrome/browser/resources/chromeos/keyboard_overlay.js b/chrome/browser/resources/chromeos/keyboard_overlay.js
index a5a03fb1f759fe9e937da83e8b17ac420fb6600b..5fe5967d325da3b5a7f80c89962ace347017cbc9 100644
--- a/chrome/browser/resources/chromeos/keyboard_overlay.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay.js
@@ -296,7 +296,7 @@ function getKeyTextValue(keyData) {
* @param {Array} modifiers Key Modifier list.
*/
function update(modifiers) {
- var instructions = document.getElementById('instructions');
+ var instructions = $('instructions');
if (modifiers.length == 0) {
instructions.style.visibility = 'visible';
} else {
@@ -326,14 +326,14 @@ function update(modifiers) {
classes.push('is-shortcut');
}
- var key = document.getElementById(keyId(identifier, i));
+ var key = $(keyId(identifier, i));
key.className = classes.join(' ');
if (!keyData) {
continue;
}
- var keyText = document.getElementById(keyTextId(identifier, i));
+ var keyText = $(keyTextId(identifier, i));
var keyTextValue = getKeyTextValue(keyData);
if (keyTextValue) {
keyText.style.visibility = 'visible';
@@ -342,10 +342,10 @@ function update(modifiers) {
}
keyText.textContent = keyTextValue;
- var shortcutText = document.getElementById(shortcutTextId(identifier, i));
+ var shortcutText = $(shortcutTextId(identifier, i));
if (shortcutId) {
shortcutText.style.visibility = 'visible';
- shortcutText.textContent = templateData[shortcutId];
+ shortcutText.textContent = loadTimeData.getString('shortcutId');
} else {
shortcutText.style.visibility = 'hidden';
}
@@ -450,20 +450,24 @@ function initLayout() {
var instructionsText = document.createElement('div');
instructionsText.id = 'instructions-text';
instructionsText.className = 'keyboard-overlay-instructions-text';
- instructionsText.innerHTML = templateData.keyboardOverlayInstructions;
+ instructionsText.innerHTML =
+ loadTimeData.getString('keyboardOverlayInstructions');
instructions.appendChild(instructionsText);
var instructionsHideText = document.createElement('div');
instructionsHideText.id = 'instructions-hide-text';
instructionsHideText.className = 'keyboard-overlay-instructions-hide-text';
- instructionsHideText.innerHTML = templateData.keyboardOverlayInstructionsHide;
+ instructionsHideText.innerHTML =
+ loadTimeData.getString('keyboardOverlayInstructionsHide');
instructions.appendChild(instructionsHideText);
var learnMoreLinkText = document.createElement('div');
learnMoreLinkText.id = 'learn-more-text';
learnMoreLinkText.className = 'keyboard-overlay-learn-more-text';
learnMoreLinkText.addEventListener('click', learnMoreClicked);
var learnMoreLinkAnchor = document.createElement('a');
- learnMoreLinkAnchor.href = templateData.keyboardOverlayLearnMoreURL;
- learnMoreLinkAnchor.textContent = templateData.keyboardOverlayLearnMore;
+ learnMoreLinkAnchor.href =
+ loadTimeData.getString('keyboardOverlayLearnMoreURL');
+ learnMoreLinkAnchor.textContent =
+ loadTimeData.getString('keyboardOverlayLearnMore');
learnMoreLinkText.appendChild(learnMoreLinkAnchor);
instructions.appendChild(learnMoreLinkText);
keyboard.appendChild(instructions);
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay.html ('k') | chrome/browser/resources/chromeos/proxy_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698