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

Merge pull request #2104 from MediaBrowser/dev

Browse source 
Dev
This commit is contained in:
Luke 2016-08-26 15:32:40 -04:00 • committed by GitHub
commit 0f25d774d3
11 changed files with 69 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.1.76", "version": "1.1.77",
"_release": "1.1.76", "_release": "1.1.77",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.1.76", "tag": "1.1.77",
"commit": "1096ffc66e3df8d63e305889dd7fb5b769095082" "commit": "685285e67f67ba356af1be84652e9705a6ea7b74"
}, },
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51", "_target": "^1.1.51",

2
dashboard-ui/bower_components/emby-apiclient/connectionmanager.js vendored
View file

@ -215,7 +215,7 @@
return connectUser; return connectUser;
}; };
var minServerVersion = '3.0.5971'; var minServerVersion = '3.0.5972';
self.minServerVersion = function (val) { self.minServerVersion = function (val) {
if (val) { if (val) {

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.188", "version": "1.4.189",
"_release": "1.4.188", "_release": "1.4.189",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.188", "tag": "1.4.189",
"commit": "9bfd0321b48bbe058008848619521d3d5b23bbe7" "commit": "d7b1da1cd548e50125dd5419b3742fdfc9a07460"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

7
dashboard-ui/bower_components/emby-webcomponents/emby-select/emby-select.js vendored
View file

@ -169,6 +169,13 @@
arrowContainer.appendChild(arrow); arrowContainer.appendChild(arrow);
}; };
EmbySelectPrototype.setLabel = function (text) {
var label = this.parentNode.querySelector('label');
label.innerHTML = text;
};
document.registerElement('emby-select', { document.registerElement('emby-select', {
prototype: EmbySelectPrototype, prototype: EmbySelectPrototype,
extends: 'select' extends: 'select'

3
dashboard-ui/bower_components/emby-webcomponents/thememediaplayer.js vendored
View file

@ -22,7 +22,8 @@ define(['playbackManager', 'browser'], function (playbackManager, browser) {
if (enabled(items[0].MediaType)) { if (enabled(items[0].MediaType)) {
playbackManager.play({ playbackManager.play({
items: items, items: items,
fullscreen: false fullscreen: false,
enableRemotePlayers: false
}); });
} }

6
dashboard-ui/bower_components/iron-icon/.bower.json vendored
View file

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/polymerelements/iron-icon", "homepage": "https://github.com/PolymerElements/iron-icon",
"_release": "1.0.10", "_release": "1.0.10",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.10", "tag": "v1.0.10",
"commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
}, },
"_source": "git://github.com/polymerelements/iron-icon.git", "_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon" "_originalSource": "PolymerElements/iron-icon"
} }

6
dashboard-ui/bower_components/polymer/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

6
dashboard-ui/dashboard/dashboardgeneral.js
View file

@ -1,4 +1,4 @@
define(['jQuery'], function ($) { define(['jQuery', 'fnchecked', 'emby-checkbox', 'emby-collapse', 'emby-textarea', 'emby-input', 'emby-select'], function ($) {
var brandingConfigKey = "branding"; var brandingConfigKey = "branding";
var currentBrandingOptions; var currentBrandingOptions;
@ -36,10 +36,10 @@
if (systemInfo.CanSelfUpdate) { if (systemInfo.CanSelfUpdate) {
$('.fldAutomaticUpdates', page).show(); $('.fldAutomaticUpdates', page).show();
$('.lnlAutomaticUpdateLevel', page).html(Globalize.translate('LabelAutomaticUpdateLevel')); page.querySelector('#selectAutomaticUpdateLevel').setLabel(Globalize.translate('LabelAutomaticUpdateLevel'));
} else { } else {
$('.fldAutomaticUpdates', page).hide(); $('.fldAutomaticUpdates', page).hide();
$('.lnlAutomaticUpdateLevel', page).html(Globalize.translate('LabelAutomaticUpdateLevelForPlugins')); page.querySelector('#selectAutomaticUpdateLevel').setLabel(Globalize.translate('LabelAutomaticUpdateLevelForPlugins'));
} }
$('#chkEnableAutomaticServerUpdates', page).checked(config.EnableAutoUpdate); $('#chkEnableAutomaticServerUpdates', page).checked(config.EnableAutoUpdate);

72
dashboard-ui/dashboardgeneral.html
View file

@ -9,9 +9,8 @@
<input is="emby-input" type="text" id="txtServerName" label="${LabelFriendlyServerName}" /> <input is="emby-input" type="text" id="txtServerName" label="${LabelFriendlyServerName}" />
<div class="fieldDescription">${LabelFriendlyServerNameHelp}</div> <div class="fieldDescription">${LabelFriendlyServerNameHelp}</div>
</div> </div>
<div> <div class="selectContainer">
<label for="selectLocalizationLanguage" class="selectLabel">${LabelPreferredDisplayLanguage}</label> <select is="emby-select" id="selectLocalizationLanguage" label="${LabelPreferredDisplayLanguage}"></select>
<select id="selectLocalizationLanguage" data-mini="true"></select>
<div class="fieldDescription"> <div class="fieldDescription">
<div>${LabelPreferredDisplayLanguageHelp}</div> <div>${LabelPreferredDisplayLanguageHelp}</div>
<div style="margin-top: .25em;"> <div style="margin-top: .25em;">
@ -19,25 +18,28 @@
</div> </div>
</div> </div>
</div> </div>
<br /><br />
<div id="fldRunAtStartup" style="display: none;"> <div id="fldRunAtStartup" style="display: none;" class="checkboxContainer checkboxContainer-withDescription">
<paper-checkbox id="chkRunAtStartup">${LabelRunServerAtStartup}</paper-checkbox> <label>
<div id="windowsStartupDescription" class="fieldDescription paperCheckboxFieldDescription" style="display: none;"> <input is="emby-checkbox" type="checkbox" id="chkRunAtStartup" />
<span>${LabelRunServerAtStartup}</span>
</label>
<div id="windowsStartupDescription" class="fieldDescription checkboxFieldDescription" style="display: none;">
${LabelRunServerAtStartupHelp} ${LabelRunServerAtStartupHelp}
</div> </div>
<br /><br />
</div> </div>
<div> <div class="checkboxContainer checkboxContainer-withDescription">
<paper-checkbox id="chkUsageData">${OptionEnableAnonymousUsageReporting}</paper-checkbox> <label>
<div class="fieldDescription paperCheckboxFieldDescription"> <input is="emby-checkbox" type="checkbox" id="chkUsageData" />
<span>${OptionEnableAnonymousUsageReporting}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">
${OptionEnableAnonymousUsageReportingHelp} ${OptionEnableAnonymousUsageReportingHelp}
<div style="margin-top:.5em;"> <div style="margin-top:.5em;">
<a target="_blank" href="https://emby.media/privacy">${ButtonLearnMore}</a> <a target="_blank" href="https://emby.media/privacy">${ButtonLearnMore}</a>
</div> </div>
</div> </div>
<br /><br />
</div> </div>
<div is="emby-collapse" title="${HeaderAdvanced}"> <div is="emby-collapse" title="${HeaderAdvanced}">
@ -59,15 +61,12 @@
<div is="emby-collapse" title="${HeaderAutomaticUpdates}"> <div is="emby-collapse" title="${HeaderAutomaticUpdates}">
<div class="collapseContent"> <div class="collapseContent">
<br /> <br />
<div class="fldAutomaticUpdates"> <label class="fldAutomaticUpdates checkboxContainer">
<div data-role="controlgroup"> <input is="emby-checkbox" type="checkbox" id="chkEnableAutomaticServerUpdates" />
<input type="checkbox" id="chkEnableAutomaticServerUpdates" data-mini="true" /> <span>${OptionEnableAutomaticServerUpdates}</span>
<label for="chkEnableAutomaticServerUpdates">${OptionEnableAutomaticServerUpdates}</label> </label>
</div> <div class="selectContainer">
</div> <select is="emby-select" id="selectAutomaticUpdateLevel" label="${LabelAutomaticUpdateLevel}">
<div>
<label class="lnlAutomaticUpdateLevel selectLabel" for="selectAutomaticUpdateLevel"></label>
<select name="selectAutomaticUpdateLevel" id="selectAutomaticUpdateLevel">
<option value="Release">${OptionRelease}</option> <option value="Release">${OptionRelease}</option>
<option value="Beta">${OptionBeta}</option> <option value="Beta">${OptionBeta}</option>
<option value="Dev">${OptionDev}</option> <option value="Dev">${OptionDev}</option>
@ -76,11 +75,12 @@
${DevBuildWarning} ${DevBuildWarning}
</div> </div>
</div> </div>
<div id="fldEnableAutomaticRestart" style="display: none;"> <div id="fldEnableAutomaticRestart" style="display: none;" class="checkboxContainer checkboxContainer-withDescription">
<paper-checkbox id="chkEnableAutomaticRestart">${LabelAllowServerAutoRestart}</paper-checkbox> <label>
<div class="fieldDescription paperCheckboxFieldDescription"> <input is="emby-checkbox" type="checkbox" id="chkEnableAutomaticRestart" />
${LabelAllowServerAutoRestartHelp} <span>${LabelAllowServerAutoRestart}</span>
</div> </label>
<div class="fieldDescription checkboxFieldDescription">${LabelAllowServerAutoRestartHelp}</div>
</div> </div>
</div> </div>
</div> </div>
@ -104,17 +104,17 @@
<div is="emby-collapse" title="${HeaderDeveloperOptions}"> <div is="emby-collapse" title="${HeaderDeveloperOptions}">
<div class="collapseContent"> <div class="collapseContent">
<br /> <br />
<div> <label class="checkboxContainer">
<paper-checkbox id="chkEnableDashboardResponseCache">${OptionEnableWebClientResponseCache}</paper-checkbox> <input is="emby-checkbox" type="checkbox" id="chkEnableDashboardResponseCache" />
<span>${OptionEnableWebClientResponseCache}</span>
</label>
<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input is="emby-checkbox" type="checkbox" id="chkEnableMinification" />
<span>${OptionEnableWebClientResourceMinification}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${OptionDisableForDevelopmentHelp}</div>
</div> </div>
<br />
<div>
<paper-checkbox id="chkEnableMinification">${OptionEnableWebClientResourceMinification}</paper-checkbox>
</div>
<div class="fieldDescription paperCheckboxFieldDescription">
${OptionDisableForDevelopmentHelp}
</div>
<br /><br />
<div class="inputContainer"> <div class="inputContainer">
<div style="display: flex; align-items: center;"> <div style="display: flex; align-items: center;">
<div style="flex-grow:1;"> <div style="flex-grow:1;">

6
dashboard-ui/scripts/mediacontroller.js
View file

@ -518,6 +518,12 @@
self.play = function (options) { self.play = function (options) {
if (options.enableRemotePlayers === false) {
if (!currentPlayer.isLocalPlayer) {
return;
}
}
doWithPlaybackValidation(currentPlayer, function () { doWithPlaybackValidation(currentPlayer, function () {
if (typeof (options) === 'string') { if (typeof (options) === 'string') {
options = { ids: [options] }; options = { ids: [options] };

1
dashboard-ui/scripts/site.js
View file

@ -1970,7 +1970,6 @@ var AppInfo = {};
defineRoute({ defineRoute({
path: '/dashboardgeneral.html', path: '/dashboardgeneral.html',
dependencies: ['emby-collapse', 'emby-textarea', 'emby-input', 'paper-checkbox'],
controller: 'dashboard/dashboardgeneral', controller: 'dashboard/dashboardgeneral',
autoFocus: false, autoFocus: false,
roles: 'admin' roles: 'admin'