Commit 53e31e7b authored by Malay Keshav's avatar Malay Keshav Committed by Commit Bot

WebUI: Fix to change dom-if to use function call rather than property

The expression used in dom-if for a function call must include braces.
This patch adds the missing braces.

Bug: 976057
Change-Id: I948cf50721c96a5642d65ffecc369fa88689650a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1767489Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Commit-Queue: Malay Keshav <malaykeshav@chromium.org>
Cr-Commit-Position: refs/heads/master@{#690119}
parent 36525382
...@@ -111,6 +111,28 @@ Polymer({ ...@@ -111,6 +111,28 @@ Polymer({
}, },
readOnly: true, readOnly: true,
}, },
/**
* True lottie animation file should be used instead of a png animation
* image sequence.
* @private {boolean}
*/
shouldUseLottieAnimation_: {
type: Boolean,
value: function() {
if (!loadTimeData.getBoolean('fingerprintUnlockEnabled')) {
return false;
}
const fingerprintLocation =
loadTimeData.getInteger('fingerprintReaderLocation');
const isTabletPowerButton =
settings.FingerprintLocation.TABLET_POWER_BUTTON ==
fingerprintLocation;
return isTabletPowerButton;
},
readOnly: true,
}
}, },
/** /**
...@@ -344,24 +366,5 @@ Polymer({ ...@@ -344,24 +366,5 @@ Polymer({
this.$.arc.setProgress(oldValue, newValue, newValue === 100); this.$.arc.setProgress(oldValue, newValue, newValue === 100);
}, },
/**
* Returns true if we have lottie animation file instead of a png animation
* image sequence.
* @return boolean
* @private
*/
shouldUseLottieAnimation_: function() {
if (!loadTimeData.getBoolean('fingerprintUnlockEnabled')) {
return false;
}
const fingerprintLocation =
loadTimeData.getInteger('fingerprintReaderLocation');
const isTabletPowerButton =
settings.FingerprintLocation.TABLET_POWER_BUTTON == fingerprintLocation;
return isTabletPowerButton;
},
}); });
})(); })();
...@@ -151,15 +151,48 @@ suite('settings-fingerprint-list', function() { ...@@ -151,15 +151,48 @@ suite('settings-fingerprint-list', function() {
}); });
}); });
test('EnrollingFingerprintLottieAnimation', function() {
loadTimeData.overrideValues({
fingerprintUnlockEnabled: true,
fingerprintReaderLocation:
settings.FingerprintLocation.TABLET_POWER_BUTTON,
});
openDialog();
return browserProxy.whenCalled('startEnroll').then(function() {
assertTrue(dialog.$$('#dialog').open);
assertEquals(settings.FingerprintSetupStep.LOCATE_SCANNER, dialog.step_);
assertFalse(dialog.$$('#scannerLocationLottie').hidden);
});
});
test('EnrollingFingerprintPNG', function() {
loadTimeData.overrideValues({
fingerprintUnlockEnabled: true,
fingerprintReaderLocation:
settings.FingerprintLocation.KEYBOARD_TOP_RIGHT,
});
openDialog();
return browserProxy.whenCalled('startEnroll').then(function() {
assertTrue(dialog.$$('#dialog').open);
assertEquals(settings.FingerprintSetupStep.LOCATE_SCANNER, dialog.step_);
assertFalse(dialog.$$('#scannerLocation').hidden);
});
});
// Verify running through the enroll session workflow // Verify running through the enroll session workflow
// (settings-setup-fingerprint-dialog) works as expected. // (settings-setup-fingerprint-dialog) works as expected.
test('EnrollingFingerprint', function() { test('EnrollingFingerprint', function() {
loadTimeData.overrideValues({
fingerprintUnlockEnabled: true,
fingerprintReaderLocation:
settings.FingerprintLocation.KEYBOARD_BOTTOM_RIGHT,
});
openDialog(); openDialog();
return browserProxy.whenCalled('startEnroll').then(function() { return browserProxy.whenCalled('startEnroll').then(function() {
assertTrue(dialog.$$('#dialog').open); assertTrue(dialog.$$('#dialog').open);
assertEquals(0, dialog.percentComplete_); assertEquals(0, dialog.percentComplete_);
assertEquals(settings.FingerprintSetupStep.LOCATE_SCANNER, dialog.step_); assertEquals(settings.FingerprintSetupStep.LOCATE_SCANNER, dialog.step_);
assertFalse(dialog.$$('#scannerLocationLottie').hidden); assertFalse(dialog.$$('#scannerLocation').hidden);
assertTrue(dialog.$$('#arc').hidden); assertTrue(dialog.$$('#arc').hidden);
// Message should be shown for LOCATE_SCANNER step. // Message should be shown for LOCATE_SCANNER step.
assertEquals( assertEquals(
...@@ -171,7 +204,7 @@ suite('settings-fingerprint-list', function() { ...@@ -171,7 +204,7 @@ suite('settings-fingerprint-list', function() {
settings.FingerprintResultType.SUCCESS, false, 20 /* percent */); settings.FingerprintResultType.SUCCESS, false, 20 /* percent */);
assertEquals(20, dialog.percentComplete_); assertEquals(20, dialog.percentComplete_);
assertEquals(settings.FingerprintSetupStep.MOVE_FINGER, dialog.step_); assertEquals(settings.FingerprintSetupStep.MOVE_FINGER, dialog.step_);
assertTrue(dialog.$$('#scannerLocationLottie').hidden); assertTrue(dialog.$$('#scannerLocation').hidden);
assertFalse(dialog.$$('#arc').hidden); assertFalse(dialog.$$('#arc').hidden);
// Verify that by sending a scan problem, the div that contains the // Verify that by sending a scan problem, the div that contains the
...@@ -217,6 +250,11 @@ suite('settings-fingerprint-list', function() { ...@@ -217,6 +250,11 @@ suite('settings-fingerprint-list', function() {
// Verify enrolling a fingerprint, then enrolling another without closing the // Verify enrolling a fingerprint, then enrolling another without closing the
// dialog works as intended. // dialog works as intended.
test('EnrollingAnotherFingerprint', function() { test('EnrollingAnotherFingerprint', function() {
loadTimeData.overrideValues({
fingerprintUnlockEnabled: true,
fingerprintReaderLocation:
settings.FingerprintLocation.KEYBOARD_TOP_RIGHT,
});
openDialog(); openDialog();
return browserProxy.whenCalled('startEnroll') return browserProxy.whenCalled('startEnroll')
.then(function() { .then(function() {
...@@ -254,7 +292,7 @@ suite('settings-fingerprint-list', function() { ...@@ -254,7 +292,7 @@ suite('settings-fingerprint-list', function() {
assertTrue(dialog.$$('#dialog').open); assertTrue(dialog.$$('#dialog').open);
assertFalse(isVisible(addAnotherButton)); assertFalse(isVisible(addAnotherButton));
assertEquals(settings.FingerprintSetupStep.MOVE_FINGER, dialog.step_); assertEquals(settings.FingerprintSetupStep.MOVE_FINGER, dialog.step_);
assertTrue(dialog.$$('#scannerLocationLottie').hidden); assertTrue(dialog.$$('#scannerLocation').hidden);
assertFalse(dialog.$$('#arc').hidden); assertFalse(dialog.$$('#arc').hidden);
browserProxy.scanReceived( browserProxy.scanReceived(
......
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