milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/master' into es6

Browse source 
With conflicts
This commit is contained in:
MrTimscampi 2020-07-24 10:23:14 +02:00
commit 3713091382
165 changed files with 4194 additions and 2714 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/elements/emby-button/emby-button.js
View file

@ -1,3 +1,4 @@
<<<<<<< HEAD
import browser from 'browser';
import dom from 'dom';
import layoutManager from 'layoutManager';
@ -6,6 +7,10 @@ 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
const EmbyButtonPrototype = Object.create(HTMLButtonElement.prototype);
const EmbyLinkButtonPrototype = Object.create(HTMLAnchorElement.prototype);

5
src/elements/emby-button/paper-icon-button-light.js
View file

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