From b7e63ed83b397a8909f4fa1bcc376ac10e445f89 Mon Sep 17 00:00:00 2001 From: Jeldrik Hanschke Date: Sun, 30 Dec 2018 09:06:40 +0100 Subject: [PATCH] refactor: replace ember-object-at-helper by ember-composable-helpers --- .../components/create-options-datetime.hbs | 2 +- ember-cli-build.js | 3 +++ package.json | 3 +-- yarn.lock | 17 +++++++++-------- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/templates/components/create-options-datetime.hbs b/app/templates/components/create-options-datetime.hbs index 74dd32f..58105e5 100644 --- a/app/templates/components/create-options-datetime.hbs +++ b/app/templates/components/create-options-datetime.hbs @@ -28,7 +28,7 @@ {{#form.element classNames='option' label=date.dayFormatted - invisibleLabel=(eq date.dayFormatted (object-at dates (if index (sub index 1) dates.length) 'dayFormatted')) + invisibleLabel=(eq date.dayFormatted (get (object-at (if index (sub index 1) dates.length) dates) 'dayFormatted')) model=date property='time' as |el| diff --git a/ember-cli-build.js b/ember-cli-build.js index 75ef63e..40492c8 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -14,6 +14,9 @@ module.exports = function(defaults) { }, 'ember-cli-babel': { includePolyfill: true + }, + 'ember-composable-helpers': { + only: ['array', 'object-at'], } }); diff --git a/package.json b/package.json index 98290ec..af5a985 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,6 @@ "devDependencies": { "bootstrap": "^3.3.7", "ember-ajax": "^3.0.0", - "ember-array-helper": "^5.0.0", "ember-awesome-macros": "^3.1.0", "ember-bootstrap": "^2.1.2", "ember-bootstrap-cp-validations": "^1.0.0", @@ -49,6 +48,7 @@ "ember-cli-shims": "^1.2.0", "ember-cli-sri": "^2.1.0", "ember-cli-uglify": "^2.0.0", + "ember-composable-helpers": "^2.1.0", "ember-cp-validations": "^3.5.0", "ember-data": "~2.18.0", "ember-data-model-fragments": "^2.14.0", @@ -59,7 +59,6 @@ "ember-math-helpers": "^2.8.1", "ember-moment": "^7.8.0", "ember-native-dom-helpers": "^0.6.2", - "ember-object-at-helper": "0.1.0", "ember-page-title": "^3.0.6", "ember-radio-buttons": "^4.0.1", "ember-resolver": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index ebd2830..29f3088 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4054,7 +4054,7 @@ ember-cli-babel@^5.1.3: ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6: +ember-cli-babel@^5.1.5: version "5.2.8" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876" integrity sha512-Mt9OOB5RaZwjde+LYef8EgwNVCAzsYDv4ktshblaXxr4m/Xm5/7/rxEu42RNrYkoy/qWpT9uhaD+JKK4riMf+w== @@ -4655,6 +4655,14 @@ ember-cli@~2.18.2: walk-sync "^0.3.0" yam "0.0.22" +ember-composable-helpers@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-composable-helpers/-/ember-composable-helpers-2.1.0.tgz#71f75ab2de1c696d21939b5f9dcc62eaf2c947e5" + integrity sha512-H6KCyB/BzjR18MxQFcQQR5MDRmawCmCCZKHQTEpAwhs5wCDhnMMLUGINan+sY4NRPrStfpUlMoGg9fsksN2wJA== + dependencies: + broccoli-funnel "^1.0.1" + ember-cli-babel "^6.6.0" + ember-concurrency@^0.8.7: version "0.8.26" resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.26.tgz#7aeaa5c00e87903a57726823efe68787a83154b0" @@ -4891,13 +4899,6 @@ ember-native-dom-helpers@^0.6.2: broccoli-funnel "^1.1.0" ember-cli-babel "^6.6.0" -ember-object-at-helper@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ember-object-at-helper/-/ember-object-at-helper-0.1.0.tgz#735381aaaf3196f705fd7b08b918298a7c5e847c" - integrity sha1-c1OBqq8xlvcF/XsIuRgpinxehHw= - dependencies: - ember-cli-babel "^5.1.6" - ember-page-title@^3.0.6: version "3.2.2" resolved "https://registry.yarnpkg.com/ember-page-title/-/ember-page-title-3.2.2.tgz#241effbc8228ecfb75e33540f6707003fdf6db31"