Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 0 additions & 94 deletions addon/-private/sticky/legacy-sticky-polyfill.js

This file was deleted.

47 changes: 14 additions & 33 deletions addon/components/ember-table/component.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
import Component from '@ember/component';
import { computed } from '@ember/object';
import { htmlSafe } from '@ember/string';
import { inject as service } from '@ember/service';

import {
setupLegacyStickyPolyfill,
teardownLegacyStickyPolyfill,
} from '../../-private/sticky/legacy-sticky-polyfill';
import {
setupTableStickyPolyfill,
teardownTableStickyPolyfill,
Expand Down Expand Up @@ -38,46 +32,33 @@ import layout from './template';
export default Component.extend({
layout,
classNames: ['ember-table'],
userAgent: service(),

'data-test-ember-table': true,

didInsertElement() {
this._super(...arguments);

let browser = this.get('userAgent.browser');

if (browser.isIE) {
setupLegacyStickyPolyfill(this.element);
} else {
let thead = this.element.querySelector('thead');
let tfoot = this.element.querySelector('tfoot');
let thead = this.element.querySelector('thead');
let tfoot = this.element.querySelector('tfoot');

if (thead) {
setupTableStickyPolyfill(thead);
}
if (tfoot) {
setupTableStickyPolyfill(tfoot);
}
if (thead) {
setupTableStickyPolyfill(thead);
}
if (tfoot) {
setupTableStickyPolyfill(tfoot);
}
},

willDestroyElement() {
let browser = this.get('userAgent.browser');

if (browser.isIE) {
teardownLegacyStickyPolyfill(this.element);
} else {
let thead = this.element.querySelector('thead');
let tfoot = this.element.querySelector('tfoot');
let thead = this.element.querySelector('thead');
let tfoot = this.element.querySelector('tfoot');

if (thead) {
teardownTableStickyPolyfill(this.element.querySelector('thead'));
}
if (thead) {
teardownTableStickyPolyfill(this.element.querySelector('thead'));
}

if (tfoot) {
teardownTableStickyPolyfill(this.element.querySelector('tfoot'));
}
if (tfoot) {
teardownTableStickyPolyfill(this.element.querySelector('tfoot'));
}

this._super(...arguments);
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@
"ember-compatibility-helpers": "^1.2.0",
"ember-raf-scheduler": "^0.1.0",
"ember-test-selectors": "^2.1.0",
"ember-useragent": "^0.6.0",
"hammerjs": "^2.0.8"
},
"devDependencies": {
Expand Down
7 changes: 0 additions & 7 deletions tests/dummy/config/targets.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
const browsers = ['last 1 Chrome versions', 'last 1 Firefox versions', 'last 1 Safari versions'];

const isCI = !!process.env.CI;
const isProduction = process.env.EMBER_ENV === 'production';

if (isCI || isProduction) {
browsers.push('ie 11');
}

module.exports = {
browsers,
};
25 changes: 0 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6592,18 +6592,6 @@ ember-try@^1.1.0:
rsvp "^4.7.0"
walk-sync "^1.1.3"

ember-useragent@^0.6.0:
version "0.6.1"
resolved "https://registry.npmjs.org/ember-useragent/-/ember-useragent-0.6.1.tgz#0854b3c11acf0fdd98a165fba9bf5dc76eace804"
integrity sha512-J+itj4FVtE0aM+Wx4pInjI2nuSmrQKJhubVJ8twPmmSTLpjatA+DFhiStGc76cZBAyeQQhXezVQyvzzH3RIEoQ==
dependencies:
broccoli-debug "^0.6.3"
broccoli-funnel "^2.0.1"
broccoli-merge-trees "^3.0.0"
ember-cli-babel "^6.6.0"
fastboot-transform "^0.1.2"
ua-parser-js "^0.7.14"

ember-wormhole@^0.5.5:
version "0.5.5"
resolved "https://registry.npmjs.org/ember-wormhole/-/ember-wormhole-0.5.5.tgz#db417ff748cb21e574cd5f233889897bc27096cb"
Expand Down Expand Up @@ -7561,14 +7549,6 @@ fastboot-transform@0.1.1:
dependencies:
broccoli-stew "^1.5.0"

fastboot-transform@^0.1.2:
version "0.1.3"
resolved "https://registry.npmjs.org/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd"
integrity sha512-6otygPIJw1ARp1jJb+6KVO56iKBjhO+5x59RSC9qiZTbZRrv+HZAuP00KD3s+nWMvcFDemtdkugki9DNFTTwCQ==
dependencies:
broccoli-stew "^1.5.0"
convert-source-map "^1.5.1"

fastq@^1.6.0:
version "1.8.0"
resolved "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz#550e1f9f59bbc65fe185cb6a9b4d95357107f481"
Expand Down Expand Up @@ -14341,11 +14321,6 @@ typescript-memoize@^1.0.0-alpha.3:
dependencies:
core-js "2.4.1"

ua-parser-js@^0.7.14:
version "0.7.21"
resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777"
integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==

uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5:
version "1.0.6"
resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
Expand Down