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

update components

This commit is contained in:
Luke Pulverenti 2016-04-11 10:05:43 -04:00
parent ca13b8cbc2
commit 321c73557d
3 changed files with 41 additions and 13 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.2.13", "version": "1.2.17",
"_release": "1.2.13", "_release": "1.2.17",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.2.13", "tag": "1.2.17",
"commit": "23c88db1b8b062fa6b738b724c2360d398164cad" "commit": "3b194aa81bb6bb5303e5e42a4687f6a3b486a3eb"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -5,13 +5,17 @@ define([], function () {
var element = view.querySelector('*[autofocus]'); var element = view.querySelector('*[autofocus]');
if (element) { if (element) {
focus(element); focus(element);
return element;
} else if (defaultToFirst !== false) { } else if (defaultToFirst !== false) {
element = getFocusableElements(view)[0]; element = getFocusableElements(view)[0];
if (element) { if (element) {
focus(element); focus(element);
return element;
} }
} }
return null;
} }
function focus(element) { function focus(element) {

View file

@ -1,4 +1,4 @@
define(['browser'], function (browser) { define(['browser', 'appSettings'], function (browser, appSettings) {
function setLayout(self, layout, selectedLayout) { function setLayout(self, layout, selectedLayout) {
@ -15,26 +15,50 @@ define(['browser'], function (browser) {
var self = this; var self = this;
self.layout = function (layout) { self.setLayout = function (layout, save) {
if (!layout || layout == 'auto') {
self.autoLayout();
if (save !== false) {
appSettings.set('layout', '');
}
} else {
setLayout(self, 'mobile', layout); setLayout(self, 'mobile', layout);
setLayout(self, 'tv', layout); setLayout(self, 'tv', layout);
setLayout(self, 'desktop', layout); setLayout(self, 'desktop', layout);
if (save !== false) {
appSettings.set('layout', layout);
}
}
};
self.getSavedLayout = function (layout) {
return appSettings.get('layout');
}; };
self.autoLayout = function () { self.autoLayout = function () {
// Take a guess at initial layout. The consuming app can override // Take a guess at initial layout. The consuming app can override
if (browser.mobile) { if (browser.mobile) {
self.layout('mobile'); self.setLayout('mobile', false);
} else if (browser.tv) { } else if (browser.tv) {
self.layout('tv'); self.setLayout('tv', false);
} else { } else {
self.layout('desktop'); self.setLayout(self.undetectedAutoLayout || 'desktop', false);
} }
}; };
self.init = function () {
var saved = self.getSavedLayout();
if (saved) {
self.setLayout(saved, false);
} else {
self.autoLayout(); self.autoLayout();
}
};
}; };
return new layoutManager(); return new layoutManager();