Skip to content

Commit

Permalink
Merge pull request #190 from BrightspaceUI/polymer-3-2018-12-05-110419
Browse files Browse the repository at this point in the history
Fix Paths
  • Loading branch information
dlockhart authored Dec 5, 2018
2 parents 8e053ca + 302b0f0 commit c660dd1
Show file tree
Hide file tree
Showing 27 changed files with 478 additions and 381 deletions.
10 changes: 5 additions & 5 deletions d2l-scroll-wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import '../d2l-icons/tier1-icons.js';
import { IronResizableBehavior } from '../@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
import 'd2l-icons/tier1-icons.js';
import { IronResizableBehavior } from '@polymer/iron-resizable-behavior/iron-resizable-behavior.js';
import './d2l-sticky-element.js';
import './d2l-table-circle-button.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '../@polymer/polymer/lib/utils/render-status.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-scroll-wrapper">
Expand Down
8 changes: 4 additions & 4 deletions d2l-sticky-element.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '../@polymer/polymer/lib/utils/render-status.js';
import '../stickyfilljs/dist/stickyfill.min.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
import 'stickyfilljs/dist/stickyfill.min.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-sticky-element">
Expand Down
8 changes: 4 additions & 4 deletions d2l-table-circle-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import '../d2l-colors/d2l-colors.js';
import '../d2l-icons/d2l-icon.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import 'd2l-colors/d2l-colors.js';
import 'd2l-icons/d2l-icon.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-table-circle-button">
Expand Down
4 changes: 2 additions & 2 deletions d2l-table-col-sort-button.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import './d2l-table-col-sort.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-table-col-sort-button">
Expand Down
8 changes: 4 additions & 4 deletions d2l-table-col-sort.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import '../d2l-icons/d2l-icon.js';
import '../d2l-icons/tier1-icons.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import 'd2l-icons/d2l-icon.js';
import 'd2l-icons/tier1-icons.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-table-col-sort">
Expand Down
6 changes: 3 additions & 3 deletions d2l-table-observer-behavior.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../@polymer/polymer/polymer-legacy.js';
import { afterNextRender } from '../@polymer/polymer/lib/utils/render-status.js';
import { dom } from '../@polymer/polymer/lib/legacy/polymer.dom.js';
import '@polymer/polymer/polymer-legacy.js';
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
window.D2L = window.D2L || {};
window.D2L.PolymerBehaviors = window.D2L.PolymerBehaviors || {};
window.D2L.PolymerBehaviors.Table = window.D2L.PolymerBehaviors.Table || {};
Expand Down
4 changes: 2 additions & 2 deletions d2l-table-shared-styles.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '../@polymer/polymer/polymer-legacy.js';
import '../d2l-colors/d2l-colors.js';
import '@polymer/polymer/polymer-legacy.js';
import 'd2l-colors/d2l-colors.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<custom-style>
Expand Down
4 changes: 2 additions & 2 deletions d2l-table-style.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '../@polymer/polymer/polymer-legacy.js';
import '../d2l-colors/d2l-colors.js';
import '@polymer/polymer/polymer-legacy.js';
import 'd2l-colors/d2l-colors.js';
import './d2l-table-shared-styles.js';
const $_documentContainer = document.createElement('template');

Expand Down
10 changes: 5 additions & 5 deletions d2l-table-wrapper.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,16 +110,16 @@ Custom property | Description | Default
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import '../d2l-colors/d2l-colors.js';
import '../fastdom/fastdom.js';
import 'd2l-colors/d2l-colors.js';
import 'fastdom/fastdom.js';
import './d2l-scroll-wrapper.js';
import './d2l-table-col-sort-button.js';
import './d2l-table-observer-behavior.js';
import './d2l-table-style.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '../@polymer/polymer/lib/utils/render-status.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-table-wrapper">
Expand Down
12 changes: 6 additions & 6 deletions d2l-table.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,10 +106,10 @@ Custom property | Description | Default
from HTML and may be out of place here. Review them and
then delete this comment!
*/
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';

