From 200dbeb7338edadd91622bb9df6a38db6b7c4d3b Mon Sep 17 00:00:00 2001 From: Mike North Date: Fri, 14 Dec 2018 12:40:21 -0800 Subject: [PATCH 1/2] fix: ie11-friendly way of removing the loading indicator Fixes #134 --- addon/components/ember-load-remover.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/addon/components/ember-load-remover.js b/addon/components/ember-load-remover.js index 909708ff..dcf865cd 100644 --- a/addon/components/ember-load-remover.js +++ b/addon/components/ember-load-remover.js @@ -20,8 +20,13 @@ export default Component.extend({ this.get('ember-load-config.loadingIndicatorClass') || 'ember-load-indicator'; const elems = document.querySelectorAll(`.${loadingIndicatorClass}`); + /** + * Very important to iterate over the NodeList this way, + * and remove the DOM elements via removeChild to maintain ie11 + * compatibility + */ for (let i = 0; i < elems.length; i++) { - elems[i].remove(); + elems[i].parentNode.removeChild(elems[i]); } } }); From 1cf5ba4201ccd85d0f6e88c641f63675052e5ed1 Mon Sep 17 00:00:00 2001 From: Mike North Date: Tue, 12 Mar 2019 10:09:22 -0700 Subject: [PATCH 2/2] fix: restore support for ember 2.12 Fixes #170 --- .travis.yml | 3 ++- app/initializers/hide-loading-screen.js | 9 ++++++--- config/ember-try.js | 12 ++++++++++++ 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index f72ccb52..4bc753c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -50,7 +50,8 @@ jobs: # as well as latest stable release (bonus points to beta/canary) - stage: 'Additional Tests' node_js: '10' - env: EMBER_TRY_SCENARIO=ember-lts-2.16 + env: EMBER_TRY_SCENARIO=ember-lts-2.12 + - env: EMBER_TRY_SCENARIO=ember-lts-2.16 - env: EMBER_TRY_SCENARIO=ember-lts-2.18 - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta diff --git a/app/initializers/hide-loading-screen.js b/app/initializers/hide-loading-screen.js index 5462d1f6..88ca85de 100644 --- a/app/initializers/hide-loading-screen.js +++ b/app/initializers/hide-loading-screen.js @@ -1,8 +1,11 @@ -import hideLoadingScreenInstanceInitializer from '../instance-initializers/hide-loading-screen'; -import { VERSION } from '@ember/version'; +import hideLoadingScreenInstanceInitializer from "../instance-initializers/hide-loading-screen"; +import Ember from "ember"; const EMBER_VERSION_REGEX = /^([0-9]+)\.([0-9]+)\.([0-9]+)(?:(?:-(alpha|beta)\.([0-9]+)(?:\.([0-9]+))?)?)?(?:\+(canary))?(?:\.([0-9abcdef]+))?(?:-([A-Za-z0-9.-]+))?(?:\+([A-Za-z0-9.-]+))?$/; +// eslint-disable-next-line ember/new-module-imports +const { VERSION } = Ember; + /** * VERSION_INFO[i] is as follows: * @@ -30,6 +33,6 @@ export function initialize() { } export default { - name: 'hide-loading-screen', + name: "hide-loading-screen", initialize }; diff --git a/config/ember-try.js b/config/ember-try.js index 2ca5a559..9f2be221 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -11,6 +11,18 @@ module.exports = function() { return { useYarn: true, scenarios: [ + { + name: 'ember-lts-2.12', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }), + }, + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.12.0' + } + } + }, { name: 'ember-lts-2.16', env: {