Fixed #963

primefaces · Sep 27, 2016 · 98437d6 · 98437d6
1 parent 71fc12d
commit 98437d6
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 26 deletions.
diff --git a/components/datatable/datatable.ts b/components/datatable/datatable.ts
@@ -576,34 +576,37 @@ export class DataTable implements AfterViewChecked,AfterViewInit,AfterContentIni
         if(!column.sortable) {
             return;
         }
-
-        this.sortOrder = (this.sortField === column.field)  ? this.sortOrder * -1 : 1;
-        this.sortField = column.field;
-        this.sortColumn = column;
-        let metaKey = event.metaKey||event.ctrlKey;
-
-        if(this.lazy) {
-            this.onLazyLoad.emit(this.createLazyLoadMetadata());
-        }
-        else {
-            if(this.sortMode == 'multiple') {
-                if(!this.multiSortMeta||!metaKey) {
-                    this.multiSortMeta = [];
-                }
-
-                this.addSortMeta({field: this.sortField, order: this.sortOrder});
-                this.sortMultiple();
+
+        let targetNode = event.target.nodeName;
+        if(targetNode == 'TH' || (targetNode == 'SPAN' && !this.domHandler.hasClass(event.target, 'ui-c'))) {
+            this.sortOrder = (this.sortField === column.field)  ? this.sortOrder * -1 : 1;
+            this.sortField = column.field;
+            this.sortColumn = column;
+            let metaKey = event.metaKey||event.ctrlKey;
+
+            if(this.lazy) {
+                this.onLazyLoad.emit(this.createLazyLoadMetadata());
             }
             else {
-                this.sortSingle();
+                if(this.sortMode == 'multiple') {
+                    if(!this.multiSortMeta||!metaKey) {
+                        this.multiSortMeta = [];
+                    }
+
+                    this.addSortMeta({field: this.sortField, order: this.sortOrder});
+                    this.sortMultiple();
+                }
+                else {
+                    this.sortSingle();
+                }
             }
+
+            this.onSort.emit({
+                field: this.sortField,
+                order: this.sortOrder,
+                multisortmeta: this.multiSortMeta
+            });
         }
-
-        this.onSort.emit({
-            field: this.sortField,
-            order: this.sortOrder,
-            multisortmeta: this.multiSortMeta
-        });
     }
 
     sortSingle() {

diff --git a/components/dropdown/dropdown.ts b/components/dropdown/dropdown.ts
@@ -29,7 +29,7 @@ export const DROPDOWN_VALUE_ACCESSOR: any = {
             <input type="text" class="ui-dropdown-label ui-inputtext ui-corner-all" *ngIf="editable" 
                         (click)="onInputClick($event)" (input)="onInputChange($event)" (focus)="hide()">
             <div class="ui-dropdown-trigger ui-state-default ui-corner-right" [ngClass]="{'ui-state-hover':hover&&!disabled,'ui-state-focus':focus}">
-                <span class="fa fa-fw fa-caret-down"></span>
+                <span class="fa fa-fw fa-caret-down ui-c"></span>
             </div>
             <div class="ui-dropdown-panel ui-widget-content ui-corner-all ui-helper-hidden ui-shadow" 
                 [style.display]="panelVisible ? 'block' : 'none'">

diff --git a/components/multiselect/multiselect.ts b/components/multiselect/multiselect.ts
@@ -23,7 +23,7 @@ export const MULTISELECT_VALUE_ACCESSOR: any = {
                 <label [ngClass]="{'ui-multiselect-label ui-corner-all':true,'ui-state-hover':hover,'ui-state-focus':focus}">{{valuesAsString}}</label>
             </div>
             <div [ngClass]="{'ui-multiselect-trigger ui-state-default ui-corner-right':true,'ui-state-hover':hover,'ui-state-focus':focus}">
-                <span class="fa fa-fw fa-caret-down"></span>
+                <span class="fa fa-fw fa-caret-down ui-c"></span>
             </div>
             <div class="ui-multiselect-panel ui-widget ui-widget-content ui-corner-all ui-shadow" [style.display]="overlayVisible ? 'block' : 'none'" (click)="panelClick=true">
                 <div class="ui-widget-header ui-corner-all ui-multiselect-header ui-helper-clearfix">