fix: hide week number in Islamic, Buddhist Japanese calendars (#806)

SAP · Oct 1, 2019 · a5ccb80 · a5ccb80
1 parent 71c9caa
commit a5ccb80
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/packages/main/src/DayPicker.hbs b/packages/main/src/DayPicker.hbs
@@ -1,12 +1,14 @@
 <div class="ui5-dp-root" style="{{styles.wrapper}}">
 
-	<div class="ui5-dp-weeknumber-container">
-		{{#each _weekNumbers}}
-			<div class="ui5-dp-weekname-container">
-				<span class="ui5-dp-weekname">{{this}}</span>
-			</div>
-		{{/each}}
-	</div>
+	{{#if showWeekNumbers}}
+		<div class="ui5-dp-weeknumber-container">
+			{{#each _weekNumbers}}
+				<div class="ui5-dp-weekname-container">
+					<span class="ui5-dp-weekname">{{this}}</span>
+				</div>
+			{{/each}}
+		</div>
+	{{/if}}
 
 	<div id="{{_id}}-content" class="ui5-dp-content">
 		<div role="row" class="ui5-dp-days-names-container">

diff --git a/packages/main/src/DayPicker.js b/packages/main/src/DayPicker.js
@@ -300,6 +300,10 @@ class DayPicker extends UI5Element {
 		}
 	}
 
+	get showWeekNumbers() {
+		return this.primaryCalendarType === CalendarType.Gregorian;
+	}
+
 	get _timestamp() {
 		return this.timestamp !== undefined ? this.timestamp : Math.floor(new Date().getTime() / 1000);
 	}

diff --git a/packages/main/test/sap/ui/webcomponents/main/samples/Input.sample.html b/packages/main/test/sap/ui/webcomponents/main/samples/Input.sample.html
@@ -214,7 +214,7 @@ <h3>Input with Label</h3>
 
 	<script>
 		var searchCriteria = "PASTA";
-		searchIcon.addEventListener("press", function(){
+		searchIcon.addEventListener("click", function(){
 			alert("Look for: " + searchCriteria);
 		});
 		searchInput.addEventListener("input", function(e){