' + cardBuilder.getDefaultText(item, options);
->>>>>>> upstream/master
}
let indicatorsHtml = '';
@@ -518,13 +488,6 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
html += '
';
}
-<<<<<<< HEAD
- if (options.moreButton !== false) {
- html += `
`;
- }
-
-=======
->>>>>>> upstream/master
if (options.infoButton) {
html += '
';
}
@@ -538,21 +501,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes;
-<<<<<<< HEAD
- if (itemHelper.canMarkPlayed(item)) {
- html += `
`;
- }
-
- if (itemHelper.canRate(item)) {
- html += `
`;
-=======
if (itemHelper.canMarkPlayed(item) && options.enablePlayedButton !== false) {
html += '
';
}
if (itemHelper.canRate(item) && options.enableRatingButton !== false) {
html += '
';
->>>>>>> upstream/master
}
}
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index 3d2ef4f30..107c0c79d 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -394,12 +394,7 @@ import 'emby-ratingbutton';
// See bindEvents for why this is necessary
if (positionSlider && !positionSlider.dragging) {
if (runtimeTicks) {
-<<<<<<< HEAD
-
let pct = positionTicks / runtimeTicks;
-=======
- var pct = positionTicks / runtimeTicks;
->>>>>>> upstream/master
pct *= 100;
positionSlider.value = pct;
@@ -413,13 +408,7 @@ import 'emby-ratingbutton';
}
if (currentTimeElement) {
-<<<<<<< HEAD
-
let timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
-
-=======
- var timeText = positionTicks == null ? '--:--' : datetime.getDisplayRunningTime(positionTicks);
->>>>>>> upstream/master
if (runtimeTicks) {
timeText += ' / ' + datetime.getDisplayRunningTime(runtimeTicks);
}
@@ -540,25 +529,7 @@ import 'emby-ratingbutton';
const nowPlayingItem = state.NowPlayingItem;
-<<<<<<< HEAD
const textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
- if (textLines.length > 1) {
- textLines[1].secondary = true;
- }
- nowPlayingTextElement.innerHTML = textLines.map(function (nowPlayingName) {
-
- const cssClass = nowPlayingName.secondary ? ' class="nowPlayingBarSecondaryText"' : '';
-
- if (nowPlayingName.item) {
- const nowPlayingText = getTextActionButton(nowPlayingName.item, nowPlayingName.text);
- return `
${nowPlayingText}
`;
- }
- let nowPlayingText = '';
- return `
${nowPlayingText}
`;
-
- }).join('');
-=======
- var textLines = nowPlayingItem ? nowPlayingHelper.getNowPlayingNames(nowPlayingItem) : [];
nowPlayingTextElement.innerHTML = '';
if (textLines) {
let itemText = document.createElement('div');
@@ -581,7 +552,6 @@ import 'emby-ratingbutton';
nowPlayingTextElement.appendChild(itemText);
nowPlayingTextElement.appendChild(secondaryText);
}
->>>>>>> upstream/master
const imgHeight = 70;
@@ -613,25 +583,8 @@ import 'emby-ratingbutton';
const apiClient = connectionManager.getApiClient(nowPlayingItem.ServerId);
apiClient.getItem(apiClient.getCurrentUserId(), nowPlayingItem.Id).then(function (item) {
-<<<<<<< HEAD
const userData = item.UserData || {};
const likes = userData.Likes == null ? '' : userData.Likes;
- const contextButton = document.querySelector('.btnToggleContextMenu');
- const options = {
- play: false,
- queue: false,
- positionTo: contextButton
- };
- nowPlayingUserData.innerHTML = '
';
- apiClient.getCurrentUser().then(function(user) {
- contextButton.addEventListener('click', function () {
- itemContextMenu.show(Object.assign({
- item: item,
- user: user
- }, options ));
-=======
- var userData = item.UserData || {};
- var likes = userData.Likes == null ? '' : userData.Likes;
if (!layoutManager.mobile) {
let contextButton = nowPlayingBarElement.querySelector('.btnToggleContextMenu');
// We remove the previous event listener by replacing the item in each update event
@@ -651,7 +604,6 @@ import 'emby-ratingbutton';
user: user
}, options));
});
->>>>>>> upstream/master
});
}
nowPlayingUserData.innerHTML = '
';
@@ -664,13 +616,7 @@ import 'emby-ratingbutton';
function onPlaybackStart(e, state) {
console.debug('nowplaying event: ' + e.type);
-<<<<<<< HEAD
-
- const player = this;
-
-=======
var player = this;
->>>>>>> upstream/master
onStateChanged.call(player, e, state);
}
@@ -679,9 +625,6 @@ import 'emby-ratingbutton';
return;
}
-<<<<<<< HEAD
- const player = this;
-=======
updateRepeatModeDisplay(playbackManager.getRepeatMode());
}
@@ -689,7 +632,6 @@ import 'emby-ratingbutton';
if (!isEnabled) {
return;
}
->>>>>>> upstream/master
let shuffleMode = playbackManager.getQueueShuffleMode();
let context = nowPlayingBarElement;
diff --git a/src/controllers/auth/login.js b/src/controllers/auth/login.js
index 034e4e157..8bac557a2 100644
--- a/src/controllers/auth/login.js
+++ b/src/controllers/auth/login.js
@@ -1,18 +1,14 @@
-<<<<<<< HEAD
import appHost from 'apphost';
import appSettings from 'appSettings';
import dom from 'dom';
import connectionManager from 'connectionManager';
import loading from 'loading';
import layoutManager from 'layoutManager';
+import libraryMenu from 'libraryMenu';
import browser from 'browser';
import globalize from 'globalize';
import 'cardStyle';
import 'emby-checkbox';
-=======
-define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layoutManager', 'libraryMenu', 'browser', 'globalize', 'cardStyle', 'emby-checkbox'], function (appHost, appSettings, dom, connectionManager, loading, layoutManager, libraryMenu, browser, globalize) {
- 'use strict';
->>>>>>> upstream/master
/* eslint-disable indent */
@@ -21,20 +17,7 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
function authenticateUserByName(page, apiClient, username, password) {
loading.show();
apiClient.authenticateUserByName(username, password).then(function (result) {
-<<<<<<< HEAD
- const user = result.User;
- const serverId = getParameterByName('serverid');
- let newUrl;
-
- if (user.Policy.IsAdministrator && !serverId) {
- newUrl = 'dashboard.html';
- } else {
- newUrl = 'home.html';
- }
-
-=======
var user = result.User;
->>>>>>> upstream/master
loading.hide();
Dashboard.onServerChanged(user.Id, result.AccessToken, apiClient);
@@ -236,14 +219,9 @@ define(['apphost', 'appSettings', 'dom', 'connectionManager', 'loading', 'layout
view.querySelector('.disclaimer').textContent = options.LoginDisclaimer || '';
});
});
-<<<<<<< HEAD
- }
-
-/* eslint-enable indent */
-=======
view.addEventListener('viewhide', function (e) {
libraryMenu.setTransparentMenu(false);
});
- };
-});
->>>>>>> upstream/master
+ }
+
+/* eslint-enable indent */
diff --git a/src/controllers/auth/selectserver.js b/src/controllers/auth/selectserver.js
index 1184590f1..3e36b7485 100644
--- a/src/controllers/auth/selectserver.js
+++ b/src/controllers/auth/selectserver.js
@@ -1,7 +1,7 @@
-<<<<<<< HEAD
import loading from 'loading';
import appRouter from 'appRouter';
import layoutManager from 'layoutManager';
+import libraryMenu from 'libraryMenu';
import appSettings from 'appSettings';
import appHost from 'apphost';
import focusManager from 'focusManager';
@@ -20,12 +20,6 @@ import 'emby-button';
/* eslint-disable indent */
const enableFocusTransform = !browser.slow && !browser.edge;
-=======
-define(['loading', 'appRouter', 'layoutManager', 'libraryMenu', 'appSettings', 'apphost', 'focusManager', 'connectionManager', 'globalize', 'actionsheet', 'dom', 'browser', 'material-icons', 'flexStyles', 'emby-scroller', 'emby-itemscontainer', 'cardStyle', 'emby-button'], function (loading, appRouter, layoutManager, libraryMenu, appSettings, appHost, focusManager, connectionManager, globalize, actionSheet, dom, browser) {
- 'use strict';
-
- var enableFocusTransform = !browser.slow && !browser.edge;
->>>>>>> upstream/master
function renderSelectServerItems(view, servers) {
const items = servers.map(function (server) {
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index 41abb8d91..b9405c2da 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -189,17 +189,7 @@ import 'emby-itemscontainer';
function reloadSystemInfo(view, apiClient) {
apiClient.getSystemInfo().then(function (systemInfo) {
view.querySelector('#serverName').innerHTML = globalize.translate('DashboardServerName', systemInfo.ServerName);
-<<<<<<< HEAD
- let localizedVersion = globalize.translate('DashboardVersionNumber', systemInfo.Version);
-
- if (systemInfo.SystemUpdateLevel !== 'Release') {
- localizedVersion += ' ' + systemInfo.SystemUpdateLevel;
- }
-
- view.querySelector('#versionNumber').innerHTML = localizedVersion;
-=======
view.querySelector('#versionNumber').innerHTML = globalize.translate('DashboardVersionNumber', systemInfo.Version);
->>>>>>> upstream/master
view.querySelector('#operatingSystem').innerHTML = globalize.translate('DashboardOperatingSystem', systemInfo.OperatingSystem);
view.querySelector('#architecture').innerHTML = globalize.translate('DashboardArchitecture', systemInfo.SystemArchitecture);
diff --git a/src/controllers/playback/videoosd.js b/src/controllers/playback/videoosd.js
index 745210208..e5facebec 100644
--- a/src/controllers/playback/videoosd.js
+++ b/src/controllers/playback/videoosd.js
@@ -1616,13 +1616,8 @@ import 'css!assets/css/videoosd';
if (browser.touch) {
(function () {
-<<<<<<< HEAD
- require(['touchHelper'], function (TouchHelper) {
- self.touchHelper = new TouchHelper.default(view, {
-=======
import('touchHelper').then(({default: TouchHelper}) => {
self.touchHelper = new TouchHelper(view, {
->>>>>>> upstream/master
swipeYThreshold: 30,
triggerOnMove: true,
preventDefaultOnMove: true,
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js
index ae2d33de3..82f5270a4 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles.js
@@ -1,84 +1,19 @@
-<<<<<<< HEAD
-import subtitleSettings from 'subtitleSettings';
-import {UserSettings, currentSettings as userSettings} from 'userSettings';
-import autoFocuser from 'autoFocuser';
-=======
import SubtitleSettings from 'subtitleSettings';
import * as userSettings from 'userSettings';
import autoFocuser from 'autoFocuser';
/* eslint-disable indent */
->>>>>>> upstream/master
-export class SubtitleController {
- constructor(view, params) {
- this.userId = params.userId || ApiClient.getCurrentUserId();
- this.currentSettings = this.userId === ApiClient.getCurrentUserId() ? userSettings : new UserSettings();
- this.hasChanges = false;
- this.subtitleSettingsInstance = null;
- this.view = view;
+ // Shortcuts
+ const UserSettings = userSettings.UserSettings;
-<<<<<<< HEAD
- view.addEventListener('viewshow', this.viewShow.bind(this));
- view.addEventListener('change', this.change.bind(this));
- view.addEventListener('viewbeforehide', this.viewBeforeHide.bind(this));
- view.addEventListener('viewdestroy', this.viewDestroy.bind(this));
- }
-
- viewShow() {
- window.addEventListener('beforeunload', this.beforeUnload.bind(this));
-
- if (this.subtitleSettingsInstance) {
- this.subtitleSettingsInstance.loadData();
- } else {
- this.subtitleSettingsInstance = new subtitleSettings({
- serverId: ApiClient.serverId(),
- userId: this.userId,
- element: this.view.querySelector('.settingsContainer'),
- userSettings: this.currentSettings,
- enableSaveButton: false,
- enableSaveConfirmation: false,
- autoFocus: autoFocuser.isEnabled()
- });
- }
- }
-
- viewDestroy() {
- if (this.subtitleSettingsInstance) {
- this.subtitleSettingsInstance.destroy();
- this.subtitleSettingsInstance = null;
- }
- }
-
- viewBeforeHide() {
- this.hasChanges = false;
-
- if (this.subtitleSettingsInstance) {
- this.subtitleSettingsInstance.submit();
- }
- }
-
- change() {
- this.hasChanges = true;
- }
-
- beforeUnload(e) {
- if (this.hasChanges) {
- e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
-=======
export default function (view, params) {
function onBeforeUnload(e) {
if (hasChanges) {
e.returnValue = 'You currently have unsaved changes. Are you sure you wish to leave?';
}
->>>>>>> upstream/master
}
- }
-}
-<<<<<<< HEAD
-export default SubtitleController;
-=======
let subtitleSettingsInstance;
let hasChanges;
const userId = params.userId || ApiClient.getCurrentUserId();
@@ -114,4 +49,3 @@ export default SubtitleController;
}
/* eslint-enable indent */
->>>>>>> upstream/master
diff --git a/src/elements/emby-button/emby-button.js b/src/elements/emby-button/emby-button.js
index bfc47296b..213bbc8e7 100644
--- a/src/elements/emby-button/emby-button.js
+++ b/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);
diff --git a/src/elements/emby-button/paper-icon-button-light.js b/src/elements/emby-button/paper-icon-button-light.js
index 76a76626d..f6c754fed 100644
--- a/src/elements/emby-button/paper-icon-button-light.js
+++ b/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);
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index 4f3419dae..d3f24d6f8 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/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 */
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index cfd42f853..f980f19af 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/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 */
diff --git a/src/elements/emby-input/emby-input.js b/src/elements/emby-input/emby-input.js
index 778c707a8..d27cc7156 100644
--- a/src/elements/emby-input/emby-input.js
+++ b/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 */
diff --git a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js b/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
index 4e1f683c9..b1f8c4f4c 100644
--- a/src/elements/emby-itemrefreshindicator/emby-itemrefreshindicator.js
+++ b/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) {
diff --git a/src/elements/emby-itemscontainer/emby-itemscontainer.js b/src/elements/emby-itemscontainer/emby-itemscontainer.js
index a9b09e345..1d4a67717 100644
--- a/src/elements/emby-itemscontainer/emby-itemscontainer.js
+++ b/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;
diff --git a/src/elements/emby-progressring/emby-progressring.js b/src/elements/emby-progressring/emby-progressring.js
index 7c46c55fd..062f64d78 100644
--- a/src/elements/emby-progressring/emby-progressring.js
+++ b/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 */
diff --git a/src/elements/emby-radio/emby-radio.js b/src/elements/emby-radio/emby-radio.js
index 73c5f1359..c8437d77e 100644
--- a/src/elements/emby-radio/emby-radio.js
+++ b/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 */
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
index 5c002ed19..239fbcfcd 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/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 */
diff --git a/src/elements/emby-scroller/emby-scroller.js b/src/elements/emby-scroller/emby-scroller.js
index 5084e65f2..fb903d839 100644
--- a/src/elements/emby-scroller/emby-scroller.js
+++ b/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 */
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index aa9eec762..d45e7ef7a 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/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 */
diff --git a/src/elements/emby-slider/emby-slider.js b/src/elements/emby-slider/emby-slider.js
index bcd85fab8..e872f6c78 100644
--- a/src/elements/emby-slider/emby-slider.js
+++ b/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 */
diff --git a/src/elements/emby-tabs/emby-tabs.js b/src/elements/emby-tabs/emby-tabs.js
index 63de9333c..f3cd9d38c 100644
--- a/src/elements/emby-tabs/emby-tabs.js
+++ b/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 */
diff --git a/src/elements/emby-textarea/emby-textarea.js b/src/elements/emby-textarea/emby-textarea.js
index b48ff5c31..d98cc8c07 100644
--- a/src/elements/emby-textarea/emby-textarea.js
+++ b/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;
diff --git a/src/elements/emby-toggle/emby-toggle.js b/src/elements/emby-toggle/emby-toggle.js
index b5807e70f..8e8216080 100644
--- a/src/elements/emby-toggle/emby-toggle.js
+++ b/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 */