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
1 change: 0 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
- master
jobs:
release:
if: "!contains(github.event.head_commit.message, 'skip ci')"
name: Release
timeout-minutes: 2
runs-on: ubuntu-latest
Expand Down
18 changes: 11 additions & 7 deletions d2l-tspan.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import './d2l-table-observer-behavior.js';
import './d2l-td.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
import 'd2l-resize-aware/d2l-resize-aware.js';
import ResizeObserver from 'resize-observer-polyfill/dist/ResizeObserver.es.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-tspan">
Expand Down Expand Up @@ -67,16 +67,16 @@ $_documentContainer.innerHTML = `<dom-module id="d2l-tspan">
border-bottom: var(--d2l-table-light-border);
}

d2l-resize-aware {
#resize-detector {
display: block;
width: 100%;
}
</style>
<d2l-td id="cell">
<div id="float" class="d2l-tspan-float">
<d2l-resize-aware id="resize-detector">
<div id="resize-detector">
<slot></slot>
</d2l-resize-aware>
</div>
</div>
</d2l-td>
</template>
Expand Down Expand Up @@ -131,10 +131,11 @@ Polymer({
}
},
ready: function() {
this._onSizeChanged = this._onSizeChanged.bind(this);
this._resizeObserver = new ResizeObserver(()=> this._onSizeChanged());
},
attached: function() {
this.$['resize-detector'].addEventListener('d2l-resize-aware-resized', this._onSizeChanged);
const resizeDetector = this.$['resize-detector'];
this._resizeObserver.observe(resizeDetector);
var slot = dom(this.root).querySelector('#float');
if (this.focusedStyling) {
slot.addEventListener('focusout', this._boundFocusOutHandler);
Expand All @@ -143,7 +144,10 @@ Polymer({
this.root.host.style.height = this.$.float.offsetHeight + 'px';
},
detached: function() {
this.$['resize-detector'].removeEventListener('d2l-resize-aware-resized', this._onSizeChanged);
if (this._resizeObserver) {
this._resizeObserver.disconnect();
this._resizeObserver = null;
}
var slot = dom(this.root).querySelector('#float');
if (this.focusedStyling) {
slot.removeEventListener('focusout', this._boundFocusOutHandler);
Expand Down
26 changes: 10 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,21 @@
},
"name": "d2l-table",
"scripts": {
"lint": "npm run lint:wc && npm run lint:js",
"lint:js": "eslint . --ext .js,.html test/**/*.js test/**/*.html demo/**/*.js demo/**/*.html",
"lint:wc": "polymer lint",
"test:polymer:local": "polymer test --skip-plugin sauce",
"test": "npm run lint && npm run test:polymer:local"
"lint": "npm run lint:js",
"lint:js": "eslint . --ext .js,.html demo/**/*.html",
"test": "npm run lint",
"start": "wds --node-resolve --watch --open demo/"
},
"author": "D2L Corporation",
"license": "Apache-2.0",
"devDependencies": {
"@polymer/iron-component-page": "^4.0.0",
"@webcomponents/webcomponentsjs": "^2.2.6",
"@web/dev-server": "^0.2",
"babel-eslint": "^10.0.1",
"chromedriver": "^2.34.1",
"d2l-typography": "BrightspaceUI/typography#semver:^7",
"eslint": "^4.15.0",
"eslint-config-brightspace": "^0.4.0",
"eslint-plugin-html": "^4.0.1",
"polymer-cli": "^1.9.5",
"sauce-connect-launcher": "^1.2.3",
"sauceconnect-runner": "git+https://github.com/Brightspace/sauceconnect-runner.git#v0.3.0",
"wct-browser-legacy": "^1.0.1"
"eslint-plugin-html": "^4.0.1"
},
"version": "2.2.8",
"resolutions": {
Expand All @@ -42,12 +36,12 @@
},
"main": "d2l-table.js",
"dependencies": {
"d2l-colors": "BrightspaceUI/colors#semver:^4",
"d2l-resize-aware": "github:BrightspaceUI/resize-aware#semver:^1",
"fastdom": "^1.0.8",
"d2l-icons": "BrightspaceUI/icons#semver:^6",
"@polymer/iron-resizable-behavior": "^3.0.0",
"@polymer/polymer": "^3.0.0",
"d2l-colors": "BrightspaceUI/colors#semver:^4",
"d2l-icons": "BrightspaceUI/icons#semver:^6",
"fastdom": "^1.0.8",
"resize-observer-polyfill": "^1.5.1",
"stickyfilljs": "^2.1.0"
}
}
17 changes: 0 additions & 17 deletions test/.eslintrc

This file was deleted.

Loading