LPS-101943 Source formatting

natocesarrego · Feb 14, 2020 · bb075ca · bb075ca
1 parent 28ca2ed
commit bb075ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/...m-builder/src/main/resources/META-INF/resources/js/components/Calculator/Calculator.es.js b/...m-builder/src/main/resources/META-INF/resources/js/components/Calculator/Calculator.es.js
@@ -94,24 +94,14 @@ class Calculator extends Component {
 
 	prepareStateForRender(state) {
 		const {expression} = state;
-		let placeholder = Liferay.Language.get(
-			'the-expression-will-be-displayed-here'
-		);
-
-		if (
-			typeof Liferay !== 'undefined' &&
-			typeof Liferay.Browser !== 'undefined'
-		) {
-			if (Liferay.Browser.isIe()) {
-				placeholder = '';
-			}
-		}
 
 		return {
 			...state,
 			...this.getStateBasedOnExpression(expression),
 			expression: expression.replace(/[[\]]/g, ''),
-			placeholder
+			placeholder: Liferay.Browser.isIe()
+				? ''
+				: Liferay.Language.get('the-expression-will-be-displayed-here')
 		};
 	}
 

diff --git a/...-mapping/dynamic-data-mapping-form-builder/test/js/components/Calculator/Calculator.es.js b/...-mapping/dynamic-data-mapping-form-builder/test/js/components/Calculator/Calculator.es.js
@@ -66,6 +66,13 @@ describe('Calculator', () => {
 		beforeEach(() => {
 			jest.useFakeTimers();
 
+			window.Liferay = {
+				...(window.Liferay || {}),
+				Browser: {
+					isIe: () => false
+				}
+			};
+
 			component = new Calculator(getBaseConfig());
 		});