Merge pull request #409 from Conrad777/master

fix(isCheckboxDisabled): isLabel option breaks disabled check
softsimon · Apr 19, 2018 · 70e3382 · 70e3382
2 parents 9dc9475 + bbf259e
commit 70e3382
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/dropdown/dropdown.component.html b/src/dropdown/dropdown.component.html
@@ -65,8 +65,8 @@
         </span>
       </span>
       <ng-template #label>
-        <span [class.disabled]="isCheckboxDisabled()">{{ option.name }}</span>
+        <span [class.disabled]="isCheckboxDisabled(option)">{{ option.name }}</span>
       </ng-template>
     </a>
   </div>
-</div>
+</div>
diff --git a/src/dropdown/dropdown.component.ts b/src/dropdown/dropdown.component.ts
@@ -642,8 +642,8 @@ export class MultiselectDropdownComponent
     }
   }
 
-  isCheckboxDisabled(option: IMultiSelectOption): boolean {
-    return this.disabledSelection || option.disabled;
+  isCheckboxDisabled(option?: IMultiSelectOption): boolean {
+    return this.disabledSelection || option && option.disabled;
   }
 
   checkScrollPosition(ev) {