Skip to content

Commit 5cde16c

Browse files
authored
Merge pull request #258 from plumelo/feature/NEOV-287-upgrade-omnitable
Upgrade <cosmoz-omnitable> to Polymer 2.x
2 parents ed84908 + 58e25ef commit 5cde16c

13 files changed

+437
-357
lines changed

cosmoz-omnitable-column-list-data.html

+2-3
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,7 @@
4747
class OmnitableColumnListData extends Polymer.mixinBehaviors(
4848
[
4949
Cosmoz.TemplateHelperBehavior,
50-
Cosmoz.TranslatableBehavior,
51-
Polymer.IronResizableBehavior
50+
Cosmoz.TranslatableBehavior
5251
],
5352
Polymer.Element
5453
) {
@@ -130,7 +129,7 @@
130129
this._expanded = !this._expanded;
131130
event.stopPropagation();
132131
event.preventDefault();
133-
this.fire('iron-resize');
132+
this.dispatchEvent(new CustomEvent('iron-resize', {bubbles: true}));
134133
}
135134
}
136135
customElements.define(OmnitableColumnListData.is, OmnitableColumnListData);

cosmoz-omnitable-item-expand.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,10 @@
108108
this.hidden = columnsCount === 0;
109109
if (this.expanded) {
110110
// Notify omnitable that this item is expanded and my need individual resize
111-
this.fire('update-item-size', { item: this.item }, { bubbles: true });
111+
this.dispatchEvent(new CustomEvent('update-item-size', {
112+
bubbles: true,
113+
detail: { item: this.item }
114+
}));
112115
}
113116
}
114117

cosmoz-omnitable-repeater-mixin.html

+5-6
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,7 @@
162162
}
163163

164164
_addElements(start, count) {
165-
const end = start + count,
166-
parent = Polymer.dom(this);
165+
const end = start + count;
167166

168167
for (let i = start; i < end; i++) {
169168
const column = this.columns[i],
@@ -182,12 +181,12 @@
182181
this._configureTemplateInstance(instance);
183182
element.setAttribute('slot', this._slotName);
184183

185-
Polymer.dom(element).appendChild(instance.root);
184+
element.appendChild(instance.root);
186185

187186
if (i < this._elements.length) {
188-
parent.insertBefore(element, this._elements[i]);
187+
this.insertBefore(element, this._elements[i]);
189188
} else {
190-
parent.appendChild(element);
189+
this.appendChild(element);
191190
}
192191

193192
// HACK(plequang): repeated element should have style scoped to cosmoz-omnitable, not to the column element.
@@ -207,7 +206,7 @@
207206
.forEach(element => {
208207
this._detachTemplateInstance(element.__instance, element.__column, element);
209208
element.__instance = element.__column = element.column = null;
210-
Polymer.dom(this).removeChild(element);
209+
this.removeChild(element);
211210
});
212211
}
213212

cosmoz-omnitable-templatizer.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@
112112
const children = instance.children;
113113

114114
for (let i = 0; i < children.length; i++) {
115-
Polymer.dom(instance.root).appendChild(children[i]);
115+
instance.root.appendChild(children[i]);
116116
}
117117

118118
instance.__detached__ = true;

cosmoz-omnitable.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ <h3 class="groupRow-label">
212212
</div>
213213

214214
<div id="columns">
215-
<slot></slot>
215+
<slot id="columnsSlot"></slot>
216216
</div>
217217

218218
</template>

0 commit comments

Comments
 (0)