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

update startup

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-29 02:23:01 -05:00
parent d567f27c94
commit 7743007ece
3 changed files with 540 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -1786,7 +1786,7 @@
Events.trigger(self, 'playstatechange', [state]);
};
Events.on(window, "beforeunload", function () {
window.addEventListener("beforeunload", function () {
// Try to report playback stopped before the browser closes
if (self.currentItem && self.currentMediaRenderer && currentProgressInterval) {

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

@ -2113,23 +2113,11 @@ var AppInfo = {};
deps.push('scripts/mediacontroller');
deps.push('scripts/globalize');
deps.push('apiclient/events');
deps.push('jQuery');
require(deps, function () {
// TODO: This needs to be deprecated, but it's used heavily
$.fn.checked = function (value) {
if (value === true || value === false) {
// Set the value of the checkbox
return $(this).each(function () {
this.checked = value;
});
} else {
// Return check state
return this.length && this[0].checked;
}
};
var baseInfo = Dashboard.getAppInfo(appName, appVersion, deviceId, deviceName);
for (var i in baseInfo) {
AppInfo[i] = baseInfo[i];
@ -2176,6 +2164,19 @@ var AppInfo = {};
require(deps, function () {
// TODO: This needs to be deprecated, but it's used heavily
$.fn.checked = function (value) {
if (value === true || value === false) {
// Set the value of the checkbox
return $(this).each(function () {
this.checked = value;
});
} else {
// Return check state
return this.length && this[0].checked;
}
};
if (Dashboard.isRunningInCordova() && browserInfo.android) {
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');