import '../d2l-colors/d2l-colors.js';
import '../fastdom/fastdom.js';
import 'd2l-colors/d2l-colors.js';
import 'fastdom/fastdom.js';
import './d2l-scroll-wrapper.js';
import './d2l-table-col-sort-button.js';
import './d2l-table-observer-behavior.js';
Expand All @@ -122,9 +122,9 @@ import './d2l-th.js';
import './d2l-thead.js';
import './d2l-tr.js';
import './d2l-tspan.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '../@polymer/polymer/lib/utils/render-status.js';
import { dom } from '../@polymer/polymer/lib/legacy/polymer.dom.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
import { afterNextRender } from '@polymer/polymer/lib/utils/render-status.js';
import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-table">
Expand Down
4 changes: 2 additions & 2 deletions d2l-tbody.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import './d2l-table-observer-behavior.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-tbody">
Expand Down
4 changes: 2 additions & 2 deletions d2l-td.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import '../@polymer/polymer/polymer-legacy.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import '@polymer/polymer/polymer-legacy.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-td">
Expand Down
4 changes: 2 additions & 2 deletions d2l-tfoot.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import './d2l-table-observer-behavior.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-tfoot">
Expand Down
4 changes: 2 additions & 2 deletions d2l-th.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import './d2l-table-observer-behavior.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-th">
Expand Down
4 changes: 2 additions & 2 deletions d2l-thead.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import './d2l-table-observer-behavior.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-thead">
Expand Down
4 changes: 2 additions & 2 deletions d2l-tr.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import './d2l-table-observer-behavior.js';
import { Polymer } from '../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-tr">
Expand Down
8 changes: 4 additions & 4 deletions d2l-tspan.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import '../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import './d2l-table-observer-behavior.js';
import ResizeObserver from '../resize-observer-polyfill/dist/ResizeObserver.es.js';
import ResizeObserver from 'resize-observer-polyfill/dist/ResizeObserver.es.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 { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="d2l-tspan">
Expand Down
4 changes: 2 additions & 2 deletions demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script src="../../@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
<script type="module">
import '../d2l-table.js';
import '../../d2l-typography/d2l-typography.js';
import 'd2l-typography/d2l-typography.js';
</script>
<script src="./update-direction.js"></script>
<script type="module" src="../d2l-table.js"></script>
Expand Down Expand Up @@ -1128,4 +1128,4 @@
</div>`;

document.body.appendChild($_documentContainer.content);
</script>
</script>
2 changes: 1 addition & 1 deletion demo/reset.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import '../../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="reset">
Expand Down
4 changes: 2 additions & 2 deletions demo/responsive-demo.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import '../../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import '../d2l-table.js';
import { Polymer } from '../../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
const $_documentContainer = document.createElement('template');

$_documentContainer.innerHTML = `<dom-module id="responsive-demo">
Expand Down
4 changes: 2 additions & 2 deletions demo/simple-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -303,10 +303,10 @@
</div>
</template>
<script type="module">
import '../../@polymer/polymer/polymer-legacy.js';
import '@polymer/polymer/polymer-legacy.js';
import '../d2l-table.js';
import './reset.js';
import { Polymer } from '../../@polymer/polymer/lib/legacy/polymer-fn.js';
import { Polymer } from '@polymer/polymer/lib/legacy/polymer-fn.js';
Polymer({
is: 'simple-demo',
ready: function() {
Expand Down
5 changes: 2 additions & 3 deletions demo/simple.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@
document.body.appendChild($_documentContainer.content);
</script>
</head>

<body class="d2l-typography" unresolved>
<div class="container">
<div class="screenshots screenshot-wide">
Expand Down Expand Up @@ -503,8 +502,8 @@
<script type="module">
import '../d2l-table.js';
import './reset.js';
import '../../d2l-typography/d2l-typography.js';
import { dom } from '../../@polymer/polymer/lib/legacy/polymer.dom.js';
import 'd2l-typography/d2l-typography.js';
import { dom } from '@polymer/polymer/lib/legacy/polymer.dom.js';

function createCellContent() {
var span = document.createElement('span');
Expand Down
2 changes: 1 addition & 1 deletion demo/sticky-headers.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<script src="../../@webcomponents/webcomponentsjs/webcomponents-bundle.js"></script>
<script type="module">
import '../d2l-table.js';
import '../../d2l-typography/d2l-typography.js';
import 'd2l-typography/d2l-typography.js';
</script>
<script src="./update-direction.js"></script>
<script type="module" src="../d2l-table.js"></script>
Expand Down
Loading

0 comments on commit c660dd1

Please sign in to comment.