mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update local sync

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-16 00:12:12 -04:00
parent 95f0f7874f
commit d0aee5580a
8 changed files with 93 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3361,6 +3361,29 @@
});
};
self.cancelSyncItems = function (itemIds, targetId) {
if (!userId) {
throw new Error("null userId");
}
if (!itemId) {
throw new Error("null itemId");
}
var url = self.getUrl("Sync/Items/Cancel");
return self.ajax({
type: "POST",
data: JSON.stringify({
TargetId: targetId || self.deviceId(),
ItemIds: itemIds
}),
contentType: "application/json",
url: url
});
};
/**
* Reports a user has stopped playing an item
* @param {String} userId

5
dashboard-ui/components/navdrawer/navdrawer.js
View file

@ -97,7 +97,10 @@
return;
}
var edgeHammer = new Hammer(options.edgeSwipeElement, null);
require(['hammer-main'], initEdgeSwipeInternal);
}
function initEdgeSwipeInternal(edgeHammer) {
var isPeeking = false;
edgeHammer.on('panstart panmove', function (ev) {

4
dashboard-ui/itemdetails.html
View file

@ -38,7 +38,7 @@
<div class="syncLocalContainer hide" style="margin-top:1em; display: inline-flex; padding: 0 .5em;">
<label class="checkboxContainer" style="margin:0;">
<input type="checkbox" is="emby-checkbox" class="chkOffline" />
<span>Make Available Offline</span>
<span>${MakeAvailableOffline}</span>
</label>
</div>
</div>
@ -62,7 +62,7 @@
<div class="syncLocalContainer hide" style="margin-top:1em; display: inline-flex; padding: 0 .5em;">
<label class="checkboxContainer" style="margin:0;">
<input type="checkbox" is="emby-checkbox" class="chkOffline" />
<span>Make Available Offline</span>
<span>${MakeAvailableOffline}</span>
</label>
</div>
</div>

15
dashboard-ui/scripts/itemdetailpage.js
View file

@ -2054,6 +2054,8 @@
});
}
return function (view, params) {
function onSyncLocalClick() {
if (this.checked) {
@ -2064,10 +2066,17 @@
});
} else {
}
}
require(['confirm'], function (confirm) {
return function (view, params) {
confirm(Globalize.translate('ConfirmRemoveDownload')).then(function () {
ApiClient.cancelSyncItems([currentItem.Id]);
}, function () {
updateSyncStatus(view, currentItem);
});
});
}
}
function onPlayTrailerClick() {
playTrailer(view);

35
dashboard-ui/scripts/librarybrowser.js
View file

@ -116,32 +116,43 @@
configureSwipeTabs: function (ownerpage, tabs) {
if (!browser.touch) {
return;
//return;
}
//require(['hammer'], function (Hammer) {
// var hammertime = new Hammer(ownerpage);
// hammertime.get('swipe').set({ direction: Hammer.DIRECTION_HORIZONTAL });
//});
var pageCount = ownerpage.querySelectorAll('.pageTabContent').length;
require(['hammer'], function (Hammer) {
var hammertime = new Hammer(ownerpage);
hammertime.get('swipe').set({ direction: Hammer.DIRECTION_HORIZONTAL });
hammertime.on('swipeleft', function (e) {
if (LibraryBrowser.allowSwipe(e.target)) {
var onSwipeLeft = function (e) {
if (LibraryBrowser.allowSwipe(e.target) && ownerpage.contains(e.target)) {
var selected = parseInt(tabs.selectedIndex() || '0');
if (selected < (pageCount - 1)) {
tabs.selectedIndex(selected + 1);
}
}
});
};
hammertime.on('swiperight', function (e) {
if (LibraryBrowser.allowSwipe(e.target)) {
var onSwipeRight = function (e) {
if (LibraryBrowser.allowSwipe(e.target) && ownerpage.contains(e.target)) {
var selected = parseInt(tabs.selectedIndex() || '0');
if (selected > 0) {
tabs.selectedIndex(selected - 1);
}
}
};
require(['hammer-main'], function (hammertime) {
hammertime.on('swipeleft', onSwipeLeft);
hammertime.on('swiperight', onSwipeRight);
ownerpage.addEventListener('viewdestroy', function () {
hammertime.off('swipeleft', onSwipeLeft);
hammertime.off('swiperight', onSwipeRight);
});
});
},

3
dashboard-ui/scripts/librarymenu.js
View file

@ -1055,8 +1055,7 @@
target: navDrawerElement,
onChange: onMainDrawerSelect,
width: drawerWidth,
disableEdgeSwipe: disableEdgeSwipe,
edgeSwipeElement: document.querySelector('.mainDrawerPanelContent')
disableEdgeSwipe: disableEdgeSwipe
};
}

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

@ -1204,6 +1204,12 @@ var AppInfo = {};
return headroom;
}
function createMainContentHammer(Hammer) {
var hammer = new Hammer(document.querySelector('.mainDrawerPanelContent'), null);
return hammer;
}
function initRequire() {
var urlArgs = "v=" + (window.dashboardVersion || new Date().getDate());
@ -1511,6 +1517,7 @@ var AppInfo = {};
});
define("headroom-window", ['headroom'], createWindowHeadroom);
define("hammer-main", ['hammer'], createMainContentHammer);
// mock this for now. not used in this app
define("playbackManager", [], function () {

4
dashboard-ui/strings/en-US.json
View file

@ -2312,5 +2312,7 @@
"MoreFromValue": "More from {0}",
"OptionSaveMetadataAsHiddenHelp": "Changing this will apply to new metadata saved going forward. Existing metadata files will be updated the next time they are saved by Emby Server.",
"EnablePhotos": "Enable photos",
"EnablePhotosHelp": "Photos will be detected and displayed alongside other media files."
"EnablePhotosHelp": "Photos will be detected and displayed alongside other media files.",
"MakeAvailableOffline": "Make available offline",
"ConfirmRemoveDownload": "Remove download?"
}