vulcanize

This commit is contained in:
Luke Pulverenti 2015-06-20 00:48:45 -04:00
parent 07df993238
commit 55e40bdcf7
52 changed files with 12309 additions and 33 deletions

View File

@ -16,7 +16,7 @@
manager.startDiscovery(); manager.startDiscovery();
requirejs(['thirdparty/cordova/chromecast', 'thirdparty/cordova/generaldevice']); requirejs(['cordova/chromecast', 'cordova/generaldevice']);
} }
function onDeviceListChanged(list) { function onDeviceListChanged(list) {

View File

@ -243,9 +243,9 @@
} }
if (isAndroid()) { if (isAndroid()) {
requirejs(['thirdparty/cordova/android/iap'], onIapManagerLoaded); requirejs(['cordova/android/iap'], onIapManagerLoaded);
} else { } else {
requirejs(['thirdparty/cordova/iap'], onIapManagerLoaded); requirejs(['cordova/iap'], onIapManagerLoaded);
} }
})(); })();

View File

@ -166,12 +166,9 @@ input[type="range"]::-ms-fill-upper {
display: none; display: none;
} }
.remoteControlButton { .remoteControlButton, .nowPlayingBar .unpauseButton, .nowPlayingBar .pauseButton {
float: right;
}
.nowPlayingBar .unpauseButton, .nowPlayingBar .pauseButton {
float: right; float: right;
padding-top: 0;
} }
.nowPlayingBar .currentTime, .nowPlayingBar .positionSliderContainer, .nowPlayingBar .volumeSliderContainer, #nowPlayingBar .muteButton, #nowPlayingBar .unmuteButton { .nowPlayingBar .currentTime, .nowPlayingBar .positionSliderContainer, .nowPlayingBar .volumeSliderContainer, #nowPlayingBar .muteButton, #nowPlayingBar .unmuteButton {

View File

@ -420,42 +420,48 @@
if (commands.indexOf('addtocollection') != -1) { if (commands.indexOf('addtocollection') != -1) {
items.push({ items.push({
name: Globalize.translate('ButtonAddToCollection'), name: Globalize.translate('ButtonAddToCollection'),
id: 'addtocollection' id: 'addtocollection',
ironIcon: 'add'
}); });
} }
if (commands.indexOf('playlist') != -1) { if (commands.indexOf('playlist') != -1) {
items.push({ items.push({
name: Globalize.translate('ButtonAddToPlaylist'), name: Globalize.translate('ButtonAddToPlaylist'),
id: 'playlist' id: 'playlist',
ironIcon: 'playlist-add'
}); });
} }
if (commands.indexOf('delete') != -1) { if (commands.indexOf('delete') != -1) {
items.push({ items.push({
name: Globalize.translate('ButtonDelete'), name: Globalize.translate('ButtonDelete'),
id: 'delete' id: 'delete',
ironIcon: 'delete'
}); });
} }
if (commands.indexOf('download') != -1) { if (commands.indexOf('download') != -1) {
items.push({ items.push({
name: Globalize.translate('ButtonDownload'), name: Globalize.translate('ButtonDownload'),
id: 'download' id: 'download',
ironIcon: 'file-download'
}); });
} }
if (commands.indexOf('edit') != -1) { if (commands.indexOf('edit') != -1) {
items.push({ items.push({
name: Globalize.translate('ButtonEdit'), name: Globalize.translate('ButtonEdit'),
id: 'edit' id: 'edit',
ironIcon: 'mode-edit'
}); });
} }
if (commands.indexOf('refresh') != -1) { if (commands.indexOf('refresh') != -1) {
items.push({ items.push({
name: Globalize.translate('ButtonRefresh'), name: Globalize.translate('ButtonRefresh'),
id: 'refresh' id: 'refresh',
ironIcon: 'refresh'
}); });
} }

View File

