Skip to content

Commit 912f210

Browse files
authored
Merge pull request #36 from Saranya13/master
config(EJ2-000): V18.4.39 released
2 parents f168494 + 1c58d1c commit 912f210

23 files changed

+100
-93
lines changed

sampleOrder.json

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -739,6 +739,19 @@
739739
"exporting": "Export"
740740
}
741741
},
742+
"progress-bar" : {
743+
"ControlName" : "Progress Bar",
744+
"Samples" : {
745+
"Linear": "Linear",
746+
"default": "Circular",
747+
"semi-Circle'": "Angle",
748+
"custom-content": "Custom content",
749+
"labels": "Labels",
750+
"Radius": "Radius",
751+
"stripes": "Stripes",
752+
"progress-segment": "Progress Segment"
753+
}
754+
},
742755
"query-builder": {
743756
"ControlName": "Query Builder",
744757
"Samples": {
@@ -764,24 +777,6 @@
764777
"rtl": "RTL"
765778
}
766779
},
767-
"range-slider": {
768-
"ControlName": "Range Slider",
769-
"Samples": {
770-
"api": "API",
771-
"azure-pricing": "Cloud Pricing",
772-
"default": "Default Functionalities",
773-
"events": "Events",
774-
"format": "Formatting",
775-
"limits": "Limits",
776-
"orientation": "Orientation",
777-
"selection-bar-customization": "Bar",
778-
"thumb-customization": "Thumb",
779-
"ticks": "Ticks",
780-
"ticks-customization": "Ticks",
781-
"tooltip": "Tooltip",
782-
"tooltip-customization": "Tooltip"
783-
}
784-
},
785780
"rich-text-editor": {
786781
"ControlName": "Rich Text Editor",
787782
"Samples": {
@@ -878,7 +873,7 @@
878873
"sidebar-list": "Sidebar With ListView"
879874
}
880875
},
881-
"slider": {
876+
"range-slider": {
882877
"ControlName": "Range Slider",
883878
"Samples": {
884879
"default": "Default Functionalities",

src/app/common/left-pane.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@
7777
<div class="sb-footer-link">Knowledge Base</div>
7878
</a>
7979
</div>
80-
<div class="sb-footer-copyright">Copyright © 2001-2020 Syncfusion Inc.</div>
80+
<div class="sb-footer-copyright">Copyright © 2001-2021 Syncfusion Inc.</div>
8181
</div>
8282
</div>

src/app/common/page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<div class="sb-footer-link">Knowledge Base</div>
132132
</a>
133133
</div>
134-
<div class="sb-footer-copyright">Copyright &copy; 2001-2020 Syncfusion Inc.</div>
134+
<div class="sb-footer-copyright">Copyright &copy; 2001-2021 Syncfusion Inc.</div>
135135
</div>
136136
<div class="sb-footer-logo">
137137
<a href="//www.syncfusion.com" target="_blank">

src/app/common/sb.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const themes: string[] = ['material', 'fabric', 'bootstrap', 'highcontrast', 'bo
6565
let selectedTheme: string;
6666
let themeFlag: boolean = true;
6767
let slideFlag: boolean = false;
68-
68+
let resetSearch: Element = select('.sb-reset-icon');
6969

7070
declare let hljs: any;
7171
/**
@@ -634,6 +634,11 @@ export class SBController {
634634
}
635635
}
636636

637+
resetInput(): void {
638+
(<HTMLInputElement>document.getElementById('search-input')).value = '';
639+
document.getElementById('search-input-wrapper').setAttribute('data-value', '');
640+
}
641+
637642
wireEvents() {
638643
select('#header-theme-switcher').addEventListener('click', this.onThemeButtonClick.bind(this));
639644
select('.setting-responsive').addEventListener('click', this.onMouseTouchButtonClick.bind(this));
@@ -651,6 +656,7 @@ export class SBController {
651656
window.addEventListener('resize', this.onSBResize.bind(this));
652657
document.addEventListener('click', this.onDocClick.bind(this));
653658
document.getElementById('themelist').addEventListener('click', this.onChangeTheme.bind(this));
659+
document.addEventListener('click', this.resetInput);
654660
}
655661

656662
onPrevButtonClick(): void {

src/app/pivot-table/aggregation-stackb.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/app/pivot-table/aggregation.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div id="action-description">
2-
<p>This sample demonstrates the aggregate types like sum, average, min, max, count, distinct count, and more in the pivot table for quick business analysis. End users can also change the aggregation type of each field bound to the value axis in the field list at runtime.</p>
2+
<p>This sample demonstrates the aggregate types like sum, average, median, min, max, count, distinct count, and more in the pivot table for quick business analysis. End users can also change the aggregation type of each field bound to the value axis in the field list at runtime.</p>
33
</div>
44
<div id="description">
55
<p>
66
In this sample, you can change the aggregate types for value fields using the dropdown list separately. The aggregate type can be set using the <code>type</code> property of the value field. The built-in aggregates are:
77
</p>
88
<p>
9-
<code>Sum</code>, <code>Average</code>, <code>Min</code>, <code>Max</code>, <code>Count</code>, <code>Distinct Count</code>, <code>Product</code>,
9+
<code>Sum</code>, <code>Average</code>, <code>Median</code>, <code>Min</code>, <code>Max</code>, <code>Count</code>, <code>Distinct Count</code>, <code>Product</code>,
1010
<code>Index</code>, <code>Population StDev</code>, <code>Sample StDev</code>, <code>Population Var</code>, <code>Sample Var</code>, <code>Running Totals</code>,
1111
<code>Difference From</code>, <code>% of Difference From</code>, <code>% of Grand Total</code>, <code>% of Column Total</code>, <code>% of Row Total</code>,
1212
<code>% of Parent Total</code>, <code>% of Parent Column Total</code>, <code>% of Parent Row Total.</code>
@@ -32,6 +32,7 @@
3232
<select id="freightdrpdwn" name="ddl-view-mode">
3333
<option value='Sum' selected>Sum</option>
3434
<option value='Avg'>Average</option>
35+
<option value='Median'>Median</option>
3536
<option value='Min'>Min</option>
3637
<option value='Max'>Max</option>
3738
<option value='Count'>Count</option>
@@ -61,6 +62,7 @@
6162
<select id="pricedrpdwn" name="ddl-view-mode">
6263
<option value='Sum' selected>Sum</option>
6364
<option value='Avg'>Average</option>
65+
<option value='Median'>Median</option>
6466
<option value='Min'>Min</option>
6567
<option value='Max'>Max</option>
6668
<option value='Product'>Product</option>

src/app/pivot-table/pivot-table.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export const pivottableRouteConfig: Object[] = [
5353
{ 'path': ':theme/pivot-table/grouping', 'description': 'This demo for Essential JS2 Pivot Table control demonstrate the grouping feature for date and number fields', component: GroupingComponent, 'name': 'Grouping', order: '04', category: 'User Interaction' },
5454
{ 'path': ':theme/pivot-table/toolbar', 'description': 'This demo for Essential JS2 Pivot Table control demonstrate the toolbar feature of the pivot table', component: ToolbarComponent, 'name': 'Toolbar', order: '04', category: 'User Interaction' },
5555
{ 'path': ':theme/pivot-table/calculated-field', 'description': 'This demo for Essential JS2 Pivot Table control shows calculated field, and it allows users to add calculated items', component: CalculatedFieldComponent, 'name': 'Calculated Field', order: '05', category: 'Formula' },
56-
{ 'path': ':theme/pivot-table/aggregation', 'description': 'This demo for Essential JS2 Pivot Table control shows different types of aggregation for value fields', component: AggregationComponent, 'name': 'Aggregation', order: '05', category: 'Formula' },
56+
{ 'path': ':theme/pivot-table/aggregation', 'description': 'This demo for Essential JS2 Pivot Table control shows different types of aggregation for value fields', component: AggregationComponent, 'name': 'Aggregation', order: '05', category: 'Formula', type: 'update' },
5757
{ 'path': ':theme/pivot-table/sorting', 'description': 'This demo for Essential JS2 Pivot Table control shows ordering(sorting) of fields either in ascending or descending order', component: SortingComponent, 'name': 'Default Sorting', order: '06', category: 'Sorting' },
5858
{ 'path': ':theme/pivot-table/value-sorting', 'description': 'This demo for Essential JS2 Pivot Table control shows sorting values on column or row wise in ascending or descending order', component: ValueSortingComponent, 'name': 'Value Sorting', order: '06', category: 'Sorting' },
5959
{ 'path': ':theme/pivot-table/filtering', 'description': 'This demo for Essential JS2 Pivot Table control demonstrate member filtering of field headers either by including or excluding them', component: FilteringComponent, 'name': 'Default Filtering', order: '07', category: 'Filtering' },

src/app/spreadsheet/cell-data-binding-stackb.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/app/spreadsheet/cell-formatting-stackb.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

src/app/spreadsheet/cell-template-stackb.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)