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

fix copy/paste

Browse source
This commit is contained in:
Luke Pulverenti 2016-08-08 22:09:56 -04:00
parent b1feee2d1c
commit 274d8f6809
2 changed files with 37 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
define(['browser', 'hammer', 'css!./navdrawer', 'scrollStyles'], function (browser, Hammer) { define(['browser', 'css!./navdrawer', 'scrollStyles'], function (browser) {
return function (options) { return function (options) {
@ -35,7 +35,7 @@
this.initialize(); this.initialize();
}; };
TouchMenuLA.prototype.initElements = function () { TouchMenuLA.prototype.initElements = function (Hammer) {
options.target.classList.add('touch-menu-la'); options.target.classList.add('touch-menu-la');
options.target.style.width = options.width + 'px'; options.target.style.width = options.width + 'px';
options.target.style.left = -options.width + 'px'; options.target.style.left = -options.width + 'px';
@ -44,7 +44,10 @@
mask = document.createElement('div'); mask = document.createElement('div');
mask.className = 'tmla-mask'; mask.className = 'tmla-mask';
document.body.appendChild(mask); document.body.appendChild(mask);
maskHammer = new Hammer(mask, null);
if (Hammer) {
maskHammer = new Hammer(mask, null);
}
} }
}; };
@ -89,7 +92,7 @@
self.checkMenuState(ev.deltaX, ev.deltaY); self.checkMenuState(ev.deltaX, ev.deltaY);
} }
function initEdgeSwipe() { function initEdgeSwipe(Hammer) {
if (options.disableEdgeSwipe) { if (options.disableEdgeSwipe) {
return; return;
} }
@ -258,6 +261,27 @@
} }
}; };
function initWithHammer(Hammer) {
if (Hammer) {
menuHammer = Hammer(options.target, null);
}
self.initElements(Hammer);
if (Hammer) {
self.touchStartMenu();
self.touchEndMenu();
self.eventStartMask();
self.eventEndMask();
initEdgeSwipe(Hammer);
}
if (!options.disableMask) {
self.clickMaskClose();
}
}
TouchMenuLA.prototype.initialize = function () { TouchMenuLA.prototype.initialize = function () {
options = Object.assign(defaults, options || {}); options = Object.assign(defaults, options || {});
@ -267,20 +291,11 @@
options.disableEdgeSwipe = true; options.disableEdgeSwipe = true;
} }
menuHammer = Hammer(options.target, null); if (browser.touch) {
require(['hammer'], initWithHammer);
self.initElements(); } else {
initWithHammer();
self.touchStartMenu();
self.touchEndMenu();
self.eventStartMask();
self.eventEndMask();
if (!options.disableMask) {
self.clickMaskClose();
} }
initEdgeSwipe();
}; };
return new TouchMenuLA(); return new TouchMenuLA();

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

@ -2,7 +2,7 @@
function fadeInRight(elem) { function fadeInRight(elem) {
var pct = browserInfo.mobile ? '3.5%' : '0.5%'; var pct = browserInfo.mobile ? '4%' : '0.5%';
var keyframes = [ var keyframes = [
{ opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 }, { opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
@ -163,6 +163,10 @@
configureSwipeTabs: function (ownerpage, tabs) { configureSwipeTabs: function (ownerpage, tabs) {
if (!browserInfo.touch) {
return;
}
var pageCount = ownerpage.querySelectorAll('.pageTabContent').length; var pageCount = ownerpage.querySelectorAll('.pageTabContent').length;
require(['hammer'], function (Hammer) { require(['hammer'], function (Hammer) {