@ -1603,7 +1603,7 @@ var Dashboard = {
require(['scripts/externalplayer.js'], function () { require(['scripts/externalplayer.js'], function () {
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
require(['thirdparty/cordova/externalplayer.js'], function () { require(['cordova/externalplayer.js'], function () {
deferred.resolve(); deferred.resolve();
}); });
@ -1961,14 +1961,14 @@ var AppInfo = {};
require(['filesystem']); require(['filesystem']);
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
require(['thirdparty/cordova/connectsdk', 'scripts/registrationservices', 'thirdparty/cordova/volume', 'thirdparty/cordova/back']); require(['cordova/connectsdk', 'scripts/registrationservices', 'cordova/volume', 'cordova/back']);
if ($.browser.android) { if ($.browser.android) {
require(['thirdparty/cordova/android/androidcredentials', 'thirdparty/cordova/android/immersive', 'thirdparty/cordova/android/mediasession']); require(['cordova/android/androidcredentials', 'cordova/android/immersive', 'cordova/android/mediasession']);
} }
if ($.browser.safari) { if ($.browser.safari) {
require(['thirdparty/cordova/remotecontrols', 'thirdparty/cordova/ios/orientation']); require(['cordova/remotecontrols', 'cordova/ios/orientation']);
} }
} else { } else {
@ -1998,42 +1998,42 @@ var AppInfo = {};
}); });
if (Dashboard.isRunningInCordova() && $.browser.android) { if (Dashboard.isRunningInCordova() && $.browser.android) {
define("appstorage", ["thirdparty/cordova/android/appstorage"]); define("appstorage", ["cordova/android/appstorage"]);
} else { } else {
define('appstorage', [], function () { define('appstorage', [], function () {
return appStorage; return appStorage;
}); });
} }
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
define("serverdiscovery", ["thirdparty/cordova/serverdiscovery"]); define("serverdiscovery", ["cordova/serverdiscovery"]);
define("wakeonlan", ["thirdparty/cordova/wakeonlan"]); define("wakeonlan", ["cordova/wakeonlan"]);
} else { } else {
define("serverdiscovery", ["thirdparty/apiclient/serverdiscovery"]); define("serverdiscovery", ["apiclient/serverdiscovery"]);
define("wakeonlan", ["thirdparty/apiclient/wakeonlan"]); define("wakeonlan", ["apiclient/wakeonlan"]);
} }
if (Dashboard.isRunningInCordova() && $.browser.android) { if (Dashboard.isRunningInCordova() && $.browser.android) {
define("localassetmanager", ["thirdparty/cordova/android/localassetmanager"]); define("localassetmanager", ["cordova/android/localassetmanager"]);
} else { } else {
define("localassetmanager", ["thirdparty/apiclient/localassetmanager"]); define("localassetmanager", ["apiclient/localassetmanager"]);
} }
if (Dashboard.isRunningInCordova() && $.browser.android) { if (Dashboard.isRunningInCordova() && $.browser.android) {
define("filesystem", ["thirdparty/cordova/android/filesystem"]); define("filesystem", ["cordova/android/filesystem"]);
} }
else if (Dashboard.isRunningInCordova()) { else if (Dashboard.isRunningInCordova()) {
define("filesystem", ["thirdparty/cordova/filesystem"]); define("filesystem", ["cordova/filesystem"]);
} }
else { else {
define("filesystem", ["thirdparty/filesystem"]); define("filesystem", ["thirdparty/filesystem"]);
} }
if (Dashboard.isRunningInCordova() && $.browser.android) { if (Dashboard.isRunningInCordova() && $.browser.android) {
define("nativedirectorychooser", ["thirdparty/cordova/android/nativedirectorychooser"]); define("nativedirectorychooser", ["cordova/android/nativedirectorychooser"]);
} }
if (Dashboard.isRunningInCordova() && $.browser.android) { if (Dashboard.isRunningInCordova() && $.browser.android) {
define("audiorenderer", ["thirdparty/cordova/android/vlcplayer"]); define("audiorenderer", ["cordova/android/vlcplayer"]);
//define("audiorenderer", ["scripts/htmlmediarenderer"]); //define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("videorenderer", ["scripts/htmlmediarenderer"]); define("videorenderer", ["scripts/htmlmediarenderer"]);
} }
@ -2042,7 +2042,7 @@ var AppInfo = {};
define("videorenderer", ["scripts/htmlmediarenderer"]); define("videorenderer", ["scripts/htmlmediarenderer"]);
} }
define("connectservice", ["thirdparty/apiclient/connectservice"]); define("connectservice", ["apiclient/connectservice"]);
define("paperbuttonstyle", [], function () { define("paperbuttonstyle", [], function () {
Dashboard.importCss('thirdparty/paper-button-style.css'); Dashboard.importCss('thirdparty/paper-button-style.css');
return {}; return {};
@ -2053,7 +2053,7 @@ var AppInfo = {};
}); });
if (Dashboard.isRunningInCordova() && $.browser.safari) { if (Dashboard.isRunningInCordova() && $.browser.safari) {
define("actionsheet", ["thirdparty/cordova/ios/actionsheet"]); define("actionsheet", ["cordova/ios/actionsheet"]);
} else { } else {
define("actionsheet", ["scripts/actionsheet"]); define("actionsheet", ["scripts/actionsheet"]);
} }
@ -2091,7 +2091,7 @@ var AppInfo = {};
function initCordovaWithDeviceId(deferred, deviceId) { function initCordovaWithDeviceId(deferred, deviceId) {
require(['thirdparty/cordova/imagestore']); require(['cordova/imagestore']);
var capablities = Dashboard.capabilities(); var capablities = Dashboard.capabilities();

View File

@ -43,6 +43,8 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
<g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /></g> <g id="add"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" /></g>
<g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></g> <g id="arrow-back"><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z" /></g>
<g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" /></g> <g id="arrow-forward"><path d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z" /></g>
<g id="delete"><path d="M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z" /></g>
<g id="file-download"><path d="M19 9h-4V3H9v6H5l7 7 7-7zM5 18v2h14v-2H5z" /></g>
<g id="info"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z" /></g> <g id="info"><path d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 15h-2v-6h2v6zm0-8h-2V7h2v2z" /></g>
<g id="lock"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" /></g> <g id="lock"><path d="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z" /></g>
<g id="settings"><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z" /></g> <g id="settings"><path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z" /></g>

View File

@ -23,7 +23,7 @@
return 8000; return 8000;
} }
var screens = $.browser.mobile ? 2 : 1; var screens = $.browser.mobile ? 2.5 : 1;
// This helps eliminate the draw-in effect as you scroll // This helps eliminate the draw-in effect as you scroll
return Math.max(screen.availHeight * screens, 1000); return Math.max(screen.availHeight * screens, 1000);

