summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 15:41:30 +0000
committerdilmah@chromium.org <dilmah@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 15:41:30 +0000
commit3f84856bb47ac43c295a57a4d8c52cea53fb6acf (patch)
tree599215b6ee00049a27f00fc07900dfcc7c2a8928
parent9dc189ed9c36849a0be9add346757f4473dff7e1 (diff)
downloadchromium_src-3f84856bb47ac43c295a57a4d8c52cea53fb6acf.zip
chromium_src-3f84856bb47ac43c295a57a4d8c52cea53fb6acf.tar.gz
chromium_src-3f84856bb47ac43c295a57a4d8c52cea53fb6acf.tar.bz2
Merge 84268 - Trim whitespace and ignore empty lines.
BUG=chromium-os:12829 TEST=Manual Review URL: http://codereview.chromium.org/6928034 TBR=dilmah@chromium.org Review URL: http://codereview.chromium.org/7005028 git-svn-id: svn://svn.chromium.org/chrome/branches/742/src@84982 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/resources/options/chromeos/proxy_options.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/resources/options/chromeos/proxy_options.js b/chrome/browser/resources/options/chromeos/proxy_options.js
index 775cb4a..f3b7e35 100644
--- a/chrome/browser/resources/options/chromeos/proxy_options.js
+++ b/chrome/browser/resources/options/chromeos/proxy_options.js
@@ -164,7 +164,10 @@ cr.define('options', function() {
handleAddException_: function(e) {
var exception = $('newHost').value;
$('newHost').value = '';
- $('ignoredHostList').addException(exception);
+
+ exception = exception.trim();
+ if (exception)
+ $('ignoredHostList').addException(exception);
},
/**