fix sync job deletion

This commit is contained in:
Luke Pulverenti 2015-07-02 08:55:07 -04:00
parent 54afe9d0c2
commit d999c53f9f
9 changed files with 22 additions and 16 deletions

View File

@ -6,6 +6,8 @@
globalScope.MediaBrowser.generateDeviceId = function (keyName, seed) {
keyName = keyName || 'randomId';
var keys = [];
keys.push(navigator.userAgent);

View File

@ -25,14 +25,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-meta",
"homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.0.3",
"_resolution": {
"type": "version",
"tag": "v1.0.3",
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
},
"_source": "git://github.com/PolymerElements/iron-meta.git",
"_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta"
"_originalSource": "polymerelements/iron-meta"
}

View File

@ -34,7 +34,7 @@
"tag": "v1.0.7",
"commit": "c65f5ce6b898bb756fca35cedaa53c3e8011abeb"
},
"_source": "git://github.com/PolymerElements/paper-styles.git",
"_source": "git://github.com/polymerelements/paper-styles.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-styles"
"_originalSource": "polymerelements/paper-styles"
}

View File

@ -146,7 +146,7 @@
currentPlayer = player;
Logger.log('binding remotecontrols to MediaPlayer');
Logger.log('binding remotecontrols to ' + player.name);
player.getPlayerState().done(function (state) {

View File

@ -474,9 +474,9 @@
Logger.log('session.connect succeeded');
webAppSession.setWebAppSessionListener();
MediaController.setActivePlayer(PlayerName, convertDeviceToTarget(device));
currentDevice = device;
currentDeviceId = device.getId();
MediaController.setActivePlayer(PlayerName, convertDeviceToTarget(device));
$(castPlayer).trigger('connect');
@ -538,7 +538,8 @@
Logger.log('launchWebApp success. calling onSessionConnected');
if ($.browser.android) {
tryJoinWebSession(device, true, false);
//tryJoinWebSession(device, true, false);
setupWebAppSession(device, session, true);
} else {
setupWebAppSession(device, session, true);
}
@ -646,6 +647,8 @@
if (newTarget.id != currentDeviceId) {
if (currentWebAppSession) {
Logger.log('Disconnecting from chromecast');
Logger.log('New target info: ' + JSON.stringify(newTarget));
Logger.log('currentDeviceId: ' + currentDeviceId);
//currentDevice.disconnect();
cleanupSession();
currentDevice = null;

View File

@ -500,8 +500,8 @@ h1 a:hover {
}
.paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) {
-webkit-transform: translateY(-203.5%);
transform: translateY(-203.5%);
-webkit-transform: translateY(-204%);
transform: translateY(-204%);
}
.largePanel {

View File

@ -175,6 +175,7 @@
tabs.alignBottom = true;
tabs.classList.add('bottomTabs');
}
tabs.noink = true;
if (LibraryBrowser.enableFullPaperTabs()) {

View File

@ -2,7 +2,7 @@
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;
console.log('share cancelled. shareId: ' + shareId);
Logger.log('share cancelled. shareId: ' + shareId);
// Delete the share since it was cancelled
ApiClient.ajax({

View File

@ -181,7 +181,7 @@
Events.trigger(elem[0], 'create');
$('.btnJobMenu', elem).on('click', function () {
showJobMenu(this);
showJobMenu(page, this);
});
if (!jobs.length) {
@ -190,7 +190,7 @@
}
}
function showJobMenu(elem) {
function showJobMenu(page, elem) {
var card = $(elem).parents('.card');
var jobId = card.attr('data-id');
@ -222,10 +222,10 @@
switch (id) {
case 'delete':
cancelJob(jobId);
cancelJob(page, jobId);
break;
case 'cancel':
cancelJob(jobId);
cancelJob(page, jobId);
break;
default:
break;