View File

@ -196,6 +196,7 @@ paper-button.notext {
paper-dialog { paper-dialog {
border-radius: 4px; border-radius: 4px;
z-index: 999999 !important;
} }
iron-overlay-backdrop { iron-overlay-backdrop {

View File

@ -0,0 +1,11 @@
<link rel="import" href="bower_components/paper-button/paper-button.html">
<link rel="import" href="bower_components/paper-toast/paper-toast.html">
<link rel="import" href="bower_components/paper-spinner/paper-spinner.html">
<link rel="import" href="bower_components/paper-fab/paper-fab.html">
<link rel="import" href="bower_components/paper-dialog/paper-dialog.html">
<link rel="import" href="bower_components/paper-dialog-scrollable/paper-dialog-scrollable.html">
<link rel="import" href="bower_components/neon-animation/animations/scale-up-animation.html">
<link rel="import" href="bower_components/neon-animation/animations/fade-out-animation.html">
<link rel="import" href="bower_components/neon-animation/animations/fade-in-animation.html">
<link rel="import" href="bower_components/paper-icon-button/paper-icon-button.html">
<link rel="import" href="thirdparty/emby-icons.html">

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1 @@
vulcanize vulcanize-in.html > vulcanize-out.html --strip-comments --inline-scripts --inline-css