Resolve conflicts

src/elements/emby-button/emby-button.js

@@ -1,16 +1,10 @@
-<<<<<<< HEAD
-import browser from 'browser';
 import dom from 'dom';
 import layoutManager from 'layoutManager';
 import shell from 'shell';
 import appRouter from 'appRouter';
 import appHost from 'apphost';
 import 'css!./emby-button';
-import 'registerElement';
-=======
-define(['browser', 'dom', 'layoutManager', 'shell', 'appRouter', 'apphost', 'css!./emby-button', 'webcomponents'], function (browser, dom, layoutManager, shell, appRouter, appHost) {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
 const EmbyLinkButtonPrototype = Object.create(HTMLAnchorElement.prototype);

src/elements/emby-button/paper-icon-button-light.js

@@ -1,11 +1,6 @@
-<<<<<<< HEAD
 import layoutManager from 'layoutManager';
 import 'css!./emby-button';
-import 'registerElement';
-=======
-define(['layoutManager', 'css!./emby-button', 'webcomponents'], function (layoutManager) {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
 

src/elements/emby-checkbox/emby-checkbox.js

@@ -1,12 +1,7 @@
-<<<<<<< HEAD
 import browser from 'browser';
 import dom from 'dom';
 import 'css!./emby-checkbox';
-import 'registerElement';
-=======
-define(['browser', 'dom', 'css!./emby-checkbox', 'webcomponents'], function (browser, dom) {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 /* eslint-disable indent */
 

src/elements/emby-collapse/emby-collapse.js

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
-import browser from 'browser';
 import 'css!./emby-collapse';
-import 'registerElement';
+import 'webcomponents';
 import 'emby-button';
-=======
-define(['browser', 'css!./emby-collapse', 'webcomponents', 'emby-button'], function (browser) {
-    'use strict';
->>>>>>> upstream/master
 
 /* eslint-disable indent */
 

src/elements/emby-input/emby-input.js

@@ -1,13 +1,7 @@
-<<<<<<< HEAD
-import layoutManager from 'layoutManager';
 import browser from 'browser';
 import dom from 'dom';
 import 'css!./emby-input';
-import 'registerElement';
-=======
-define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'webcomponents'], function (layoutManager, browser, dom) {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 /* eslint-disable indent */
 

src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js

@@ -1,15 +1,10 @@
-<<<<<<< HEAD
 import EmbyProgressRing from 'emby-progressring';
 import dom from 'dom';
 import serverNotifications from 'serverNotifications';
 import events from 'events';
-import 'registerElement';
+import 'webcomponents';
 
 /* eslint-disable indent */
-=======
-define(['emby-progressring', 'dom', 'serverNotifications', 'events', 'webcomponents'], function (EmbyProgressRing, dom, serverNotifications, events) {
-    'use strict';
->>>>>>> upstream/master
 
     function addNotificationEvent(instance, name, handler) {
 

src/elements/emby-itemscontainer/emby-itemscontainer.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import itemShortcuts from 'itemShortcuts';
 import inputManager from 'inputManager';
 import connectionManager from 'connectionManager';
@@ -11,17 +10,11 @@ import loading from 'loading';
 import focusManager from 'focusManager';
 import serverNotifications from 'serverNotifications';
 import events from 'events';
-import 'registerElement';
+import 'webcomponents';
 
 /* eslint-disable indent */
 
     const ItemsContainerPrototype = Object.create(HTMLDivElement.prototype);
-=======
-define(['itemShortcuts', 'inputManager', 'connectionManager', 'playbackManager', 'imageLoader', 'layoutManager', 'browser', 'dom', 'loading', 'focusManager', 'serverNotifications', 'events', 'webcomponents'], function (itemShortcuts, inputManager, connectionManager, playbackManager, imageLoader, layoutManager, browser, dom, loading, focusManager, serverNotifications, events) {
-    'use strict';
-
-    var ItemsContainerPrototype = Object.create(HTMLDivElement.prototype);
->>>>>>> upstream/master
 
     function onClick(e) {
         const itemsContainer = this;

src/elements/emby-progressring/emby-progressring.js

@@ -1,11 +1,5 @@
-<<<<<<< HEAD
-import require from 'require';
 import 'css!./emby-progressring';
 import 'webcomponents';
-=======
-define(['require', 'css!./emby-progressring', 'webcomponents'], function (require) {
-    'use strict';
->>>>>>> upstream/master
 
 /* eslint-disable indent */
 

src/elements/emby-radio/emby-radio.js

@@ -1,11 +1,6 @@
-<<<<<<< HEAD
 import layoutManager from 'layoutManager';
 import 'css!./emby-radio';
-import 'registerElement';
-=======
-define(['layoutManager', 'css!./emby-radio', 'webcomponents'], function (layoutManager) {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 /* eslint-disable indent */
 

src/elements/emby-scrollbuttons/emby-scrollbuttons.js

@@ -1,13 +1,6 @@
-<<<<<<< HEAD
-import layoutManager from 'layoutManager';
-import dom from 'dom';
 import 'css!./emby-scrollbuttons';
-import 'registerElement';
+import 'webcomponents';
 import 'paper-icon-button-light';
-=======
-define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'webcomponents', 'paper-icon-button-light'], function (layoutManager, dom) {
-    'use strict';
->>>>>>> upstream/master
 
 /* eslint-disable indent */
 

src/elements/emby-scroller/emby-scroller.js

@@ -1,16 +1,11 @@
-<<<<<<< HEAD
 import scroller from 'scroller';
 import dom from 'dom';
 import layoutManager from 'layoutManager';
 import inputManager from 'inputManager';
 import focusManager from 'focusManager';
 import browser from 'browser';
-import 'registerElement';
+import 'webcomponents';
 import 'css!./emby-scroller';
-=======
-define(['scroller', 'dom', 'layoutManager', 'inputManager', 'focusManager', 'browser', 'webcomponents', 'css!./emby-scroller'], function (scroller, dom, layoutManager, inputManager, focusManager, browser) {
-    'use strict';
->>>>>>> upstream/master
 
 /* eslint-disable indent */
 

src/elements/emby-select/emby-select.js

@@ -1,13 +1,8 @@
-<<<<<<< HEAD
 import layoutManager from 'layoutManager';
 import browser from 'browser';
 import actionsheet from 'actionsheet';
 import 'css!./emby-select';
-import 'registerElement';
-=======
-define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'webcomponents'], function (layoutManager, browser, actionsheet) {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 /* eslint-disable indent */
 

src/elements/emby-slider/emby-slider.js

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import browser from 'browser';
 import dom from 'dom';
 import layoutManager from 'layoutManager';
@@ -6,10 +5,6 @@ import keyboardnavigation from 'keyboardnavigation';
 import 'css!./emby-slider';
 import 'webcomponents';
 import 'emby-input';
-=======
-define(['browser', 'dom', 'layoutManager', 'keyboardnavigation', 'css!./emby-slider', 'webcomponents', 'emby-input'], function (browser, dom, layoutManager, keyboardnavigation) {
-    'use strict';
->>>>>>> upstream/master
 
 /* eslint-disable indent */
 

src/elements/emby-tabs/emby-tabs.js

@@ -1,16 +1,10 @@
-<<<<<<< HEAD
 import dom from 'dom';
 import scroller from 'scroller';
 import browser from 'browser';
-import layoutManager from 'layoutManager';
 import focusManager from 'focusManager';
-import 'registerElement';
+import 'webcomponents';
 import 'css!./emby-tabs';
 import 'scrollStyles';
-=======
-define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'webcomponents', 'css!./emby-tabs', 'scrollStyles'], function (dom, scroller, browser, layoutManager, focusManager) {
-    'use strict';
->>>>>>> upstream/master
 
 /* eslint-disable indent */
 

src/elements/emby-textarea/emby-textarea.js

@@ -1,15 +1,8 @@
-<<<<<<< HEAD
-import layoutManager from 'layoutManager';
-import browser from 'browser';
 import 'css!./emby-textarea';
-import 'registerElement';
+import 'webcomponents';
 import 'emby-input';
 
 /* eslint-disable indent */
-=======
-define(['layoutManager', 'browser', 'css!./emby-textarea', 'webcomponents', 'emby-input'], function (layoutManager, browser) {
-    'use strict';
->>>>>>> upstream/master
 
     function autoGrow(textarea, maxLines) {
         const self = this;

src/elements/emby-toggle/emby-toggle.js

@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 import 'css!./emby-toggle';
-import 'registerElement';
-=======
-define(['css!./emby-toggle', 'webcomponents'], function () {
-    'use strict';
->>>>>>> upstream/master
+import 'webcomponents';
 
 /* eslint-disable indent */