From 65bfcdd1f8d5348f5402c10bf64c3da989883c61 Mon Sep 17 00:00:00 2001 From: Edward Flick Date: Thu, 11 Jul 2019 02:42:15 -0500 Subject: [PATCH 1/2] Add Ember 3.x support. --- addon/mixins/select-picker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addon/mixins/select-picker.js b/addon/mixins/select-picker.js index 0b21913..e6abd33 100644 --- a/addon/mixins/select-picker.js +++ b/addon/mixins/select-picker.js @@ -19,8 +19,8 @@ const emberArrayFunc = function(method) { }; }; const _contains = emberArrayFunc( - // Backwards compatability for Ember < 2.x - Ember.Enumerable.keys().indexOf('includes') !== -1 ? + // Backwards compatability for Ember < 2.x and > 3.x + (typeOf ((Ember.A()).includes)) === 'function' ? 'includes' : 'contains' ); From 85b1a0aabc4f982ad5b6cadf0ec125fe958c5e5f Mon Sep 17 00:00:00 2001 From: Edward Flick Date: Thu, 11 Jul 2019 02:51:36 -0500 Subject: [PATCH 2/2] Fixed typo in typeof --- addon/mixins/select-picker.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/mixins/select-picker.js b/addon/mixins/select-picker.js index e6abd33..9f95789 100644 --- a/addon/mixins/select-picker.js +++ b/addon/mixins/select-picker.js @@ -20,7 +20,7 @@ const emberArrayFunc = function(method) { }; const _contains = emberArrayFunc( // Backwards compatability for Ember < 2.x and > 3.x - (typeOf ((Ember.A()).includes)) === 'function' ? + (typeof ((Ember.A()).includes)) === 'function' ? 'includes' : 'contains' );