From d33230d361df46a83bc55f056d0d213ee408fc66 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 19 Jan 2016 14:49:42 -0500 Subject: [PATCH] fix merge conflicts --- dashboard-ui/addplugin.html | 2 +- .../emby-apiclient/.bower.json | 8 +- .../emby-apiclient/connectionmanager.js | 75 ++-- .../emby-webcomponents/.bower.json | 8 +- .../browserdeviceprofile.js | 13 +- .../images/basicimageloader.js | 25 ++ .../emby-webcomponents/images/imagehelper.js | 175 ++++++++ .../images/persistentimageloader.js | 164 ++++++++ .../bower_components/hls.js/.bower.json | 13 +- dashboard-ui/bower_components/hls.js/API.md | 18 +- .../bower_components/hls.js/bower.json | 4 +- .../bower_components/hls.js/demo/index.html | 23 +- .../bower_components/hls.js/dist/hls.js | 398 +++++++++++------- .../bower_components/hls.js/dist/hls.js.map | 24 +- .../bower_components/hls.js/dist/hls.min.js | 8 +- .../bower_components/hls.js/package.json | 2 +- .../hls.js/src/controller/abr-controller.js | 11 +- .../hls.js/src/controller/level-controller.js | 24 +- .../src/controller/mse-media-controller.js | 84 ++-- .../hls.js/src/event-handler.js | 66 +++ .../bower_components/hls.js/src/events.js | 8 +- .../bower_components/hls.js/src/hls.js | 2 + .../hls.js/src/loader/fragment-loader.js | 11 +- .../hls.js/src/loader/key-loader.js | 11 +- .../hls.js/src/loader/playlist-loader.js | 18 +- .../hls.js/src/remux/mp4-remuxer.js | 16 +- .../hls.js/src/utils/xhr-loader.js | 7 +- .../iron-behaviors/.bower.json | 6 +- .../bower_components/paper-input/.bower.json | 10 +- .../bower_components/paper-input/bower.json | 4 +- .../paper-input/paper-input-behavior.html | 146 ++++--- .../paper-input/paper-input.html | 8 +- .../paper-input/test/paper-input.html | 19 +- .../bower_components/polymer/.bower.json | 6 +- dashboard-ui/components/imagestore.js | 185 -------- .../itemidentifier/itemidentifier.js | 2 +- dashboard-ui/components/paperdialoghelper.js | 4 +- dashboard-ui/components/tvguide/tvguide.js | 4 +- dashboard-ui/mysyncsettings.html | 5 - dashboard-ui/scripts/appsettings.js | 8 - dashboard-ui/scripts/edititemmetadata.js | 2 +- dashboard-ui/scripts/itemdetailpage.js | 2 +- dashboard-ui/scripts/librarybrowser.js | 50 ++- dashboard-ui/scripts/librarylist.js | 18 +- dashboard-ui/scripts/livetvrecordings.js | 9 +- dashboard-ui/scripts/mediaplayer.js | 2 +- dashboard-ui/scripts/mysyncsettings.js | 2 - dashboard-ui/scripts/registrationservices.js | 2 +- dashboard-ui/scripts/sections.js | 2 +- dashboard-ui/scripts/site.js | 36 +- dashboard-ui/scripts/supporterkeypage.js | 4 +- dashboard-ui/strings/html/ca.json | 26 +- dashboard-ui/strings/html/de.json | 38 +- dashboard-ui/strings/html/es-MX.json | 8 +- dashboard-ui/strings/html/fr.json | 2 +- dashboard-ui/strings/html/nl.json | 2 +- dashboard-ui/strings/html/pt-BR.json | 4 +- dashboard-ui/strings/html/ru.json | 6 +- dashboard-ui/strings/html/server.json | 2 +- dashboard-ui/strings/javascript/ar.json | 2 +- dashboard-ui/strings/javascript/bg-BG.json | 2 +- dashboard-ui/strings/javascript/ca.json | 20 +- dashboard-ui/strings/javascript/cs.json | 2 +- dashboard-ui/strings/javascript/da.json | 2 +- dashboard-ui/strings/javascript/de.json | 6 +- dashboard-ui/strings/javascript/el.json | 2 +- dashboard-ui/strings/javascript/en-GB.json | 2 +- dashboard-ui/strings/javascript/en-US.json | 4 +- dashboard-ui/strings/javascript/es-AR.json | 2 +- dashboard-ui/strings/javascript/es-MX.json | 14 +- dashboard-ui/strings/javascript/es.json | 2 +- dashboard-ui/strings/javascript/fi.json | 2 +- dashboard-ui/strings/javascript/fr.json | 2 +- dashboard-ui/strings/javascript/gsw.json | 2 +- dashboard-ui/strings/javascript/he.json | 2 +- dashboard-ui/strings/javascript/hr.json | 2 +- dashboard-ui/strings/javascript/it.json | 2 +- .../strings/javascript/javascript.json | 4 +- dashboard-ui/strings/javascript/kk.json | 2 +- dashboard-ui/strings/javascript/ko.json | 2 +- dashboard-ui/strings/javascript/ms.json | 2 +- dashboard-ui/strings/javascript/nb.json | 2 +- dashboard-ui/strings/javascript/nl.json | 4 +- dashboard-ui/strings/javascript/pl.json | 2 +- dashboard-ui/strings/javascript/pt-BR.json | 4 +- dashboard-ui/strings/javascript/pt-PT.json | 2 +- dashboard-ui/strings/javascript/ro.json | 2 +- dashboard-ui/strings/javascript/ru.json | 4 +- dashboard-ui/strings/javascript/sl-SI.json | 2 +- dashboard-ui/strings/javascript/sv.json | 2 +- dashboard-ui/strings/javascript/tr.json | 2 +- dashboard-ui/strings/javascript/uk.json | 2 +- dashboard-ui/strings/javascript/vi.json | 2 +- dashboard-ui/strings/javascript/zh-CN.json | 2 +- dashboard-ui/strings/javascript/zh-HK.json | 2 +- dashboard-ui/strings/javascript/zh-TW.json | 2 +- .../thirdparty/jquery.unveil-custom.js | 56 +-- 97 files changed, 1205 insertions(+), 811 deletions(-) create mode 100644 dashboard-ui/bower_components/emby-webcomponents/images/basicimageloader.js create mode 100644 dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js create mode 100644 dashboard-ui/bower_components/emby-webcomponents/images/persistentimageloader.js create mode 100644 dashboard-ui/bower_components/hls.js/src/event-handler.js delete mode 100644 dashboard-ui/components/imagestore.js diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index bbcefe4556..4125e80758 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -83,7 +83,7 @@ - +