Commit 55a751d5 authored by Demetrios Papadopoulos's avatar Demetrios Papadopoulos Committed by Commit Bot

Fix remaining web_dev_style violations under src/components.

This is in preparation of turning on such PRESUBMIT checks for src/components.

Bug: 1019312
Change-Id: I352cf547b8ea51cb6eba3a8715122c2129948cc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1902065
Auto-Submit: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Esmael Elmoslimany <aee@chromium.org>
Reviewed-by: default avatarEsmael Elmoslimany <aee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713484}
parent d94b0217
......@@ -30,8 +30,8 @@ __gCrWeb['passwords'] = __gCrWeb.passwords;
*/
__gCrWeb.passwords['findPasswordForms'] = function() {
var formDataList = [];
if (hasPasswordField_(window)) {
getPasswordFormDataList_(formDataList, window);
if (hasPasswordField(window)) {
getPasswordFormDataList(formDataList, window);
}
return __gCrWeb.stringify(formDataList);
};
......@@ -43,7 +43,7 @@ __gCrWeb.passwords['findPasswordForms'] = function() {
* contain an input field of type 'password'.
* @return {boolean}
*/
var hasPasswordField_ = function(win) {
var hasPasswordField = function(win) {
var doc = win.document;
// We may will not be allowed to read the 'document' property from a frame
......@@ -56,16 +56,16 @@ var hasPasswordField_ = function(win) {
return true;
}
return getSameOriginFrames_(win).some(hasPasswordField_);
return getSameOriginFrames(win).some(hasPasswordField);
};
/**
* Returns the contentWindow of all iframes that are from the the same origin
* as the containing window.
* @param {Window} win The window in which to look for frames.
* @return {Array.<Window>} Array of the same-origin frames found.
* @return {Array<Window>} Array of the same-origin frames found.
*/
var getSameOriginFrames_ = function(win) {
var getSameOriginFrames = function(win) {
var frames = win.document.getElementsByTagName('iframe');
var result = [];
for (var i = 0; i < frames.length; i++) {
......@@ -84,7 +84,7 @@ var getSameOriginFrames_ = function(win) {
* a proxy for onclick event because onclick handling might be prevented by
* the site JavaScript.
*/
var addSubmitButtonTouchEndHandler_ = function(form) {
var addSubmitButtonTouchEndHandler = function(form) {
if (form.querySelector('input[type=submit]')) {
return;
}
......@@ -99,7 +99,7 @@ var addSubmitButtonTouchEndHandler_ = function(form) {
}
}
for (var i = 0; i < buttons.length; ++i) {
buttons[0].addEventListener('touchend', onSubmitButtonTouchEnd_);
buttons[0].addEventListener('touchend', onSubmitButtonTouchEnd);
}
};
......@@ -107,7 +107,7 @@ var addSubmitButtonTouchEndHandler_ = function(form) {
* Click handler for the submit button. It sends to the host
* form.submitButtonClick command.
*/
var onSubmitButtonTouchEnd_ = function(evt) {
var onSubmitButtonTouchEnd = function(evt) {
var form = evt.currentTarget.form;
var formData = __gCrWeb.passwords.getPasswordFormData(form);
if (!formData) {
......@@ -120,11 +120,11 @@ var onSubmitButtonTouchEnd_ = function(evt) {
/**
* Returns the element from |inputs| which has the field identifier equal to
* |identifier| and null if there is no such element.
* @param {Array.<HTMLInputElement>} inputs
* @param {Array<HTMLInputElement>} inputs
* @param {string} identifier
* @return {HTMLInputElement}
*/
var findInputByFieldIdentifier_ = function(inputs, identifier) {
var findInputByFieldIdentifier = function(inputs, identifier) {
for (var i = 0; i < inputs.length; ++i) {
if (identifier == __gCrWeb.form.getFieldIdentifier(inputs[i])) {
return inputs[i];
......@@ -140,14 +140,14 @@ var findInputByFieldIdentifier_ = function(inputs, identifier) {
* @param {string} identifier The name of the form to extract.
* @return {HTMLFormElement} The password form.
*/
var getPasswordFormElement_ = function(win, identifier) {
var getPasswordFormElement = function(win, identifier) {
var el = win.__gCrWeb.form.getFormElementFromIdentifier(identifier);
if (el) {
return el;
}
var frames = getSameOriginFrames_(win);
var frames = getSameOriginFrames(win);
for (var i = 0; i < frames.length; ++i) {
el = getPasswordFormElement_(frames[i], identifier);
el = getPasswordFormElement(frames[i], identifier);
if (el) {
return el;
}
......@@ -161,7 +161,7 @@ var getPasswordFormElement_ = function(win, identifier) {
* are returned.
* @return {Array<HTMLInputElement>}
*/
var getFormInputElements_ = function(form) {
var getFormInputElements = function(form) {
return __gCrWeb.form.getFormControlElements(form).filter(function(element) {
return element.tagName === 'INPUT';
});
......@@ -173,7 +173,7 @@ var getFormInputElements_ = function(form) {
* @return {string} The password form.
*/
__gCrWeb.passwords['getPasswordFormDataAsString'] = function(identifier) {
var el = getPasswordFormElement_(window, identifier);
var el = getPasswordFormElement(window, identifier);
if (!el) {
return '{}';
}
......@@ -205,7 +205,7 @@ __gCrWeb.passwords['fillPasswordForm'] = function(
if (!__gCrWeb.common.isSameOrigin(origin, normalizedOrigin)) {
return false;
}
return fillPasswordFormWithData_(
return fillPasswordFormWithData(
formData, username, password, window, opt_normalizedOrigin);
};
......@@ -226,9 +226,9 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function(
if (!form) {
return false;
}
var inputs = getFormInputElements_(form);
var inputs = getFormInputElements(form);
var newPasswordField =
findInputByFieldIdentifier_(inputs, newPasswordIdentifier);
findInputByFieldIdentifier(inputs, newPasswordIdentifier);
if (!newPasswordField) {
return false;
}
......@@ -237,7 +237,7 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function(
__gCrWeb.fill.setInputElementValue(password, newPasswordField);
}
var confirmPasswordField =
findInputByFieldIdentifier_(inputs, confirmPasswordIdentifier);
findInputByFieldIdentifier(inputs, confirmPasswordIdentifier);
if (confirmPasswordField && confirmPasswordField.value != password) {
__gCrWeb.fill.setInputElementValue(password, confirmPasswordField);
}
......@@ -256,7 +256,7 @@ __gCrWeb.passwords['fillPasswordFormWithGeneratedPassword'] = function(
* @param {string=} opt_normalizedOrigin The origin URL to compare to.
* @return {boolean} Whether a form field has been filled.
*/
var fillPasswordFormWithData_ = function(
var fillPasswordFormWithData = function(
formData, username, password, win, opt_normalizedOrigin) {
var doc = win.document;
var forms = doc.forms;
......@@ -269,15 +269,15 @@ var fillPasswordFormWithData_ = function(
if (formData.action != normalizedFormAction) {
continue;
}
var inputs = getFormInputElements_(form);
var inputs = getFormInputElements(form);
var usernameInput =
findInputByFieldIdentifier_(inputs, formData.fields[0].name);
findInputByFieldIdentifier(inputs, formData.fields[0].name);
if (usernameInput == null || !__gCrWeb.common.isTextField(usernameInput) ||
usernameInput.disabled) {
continue;
}
var passwordInput =
findInputByFieldIdentifier_(inputs, formData.fields[1].name);
findInputByFieldIdentifier(inputs, formData.fields[1].name);
if (passwordInput == null || passwordInput.type != 'password' ||
passwordInput.readOnly || passwordInput.disabled) {
continue;
......@@ -298,9 +298,9 @@ var fillPasswordFormWithData_ = function(
}
// Recursively invoke for all iframes.
var frames = getSameOriginFrames_(win);
var frames = getSameOriginFrames(win);
for (var i = 0; i < frames.length; i++) {
if (fillPasswordFormWithData_(
if (fillPasswordFormWithData(
formData, username, password, frames[i], opt_normalizedOrigin)) {
filled = true;
}
......@@ -312,26 +312,26 @@ var fillPasswordFormWithData_ = function(
/**
* Finds all forms with passwords in the supplied window or frame and appends
* JS objects containing the form data to |formDataList|.
* @param {!Array.<Object>} formDataList A list that this function populates
* @param {!Array<Object>} formDataList A list that this function populates
* with descriptions of discovered forms.
* @param {Window} win A window (or frame) in which the function should
* look for password forms.
*/
var getPasswordFormDataList_ = function(formDataList, win) {
var getPasswordFormDataList = function(formDataList, win) {
var doc = win.document;
var forms = doc.forms;
for (var i = 0; i < forms.length; i++) {
var formData = __gCrWeb.passwords.getPasswordFormData(forms[i]);
if (formData) {
formDataList.push(formData);
addSubmitButtonTouchEndHandler_(forms[i]);
addSubmitButtonTouchEndHandler(forms[i]);
}
}
// Recursively invoke for all iframes.
var frames = getSameOriginFrames_(win);
var frames = getSameOriginFrames(win);
for (var i = 0; i < frames.length; i++) {
getPasswordFormDataList_(formDataList, frames[i]);
getPasswordFormDataList(formDataList, frames[i]);
}
};
......
......@@ -135,18 +135,17 @@ function setupEvents() {
}
if (lookalike) {
var proceed_button = 'proceed-button';
var dont_proceed_link = 'dont-proceed-link';
$(proceed_button).classList.remove(HIDDEN_CLASS);
var proceedButton = 'proceed-button';
var dontProceedLink = 'dont-proceed-link';
$(proceedButton).classList.remove(HIDDEN_CLASS);
$(proceed_button).textContent =
loadTimeData.getString('proceedButtonText');
$(proceedButton).textContent = loadTimeData.getString('proceedButtonText');
$(proceed_button).addEventListener('click', function(event) {
$(proceedButton).addEventListener('click', function(event) {
sendCommand(SecurityInterstitialCommandId.CMD_PROCEED);
});
$(dont_proceed_link).addEventListener('click', function(event) {
$(dontProceedLink).addEventListener('click', function(event) {
sendCommand(SecurityInterstitialCommandId.CMD_DONT_PROCEED);
});
}
......@@ -188,7 +187,6 @@ function setupEvents() {
});
}
var details_id = null;
if (captivePortal || billing || lookalike) {
// Captive portal, billing and lookalike pages don't have details buttons.
$('details-button').classList.add('hidden');
......
......@@ -15,7 +15,7 @@ logs only clicks, but not mouse movement.
current site and will get the next site.
6. Repeat steps 4-5 till all sites have been visited.
7. You can output the tests for all sites you visited, if you print the value
of the variable "all_tests" in background page's console.
of the variable "allTests" in background page's console.
8. Copy the generated code into the source code of the form classifier tests
(components/test/data/password_manager/form_classification_tests).
......@@ -23,4 +23,4 @@ You might also visit arbitrary sites. Just go to a site, reach the form and
put focus into password field. The backgound page will output a Python test to
the console, but then the extension will get to the next unvisited site.
See this video for more info: goo.gl/nDTIOc.
\ No newline at end of file
See this video for more info: goo.gl/nDTIOc.
......@@ -33,11 +33,11 @@ var IS_PWD_CREATION_VALUE = 'False';
var steps = [];
/**
* The index of the last visited site from |sites_to_visit| (sites_to_visit.js).
* The index of the last visited site from |sitesToVisit| (sites_to_visit.js).
*
* @type {number}
*/
var last_visited_site_index = 0;
var lastVisitedSiteIndex = 0;
/**
* Generated Python tests.
......@@ -51,7 +51,7 @@ var last_visited_site_index = 0;
*
* @type {string}
*/
var all_tests = '\n';
var allTests = '\n';
/**
* Return the name of the test based on the form's url |url|
......@@ -116,7 +116,7 @@ function switchToIframeIfNecessary(step) {
/**
* Outputs to the console the code of a Python test based on script steps
* accumulated in |steps|. Also appends the test code to |all_tests|.
* accumulated in |steps|. Also appends the test code to |allTests|.
*/
function outputPythonTestCode() {
var lastStepUrl = stripUrl(steps[steps.length - 1].url);
......@@ -139,7 +139,7 @@ function outputPythonTestCode() {
test += '\n';
console.log(test);
all_tests += test;
allTests += test;
steps = [];
}
......@@ -147,12 +147,12 @@ function outputPythonTestCode() {
* Moves the current tab to the next site.
*/
function visitNextSite() {
console.log('next site: ' + sites_to_visit[last_visited_site_index] + ' ' +
last_visited_site_index);
chrome.tabs.update(
{url: 'http://' + sites_to_visit[last_visited_site_index]});
console.log(
'next site: ' + sitesToVisit[lastVisitedSiteIndex] + ' ' +
lastVisitedSiteIndex);
chrome.tabs.update({url: 'http://' + sitesToVisit[lastVisitedSiteIndex]});
steps = [];
last_visited_site_index += 1;
lastVisitedSiteIndex += 1;
}
/**
......
......@@ -126,8 +126,8 @@ function getFrames(elem) {
console.error('frameElement is null. Unable to fetch data about iframes');
break;
}
var iframe_selector = getSmartSelector(frameElement);
frames.unshift(iframe_selector);
var iframeSelector = getSmartSelector(frameElement);
frames.unshift(iframeSelector);
elem = elem.ownerDocument.defaultView.frameElement;
}
return frames;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment