mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix sync job deletion
This commit is contained in:
parent
54afe9d0c2
commit
d999c53f9f
9 changed files with 22 additions and 16 deletions
|
@ -6,6 +6,8 @@
|
||||||
|
|
||||||
globalScope.MediaBrowser.generateDeviceId = function (keyName, seed) {
|
globalScope.MediaBrowser.generateDeviceId = function (keyName, seed) {
|
||||||
|
|
||||||
|
keyName = keyName || 'randomId';
|
||||||
|
|
||||||
var keys = [];
|
var keys = [];
|
||||||
|
|
||||||
keys.push(navigator.userAgent);
|
keys.push(navigator.userAgent);
|
||||||
|
|
|
@ -25,14 +25,14 @@
|
||||||
"web-component-tester": "*",
|
"web-component-tester": "*",
|
||||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/PolymerElements/iron-meta",
|
"homepage": "https://github.com/polymerelements/iron-meta",
|
||||||
"_release": "1.0.3",
|
"_release": "1.0.3",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.3",
|
"tag": "v1.0.3",
|
||||||
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
|
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/iron-meta.git",
|
"_source": "git://github.com/polymerelements/iron-meta.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "PolymerElements/iron-meta"
|
"_originalSource": "polymerelements/iron-meta"
|
||||||
}
|
}
|
|
@ -34,7 +34,7 @@
|
||||||
"tag": "v1.0.7",
|
"tag": "v1.0.7",
|
||||||
"commit": "c65f5ce6b898bb756fca35cedaa53c3e8011abeb"
|
"commit": "c65f5ce6b898bb756fca35cedaa53c3e8011abeb"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/paper-styles.git",
|
"_source": "git://github.com/polymerelements/paper-styles.git",
|
||||||
"_target": "^1.0.0",
|
"_target": "^1.0.0",
|
||||||
"_originalSource": "PolymerElements/paper-styles"
|
"_originalSource": "polymerelements/paper-styles"
|
||||||
}
|
}
|
2
dashboard-ui/cordova/android/mediasession.js
vendored
2
dashboard-ui/cordova/android/mediasession.js
vendored
|
@ -146,7 +146,7 @@
|
||||||
|
|
||||||
currentPlayer = player;
|
currentPlayer = player;
|
||||||
|
|
||||||
Logger.log('binding remotecontrols to MediaPlayer');
|
Logger.log('binding remotecontrols to ' + player.name);
|
||||||
|
|
||||||
player.getPlayerState().done(function (state) {
|
player.getPlayerState().done(function (state) {
|
||||||
|
|
||||||
|
|
7
dashboard-ui/cordova/chromecast.js
vendored
7
dashboard-ui/cordova/chromecast.js
vendored
|
@ -474,9 +474,9 @@
|
||||||
Logger.log('session.connect succeeded');
|
Logger.log('session.connect succeeded');
|
||||||
webAppSession.setWebAppSessionListener();
|
webAppSession.setWebAppSessionListener();
|
||||||
|
|
||||||
MediaController.setActivePlayer(PlayerName, convertDeviceToTarget(device));
|
|
||||||
currentDevice = device;
|
currentDevice = device;
|
||||||
currentDeviceId = device.getId();
|
currentDeviceId = device.getId();
|
||||||
|
MediaController.setActivePlayer(PlayerName, convertDeviceToTarget(device));
|
||||||
|
|
||||||
$(castPlayer).trigger('connect');
|
$(castPlayer).trigger('connect');
|
||||||
|
|
||||||
|
@ -538,7 +538,8 @@
|
||||||
|
|
||||||
Logger.log('launchWebApp success. calling onSessionConnected');
|
Logger.log('launchWebApp success. calling onSessionConnected');
|
||||||
if ($.browser.android) {
|
if ($.browser.android) {
|
||||||
tryJoinWebSession(device, true, false);
|
//tryJoinWebSession(device, true, false);
|
||||||
|
setupWebAppSession(device, session, true);
|
||||||
} else {
|
} else {
|
||||||
setupWebAppSession(device, session, true);
|
setupWebAppSession(device, session, true);
|
||||||
}
|
}
|
||||||
|
@ -646,6 +647,8 @@
|
||||||
if (newTarget.id != currentDeviceId) {
|
if (newTarget.id != currentDeviceId) {
|
||||||
if (currentWebAppSession) {
|
if (currentWebAppSession) {
|
||||||
Logger.log('Disconnecting from chromecast');
|
Logger.log('Disconnecting from chromecast');
|
||||||
|
Logger.log('New target info: ' + JSON.stringify(newTarget));
|
||||||
|
Logger.log('currentDeviceId: ' + currentDeviceId);
|
||||||
//currentDevice.disconnect();
|
//currentDevice.disconnect();
|
||||||
cleanupSession();
|
cleanupSession();
|
||||||
currentDevice = null;
|
currentDevice = null;
|
||||||
|
|
|
@ -500,8 +500,8 @@ h1 a:hover {
|
||||||
}
|
}
|
||||||
|
|
||||||
.paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) {
|
.paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) {
|
||||||
-webkit-transform: translateY(-203.5%);
|
-webkit-transform: translateY(-204%);
|
||||||
transform: translateY(-203.5%);
|
transform: translateY(-204%);
|
||||||
}
|
}
|
||||||
|
|
||||||
.largePanel {
|
.largePanel {
|
||||||
|
|
|
@ -175,6 +175,7 @@
|
||||||
tabs.alignBottom = true;
|
tabs.alignBottom = true;
|
||||||
tabs.classList.add('bottomTabs');
|
tabs.classList.add('bottomTabs');
|
||||||
}
|
}
|
||||||
|
tabs.noink = true;
|
||||||
|
|
||||||
if (LibraryBrowser.enableFullPaperTabs()) {
|
if (LibraryBrowser.enableFullPaperTabs()) {
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
function onSharingSuccess(options) {
|
function onSharingSuccess(options) {
|
||||||
|
|
||||||
console.log('share success. shareId: ' + options.share.Id);
|
Logger.log('share success. shareId: ' + options.share.Id);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
var shareId = options.share.Id;
|
var shareId = options.share.Id;
|
||||||
|
|
||||||
console.log('share cancelled. shareId: ' + shareId);
|
Logger.log('share cancelled. shareId: ' + shareId);
|
||||||
|
|
||||||
// Delete the share since it was cancelled
|
// Delete the share since it was cancelled
|
||||||
ApiClient.ajax({
|
ApiClient.ajax({
|
||||||
|
|
|
@ -181,7 +181,7 @@
|
||||||
Events.trigger(elem[0], 'create');
|
Events.trigger(elem[0], 'create');
|
||||||
|
|
||||||
$('.btnJobMenu', elem).on('click', function () {
|
$('.btnJobMenu', elem).on('click', function () {
|
||||||
showJobMenu(this);
|
showJobMenu(page, this);
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!jobs.length) {
|
if (!jobs.length) {
|
||||||
|
@ -190,7 +190,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function showJobMenu(elem) {
|
function showJobMenu(page, elem) {
|
||||||
|
|
||||||
var card = $(elem).parents('.card');
|
var card = $(elem).parents('.card');
|
||||||
var jobId = card.attr('data-id');
|
var jobId = card.attr('data-id');
|
||||||
|
@ -222,10 +222,10 @@
|
||||||
switch (id) {
|
switch (id) {
|
||||||
|
|
||||||
case 'delete':
|
case 'delete':
|
||||||
cancelJob(jobId);
|
cancelJob(page, jobId);
|
||||||
break;
|
break;
|
||||||
case 'cancel':
|
case 'cancel':
|
||||||
cancelJob(jobId);
|
cancelJob(page, jobId);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue