summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 02:05:34 +0000
committerestade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-19 02:05:34 +0000
commitac85390650906ff1caa75c15fab3520266c90f3e (patch)
tree1494af28d9ae793be10e81c7742b788687a7d795
parent5348b8a6828361d9df14badc2f308e74a4358a63 (diff)
downloadchromium_src-ac85390650906ff1caa75c15fab3520266c90f3e.zip
chromium_src-ac85390650906ff1caa75c15fab3520266c90f3e.tar.gz
chromium_src-ac85390650906ff1caa75c15fab3520266c90f3e.tar.bz2
webui: change all assignment uses of innerText to textContent
BUG=none TEST=none Review URL: http://codereview.chromium.org/7395004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92952 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/bug_report.html2
-rw-r--r--chrome/browser/resources/chromeos/login/oobe.js6
-rw-r--r--chrome/browser/resources/gpu_internals/info_view.js2
-rw-r--r--chrome/browser/resources/gpu_internals/tracing_controller.js2
-rw-r--r--chrome/browser/resources/net_internals/dataview.js16
-rw-r--r--chrome/browser/resources/net_internals/hstsview.js12
-rw-r--r--chrome/browser/resources/net_internals/prerenderview.js4
-rw-r--r--chrome/browser/resources/net_internals/spdyview.js10
-rw-r--r--chrome/browser/resources/ntp/apps.js6
-rw-r--r--chrome/browser/resources/options/handler_options_list.js8
-rw-r--r--chrome/browser/resources/sync_internals/events.html8
-rw-r--r--chrome/browser/resources/sync_internals/sync_search.js10
12 files changed, 43 insertions, 43 deletions
diff --git a/chrome/browser/resources/bug_report.html b/chrome/browser/resources/bug_report.html
index 35cfdb5..b48170a 100644
--- a/chrome/browser/resources/bug_report.html
+++ b/chrome/browser/resources/bug_report.html
@@ -107,7 +107,7 @@ function setupCurrentScreenshot(screenshot) {
function setupSavedScreenshots(screenshots) {
if (screenshots.length == 0) {
- $('saved-screenshots').innerText =
+ $('saved-screenshots').textContent =
localStrings.getString('no-saved-screenshots');
// Make sure we make the display the message
diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js
index d5156a6..7bfcd35 100644
--- a/chrome/browser/resources/chromeos/login/oobe.js
+++ b/chrome/browser/resources/chromeos/login/oobe.js
@@ -153,7 +153,7 @@ cr.define('cr.ui', function() {
$('button-strip').innerHTML = "";
for (var i = 0, screenId; screenId = this.screens_[i]; ++i) {
var screen = $(screenId);
- $('header-' + screenId).innerText = screen.header;
+ $('header-' + screenId).textContent = screen.header;
this.appendButtons_(screen.buttons);
}
}
@@ -280,7 +280,7 @@ cr.define('cr.ui', function() {
* @param {text} message Message which is shown by the label.
*/
Oobe.setUpdateMessage = function(message) {
- $('update-upper-label').innerText = message;
+ $('update-upper-label').textContent = message;
};
/**
@@ -298,7 +298,7 @@ cr.define('cr.ui', function() {
*/
Oobe.setTpmPassword = function(password) {
$('tpm-busy').hidden = true;
- $('tpm-password').innerText = password;
+ $('tpm-password').textContent = password;
$('tpm-password').hidden = false;
}
diff --git a/chrome/browser/resources/gpu_internals/info_view.js b/chrome/browser/resources/gpu_internals/info_view.js
index 9c851a4..2d8dada 100644
--- a/chrome/browser/resources/gpu_internals/info_view.js
+++ b/chrome/browser/resources/gpu_internals/info_view.js
@@ -224,7 +224,7 @@ cr.define('gpu', function() {
setText_: function(outputElementId, text) {
var peg = document.getElementById(outputElementId);
- peg.innerText = text;
+ peg.textContent = text;
},
setTable_: function(outputElementId, inputData) {
diff --git a/chrome/browser/resources/gpu_internals/tracing_controller.js b/chrome/browser/resources/gpu_internals/tracing_controller.js
index 6752a4c..ff20234 100644
--- a/chrome/browser/resources/gpu_internals/tracing_controller.js
+++ b/chrome/browser/resources/gpu_internals/tracing_controller.js
@@ -22,7 +22,7 @@ cr.define('gpu', function() {
this.stopButton_ = document.createElement('button');
this.stopButton_.onclick = this.endTracing.bind(this);
- this.stopButton_.innerText = 'Stop tracing';
+ this.stopButton_.textContent = 'Stop tracing';
this.overlay_.appendChild(this.stopButton_);
this.traceEvents_ = [];
diff --git a/chrome/browser/resources/net_internals/dataview.js b/chrome/browser/resources/net_internals/dataview.js
index 42464ef5..39dc412 100644
--- a/chrome/browser/resources/net_internals/dataview.js
+++ b/chrome/browser/resources/net_internals/dataview.js
@@ -119,9 +119,9 @@ DataView.prototype.onLoadLogFinish = function(data) {
* Updates the counters showing how many events have been captured.
*/
DataView.prototype.updateEventCounts_ = function() {
- this.activelyCapturedCountBox_.innerText =
+ this.activelyCapturedCountBox_.textContent =
g_browser.getNumActivelyCapturedEvents()
- this.passivelyCapturedCountBox_.innerText =
+ this.passivelyCapturedCountBox_.textContent =
g_browser.getNumPassivelyCapturedEvents();
};
@@ -231,8 +231,8 @@ DataView.prototype.onLoadLogFile = function(event) {
DataView.prototype.setLoadFileStatus = function(text, isLoading) {
this.enableLoadFileElement_(!isLoading);
this.enableSaveFileButton_(!isLoading);
- this.loadStatusText_.innerText = text;
- this.saveStatusText_.innerText = '';
+ this.loadStatusText_.textContent = text;
+ this.saveStatusText_.textContent = '';
if (!isLoading) {
// Clear the button, so the same file can be reloaded. Recreating the
@@ -254,8 +254,8 @@ DataView.prototype.setLoadFileStatus = function(text, isLoading) {
DataView.prototype.setSaveFileStatus = function(text, isSaving) {
this.enableSaveFileButton_(!isSaving);
this.enableLoadFileElement_(!isSaving);
- this.loadStatusText_.innerText = '';
- this.saveStatusText_.innerText = text;
+ this.loadStatusText_.textContent = '';
+ this.saveStatusText_.textContent = text;
};
DataView.prototype.enableSaveFileButton_ = function(enabled) {
@@ -358,7 +358,7 @@ DataView.prototype.onFileError_ = function(errorText, error) {
* Prints some basic information about the environment when the log was made.
*/
DataView.prototype.updateLoadedClientInfo = function() {
- this.loadedClientInfoText_.innerText = '';
+ this.loadedClientInfoText_.textContent = '';
if (typeof(ClientInfo) != 'object')
return;
@@ -378,5 +378,5 @@ DataView.prototype.updateLoadedClientInfo = function() {
text.push('OS Type: ' + ClientInfo.os_type);
text.push('Command line: ' + ClientInfo.command_line);
- this.loadedClientInfoText_.innerText = text.join('\n');
+ this.loadedClientInfoText_.textContent = text.join('\n');
};
diff --git a/chrome/browser/resources/net_internals/hstsview.js b/chrome/browser/resources/net_internals/hstsview.js
index 5faff52..10cfab6 100644
--- a/chrome/browser/resources/net_internals/hstsview.js
+++ b/chrome/browser/resources/net_internals/hstsview.js
@@ -85,7 +85,7 @@ HSTSView.prototype.onHSTSQueryResult = function(result) {
if (result.error != undefined) {
this.queryOutputDiv_.innerHTML = '';
s = addNode(this.queryOutputDiv_, 'span');
- s.innerText = result.error;
+ s.textContent = result.error;
s.style.color = 'red';
yellowFade(this.queryOutputDiv_);
return;
@@ -103,27 +103,27 @@ HSTSView.prototype.onHSTSQueryResult = function(result) {
s.innerHTML = '<b>Found</b>: mode: ';
t = addNode(this.queryOutputDiv_, 'tt');
- t.innerText = hstsModeToString(result.mode);
+ t.textContent = hstsModeToString(result.mode);
addTextNode(this.queryOutputDiv_, ' include_subdomains:');
t = addNode(this.queryOutputDiv_, 'tt');
- t.innerText = result.subdomains;
+ t.textContent = result.subdomains;
addTextNode(this.queryOutputDiv_, ' domain:');
t = addNode(this.queryOutputDiv_, 'tt');
- t.innerText = result.domain;
+ t.textContent = result.domain;
addTextNode(this.queryOutputDiv_, ' is_preloaded:');
t = addNode(this.queryOutputDiv_, 'tt');
- t.innerText = result.preloaded;
+ t.textContent = result.preloaded;
addTextNode(this.queryOutputDiv_, ' pubkey_hashes:');
t = addNode(this.queryOutputDiv_, 'tt');
- t.innerText = result.public_key_hashes;
+ t.textContent = result.public_key_hashes;
yellowFade(this.queryOutputDiv_);
}
diff --git a/chrome/browser/resources/net_internals/prerenderview.js b/chrome/browser/resources/net_internals/prerenderview.js
index 318addf..5b6ad85 100644
--- a/chrome/browser/resources/net_internals/prerenderview.js
+++ b/chrome/browser/resources/net_internals/prerenderview.js
@@ -34,14 +34,14 @@ function IsValidPrerenderInfo(prerenderInfo) {
}
PrerenderView.prototype.onPrerenderInfoChanged = function(prerenderInfo) {
- this.prerenderEnabledSpan_.innerText = '';
+ this.prerenderEnabledSpan_.textContent = '';
this.prerenderHistoryDiv_.innerHTML = '';
this.prerenderActiveDiv_.innerHTML = '';
if (!IsValidPrerenderInfo(prerenderInfo))
return false;
- this.prerenderEnabledSpan_.innerText = prerenderInfo.enabled.toString();
+ this.prerenderEnabledSpan_.textContent = prerenderInfo.enabled.toString();
var tabPrinter = PrerenderView.createHistoryTablePrinter(
prerenderInfo.history);
diff --git a/chrome/browser/resources/net_internals/spdyview.js b/chrome/browser/resources/net_internals/spdyview.js
index 2fffaeb..a36d036 100644
--- a/chrome/browser/resources/net_internals/spdyview.js
+++ b/chrome/browser/resources/net_internals/spdyview.js
@@ -71,12 +71,12 @@ SpdyView.prototype.onSpdySessionInfoChanged = function(spdySessionInfo) {
* Displays information on the global SPDY status.
*/
SpdyView.prototype.onSpdyStatusChanged = function(spdyStatus) {
- this.spdyEnabledSpan_.innerText = spdyStatus.spdy_enabled;
- this.spdyUseAlternateProtocolSpan_.innerText =
+ this.spdyEnabledSpan_.textContent = spdyStatus.spdy_enabled;
+ this.spdyUseAlternateProtocolSpan_.textContent =
spdyStatus.use_alternate_protocols;
- this.spdyForceAlwaysSpan_.innerText = spdyStatus.force_spdy_always;
- this.spdyForceOverSslSpan_.innerText = spdyStatus.force_spdy_over_ssl;
- this.spdyNextProtocolsSpan_.innerText = spdyStatus.next_protos;
+ this.spdyForceAlwaysSpan_.textContent = spdyStatus.force_spdy_always;
+ this.spdyForceOverSslSpan_.textContent = spdyStatus.force_spdy_over_ssl;
+ this.spdyNextProtocolsSpan_.textContent = spdyStatus.next_protos;
return true;
};
diff --git a/chrome/browser/resources/ntp/apps.js b/chrome/browser/resources/ntp/apps.js
index 0d26621..ffab6f8 100644
--- a/chrome/browser/resources/ntp/apps.js
+++ b/chrome/browser/resources/ntp/apps.js
@@ -831,19 +831,19 @@ var apps = (function() {
var notification = document.createElement('div')
container.appendChild(notification);
var title = document.createElement('span');
- title.innerText = app.notifications[0].title;
+ title.textContent = app.notifications[0].title;
notification.appendChild(title);
notification.appendChild(document.createElement('br'));
var body = document.createElement('span');
container.appendChild(body);
- body.innerText = app.notifications[0].body;
+ body.textContent = app.notifications[0].body;
notification.appendChild(body);
if (app.notifications[0].linkUrl) {
notification.appendChild(document.createElement('br'));
var link = document.createElement('a');
link.href = app.notifications[0].linkUrl;
- link.innerText = app.notifications[0].linkText ?
+ link.textContent = app.notifications[0].linkText ?
app.notifications[0].linkText : "link";
notification.appendChild(link);
}
diff --git a/chrome/browser/resources/options/handler_options_list.js b/chrome/browser/resources/options/handler_options_list.js
index efad3f96..658cef8 100644
--- a/chrome/browser/resources/options/handler_options_list.js
+++ b/chrome/browser/resources/options/handler_options_list.js
@@ -40,7 +40,7 @@ cr.define('options', function() {
buildWidget_: function(data, delegate) {
// Protocol.
var protocolElement = document.createElement('div');
- protocolElement.innerText = data.protocol;
+ protocolElement.textContent = data.protocol;
protocolElement.className = 'handlers-type-column';
this.appendChild(protocolElement);
@@ -49,7 +49,7 @@ cr.define('options', function() {
var selectElement = document.createElement('select');
var defaultOptionElement = document.createElement('option');
defaultOptionElement.selected = data.default_handler == -1;
- defaultOptionElement.innerText =
+ defaultOptionElement.textContent =
localStrings.getString('handlers_none_handler');
defaultOptionElement.value = -1;
selectElement.appendChild(defaultOptionElement);
@@ -57,7 +57,7 @@ cr.define('options', function() {
for (var i = 0; i < data.handlers.length; ++i) {
var optionElement = document.createElement('option');
optionElement.selected = i == data.default_handler;
- optionElement.innerText = data.handlers[i][1];
+ optionElement.textContent = data.handlers[i][1];
optionElement.value = i;
selectElement.appendChild(optionElement);
}
@@ -80,7 +80,7 @@ cr.define('options', function() {
// Remove link.
var removeElement = document.createElement('div');
- removeElement.innerText =
+ removeElement.textContent =
localStrings.getString('handlers_remove_link');
removeElement.addEventListener('click', function (e) {
var value = selectElement ? selectElement.value : 0;
diff --git a/chrome/browser/resources/sync_internals/events.html b/chrome/browser/resources/sync_internals/events.html
index 928ad9d..51f57aa 100644
--- a/chrome/browser/resources/sync_internals/events.html
+++ b/chrome/browser/resources/sync_internals/events.html
@@ -29,16 +29,16 @@
(function() {
function makeLogEntryNode(entry) {
var timeNode = document.createElement('td');
- timeNode.innerText = entry.date;
+ timeNode.textContent = entry.date;
var submoduleNode = document.createElement('td');
- submoduleNode.innerText = entry.submodule;
+ submoduleNode.textContent = entry.submodule;
var eventNode = document.createElement('td');
- eventNode.innerText = entry.event;
+ eventNode.textContent = entry.event;
var details = document.createElement('pre');
- details.innerText = JSON.stringify(entry.details, null, 2);
+ details.textContent = JSON.stringify(entry.details, null, 2);
var detailsNode = document.createElement('td');
detailsNode.appendChild(details);
diff --git a/chrome/browser/resources/sync_internals/sync_search.js b/chrome/browser/resources/sync_internals/sync_search.js
index 0caa30a..95d2722 100644
--- a/chrome/browser/resources/sync_internals/sync_search.js
+++ b/chrome/browser/resources/sync_internals/sync_search.js
@@ -50,15 +50,15 @@ cr.define('chrome.sync', function() {
// Decorate search box.
queryControl.onsearch = function() {
var query = queryControl.value;
- statusControl.innerText = '';
+ statusControl.textContent = '';
resultsDataModel.splice(0, resultsDataModel.length);
if (!query) {
return;
}
- statusControl.innerText = 'Searching for ' + query + '...';
+ statusControl.textContent = 'Searching for ' + query + '...';
var timer = chrome.sync.makeTimer();
doSearch(query, function(nodeSummaries) {
- statusControl.innerText =
+ statusControl.textContent =
'Found ' + nodeSummaries.length + ' nodes in '
+ timer.elapsedSeconds + 's';
// TODO(akalin): Write a nicer list display.
@@ -78,13 +78,13 @@ cr.define('chrome.sync', function() {
cr.ui.List.decorate(resultsControl);
resultsControl.dataModel = resultsDataModel;
resultsControl.selectionModel.addEventListener('change', function(event) {
- detailsControl.innerText = '';
+ detailsControl.textContent = '';
var selected = resultsControl.selectedItem;
if (selected) {
chrome.sync.getNodeDetailsById([selected.id], function(nodeDetails) {
var selectedNodeDetails = nodeDetails[0] || null;
if (selectedNodeDetails) {
- detailsControl.innerText =
+ detailsControl.textContent =
JSON.stringify(selectedNodeDetails, null, 2);
}
});