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

update people queries

This commit is contained in:
Luke Pulverenti 2015-07-06 22:25:23 -04:00
parent 99768ecffe
commit 17a0f1578d
22 changed files with 215 additions and 123 deletions

View file

@ -211,15 +211,12 @@
function tryReconnectInternal(deferred, connectionMode, currentRetryCount) { function tryReconnectInternal(deferred, connectionMode, currentRetryCount) {
var previousConnectionMode = self.serverInfo().LastConnectionMode;
var previousServerAddress = MediaBrowser.ServerInfo.getServerAddress(self.serverInfo(), previousConnectionMode);
connectionMode = switchConnectionMode(connectionMode); connectionMode = switchConnectionMode(connectionMode);
var url = MediaBrowser.ServerInfo.getServerAddress(self.serverInfo(), connectionMode); var url = MediaBrowser.ServerInfo.getServerAddress(self.serverInfo(), connectionMode);
logger.log("Attempting reconnection to " + url); logger.log("Attempting reconnection to " + url);
var timeout = connectionMode == MediaBrowser.ConnectionMode.Local ? 5000 : 15000; var timeout = connectionMode == MediaBrowser.ConnectionMode.Local ? 7000 : 15000;
HttpClient.send({ HttpClient.send({

View file

@ -41,7 +41,7 @@
var self = this; var self = this;
var apiClients = []; var apiClients = [];
var defaultTimeout = 15000; var defaultTimeout = 20000;
function mergeServers(list1, list2) { function mergeServers(list1, list2) {
@ -907,7 +907,7 @@
if (mode == MediaBrowser.ConnectionMode.Local) { if (mode == MediaBrowser.ConnectionMode.Local) {
enableRetry = true; enableRetry = true;
timeout = 5000; timeout = 7000;
} }
else if (mode == MediaBrowser.ConnectionMode.Manual) { else if (mode == MediaBrowser.ConnectionMode.Manual) {

View file

@ -57,7 +57,7 @@
// Use the embedded server for iOS8, and also if we don't know the iOS version, just to be safe // Use the embedded server for iOS8, and also if we don't know the iOS version, just to be safe
//if ($.browser.iOSVersion == 8 || !$.browser.iOSVersion) //if ($.browser.iOSVersion == 8 || !$.browser.iOSVersion)
{ {
return url.replace('file://', ''); //return url.replace('file://', '');
} }
} }
return url; return url;

View file

@ -25,7 +25,9 @@
if (options.callback) { if (options.callback) {
if (index >= 1) { // Results are 1-based
if (index >= 1 && options.items.length >= index) {
options.callback(options.items[index - 1].id); options.callback(options.items[index - 1].id);
} }
} }

View file

@ -26,7 +26,7 @@
var elapsedTime = playState.PositionTicks ? (playState.PositionTicks / 10000000) : 0; var elapsedTime = playState.PositionTicks ? (playState.PositionTicks / 10000000) : 0;
var url = ''; var url = '';
var imgHeight = 100; var imgHeight = 600;
var nowPlayingItem = state.NowPlayingItem; var nowPlayingItem = state.NowPlayingItem;

View file

@ -47,12 +47,19 @@
margin: 2px; margin: 2px;
} }
@media all and (max-width: 800px) {
.cardBox {
margin: 1px;
}
}
.largeCardMargin .cardBox { .largeCardMargin .cardBox {
margin: 8px; margin: 8px;
} }
.mediumCardMargin .cardBox { .mediumCardMargin .cardBox {
margin: 6px; margin: 5px;
} }
.defaultBackground .cardImage { .defaultBackground .cardImage {
@ -69,7 +76,7 @@
.cardOverlayPlayButton iron-icon { .cardOverlayPlayButton iron-icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
background-color: rgba(215,215,215,.9); background-color: rgba(210,210,210,.9);
border-radius: 500px; border-radius: 500px;
padding: 6px; padding: 6px;
} }
@ -84,18 +91,11 @@
.cardOverlayMoreButton iron-icon { .cardOverlayMoreButton iron-icon {
width: 20px; width: 20px;
height: 20px; height: 20px;
background-color: rgba(215,215,215,.9); background-color: rgba(210,210,210,.9);
border-radius: 500px; border-radius: 500px;
padding: 6px; padding: 6px;
} }
@media all and (max-width: 800px) {
.cardBox {
margin: 1px;
}
}
.grayscale { .grayscale {
-webkit-filter: grayscale(100%); -webkit-filter: grayscale(100%);
-moz-filter: grayscale(100%); -moz-filter: grayscale(100%);

View file

@ -3,7 +3,7 @@
} }
.libraryPage:not(.noSecondaryNavPage) { .libraryPage:not(.noSecondaryNavPage) {
padding-top: 96px !important; padding-top: 95px !important;
} }
.pageWithAbsoluteTabs:not(.noSecondaryNavPage) { .pageWithAbsoluteTabs:not(.noSecondaryNavPage) {
@ -266,7 +266,7 @@
margin: 0 0; margin: 0 0;
position: relative; position: relative;
font-weight: normal; font-weight: normal;
border-bottom: 3px solid transparent; border-bottom: 2px solid transparent;
} }
.libraryViewNav .ui-btn-active { .libraryViewNav .ui-btn-active {

View file

@ -57,7 +57,7 @@
text-overflow: ellipsis; text-overflow: ellipsis;
vertical-align: middle; vertical-align: middle;
text-align: left; text-align: left;
font-size: 14px; font-size: 15px;
max-width: 130px; max-width: 130px;
} }

View file

@ -495,8 +495,8 @@ h1 a:hover {
} }
.libraryViewNav:not(.paperLibraryViewNav).headroom--unpinned:not(.headroomDisabled) { .libraryViewNav:not(.paperLibraryViewNav).headroom--unpinned:not(.headroomDisabled) {
-webkit-transform: translateY(-208%); -webkit-transform: translateY(-210%);
transform: translateY(-208%); transform: translateY(-210%);
} }
.paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) { .paperLibraryViewNav.headroom--unpinned:not(.headroomDisabled) {
@ -931,7 +931,7 @@ h1 .imageLink {
} }
.footerOverBottomTabs { .footerOverBottomTabs {
bottom: 51px !important; bottom: 49px !important;
} }
.footerNotification { .footerNotification {

View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="editCollectionTitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/editcollectionitems,jqmicons"> <div id="editCollectionTitlesPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/editcollectionitems,jqmicons">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar"> <div class="editPageSidebar">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="editItemImagesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemimages,jqmicons"> <div id="editItemImagesPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemimages,jqmicons">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar smoothScrollY"> <div class="editPageSidebar smoothScrollY">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata,jqmicons"> <div id="editItemMetadataPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemmetadata,jqmicons">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar smoothScrollY"> <div class="editPageSidebar smoothScrollY">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -4,7 +4,7 @@
<title>Emby</title> <title>Emby</title>
</head> </head>
<body> <body>
<div id="editItemSubtitlesPage" data-role="page" class="page libraryPage metadataEditorPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemsubtitles,jqmicons"> <div id="editItemSubtitlesPage" data-role="page" class="page libraryPage metadataEditorPage noSecondaryNavPage" data-contextname="${HeaderMetadataManager}" data-require="scripts/editorsidebar,scripts/edititemsubtitles,jqmicons">
<div data-role="content editPageContent"> <div data-role="content editPageContent">
<div class="editPageSidebar smoothScrollY"> <div class="editPageSidebar smoothScrollY">
<div class="libraryTree"> <div class="libraryTree">

View file

@ -38,7 +38,7 @@
<label for="selectView">${LabelView}</label> <label for="selectView">${LabelView}</label>
<select id="selectView"> <select id="selectView">
<option value="List">${OptionList}</option> <option value="List">${OptionList}</option>
<option value="PosterCard">${OptionPosterCard}</option> <option value="Poster">${OptionPoster}</option>
</select> </select>
</div> </div>
<br /> <br />

View file

@ -1440,7 +1440,6 @@
//$.mobile.urlHistory.ignoreNextHashChange = true; //$.mobile.urlHistory.ignoreNextHashChange = true;
window.location.hash = 'editItemMetadataPage?id=' + data.id; window.location.hash = 'editItemMetadataPage?id=' + data.id;
alert(window.location.href);
reload(page); reload(page);
} }
}); });

View file

@ -64,7 +64,7 @@
} else { } else {
elem.empty(); elem.innerHTML = '';
var deferred = DeferredBuilder.Deferred(); var deferred = DeferredBuilder.Deferred();
deferred.resolve(); deferred.resolve();

View file

@ -494,7 +494,7 @@
var mediaType = card.getAttribute('data-mediatype'); var mediaType = card.getAttribute('data-mediatype');
var resumePosition = parseInt(card.getAttribute('data-resumeposition')); var resumePosition = parseInt(card.getAttribute('data-resumeposition'));
if (type == 'MusicAlbum' || type == 'MusicArtist' || type == 'MusicGenre') { if (type == 'MusicAlbum' || type == 'MusicArtist' || type == 'MusicGenre' || type == 'Playlist') {
isFolder = true; isFolder = true;
} }

View file

@ -153,6 +153,15 @@
//}); //});
} }
var directPlayVideoContainers = AppInfo.directPlayVideoContainers;
if (directPlayVideoContainers && directPlayVideoContainers.length) {
profile.DirectPlayProfiles.push({
Container: directPlayVideoContainers.join(','),
Type: 'Video'
});
}
profile.DirectPlayProfiles.push({ profile.DirectPlayProfiles.push({
Container: 'mp3', Container: 'mp3',
Type: 'Audio' Type: 'Audio'
@ -300,23 +309,27 @@
}] }]
}); });
profile.CodecProfiles.push({ var isVlc = AppInfo.isNativeApp && $.browser.android;
Type: 'VideoAudio',
Codec: 'aac', if (!isVlc) {
Container: 'mkv,mov', profile.CodecProfiles.push({
Conditions: [ Type: 'VideoAudio',
{ Codec: 'aac',
Condition: 'NotEquals', Container: 'mkv,mov',
Property: 'AudioProfile', Conditions: [
Value: 'HE-AAC' {
}, Condition: 'NotEquals',
{ Property: 'AudioProfile',
Condition: 'NotEquals', Value: 'HE-AAC'
Property: 'AudioProfile', },
Value: 'LC' {
} Condition: 'NotEquals',
] Property: 'AudioProfile',
}); Value: 'LC'
}
]
});
}
profile.CodecProfiles.push({ profile.CodecProfiles.push({
Type: 'VideoAudio', Type: 'VideoAudio',
@ -330,49 +343,69 @@
] ]
}); });
profile.CodecProfiles.push({ if (isVlc) {
Type: 'Video', profile.CodecProfiles.push({
Codec: 'h264', Type: 'Video',
Conditions: [ Codec: 'h264',
{ Conditions: [
Condition: 'NotEquals', {
Property: 'IsAnamorphic', Condition: 'EqualsAny',
Value: 'true', Property: 'VideoProfile',
IsRequired: false Value: 'high|main|baseline|constrained baseline'
}, },
{ {
Condition: 'EqualsAny', Condition: 'LessThanEqual',
Property: 'VideoProfile', Property: 'VideoLevel',
Value: 'high|main|baseline|constrained baseline' Value: '41'
}, }]
{ });
Condition: 'LessThanEqual', } else {
Property: 'VideoLevel', profile.CodecProfiles.push({
Value: '41' Type: 'Video',
}, Codec: 'h264',
{ Conditions: [
Condition: 'LessThanEqual', {
Property: 'Height', Condition: 'NotEquals',
Value: maxHeight Property: 'IsAnamorphic',
}] Value: 'true',
}); IsRequired: false
},
{
Condition: 'EqualsAny',
Property: 'VideoProfile',
Value: 'high|main|baseline|constrained baseline'
},
{
Condition: 'LessThanEqual',
Property: 'VideoLevel',
Value: '41'
},
{
Condition: 'LessThanEqual',
Property: 'Height',
Value: maxHeight
}]
});
}
profile.CodecProfiles.push({ if (!isVlc) {
Type: 'Video', profile.CodecProfiles.push({
Codec: 'vpx', Type: 'Video',
Conditions: [ Codec: 'vpx',
{ Conditions: [
Condition: 'NotEquals', {
Property: 'IsAnamorphic', Condition: 'NotEquals',
Value: 'true', Property: 'IsAnamorphic',
IsRequired: false Value: 'true',
}, IsRequired: false
{ },
Condition: 'LessThanEqual', {
Property: 'Height', Condition: 'LessThanEqual',
Value: maxHeight Property: 'Height',
}] Value: maxHeight
}); }]
});
}
// Subtitle profiles // Subtitle profiles
// External vtt or burn in // External vtt or burn in
@ -483,6 +516,10 @@
// } // }
//} //}
if ($.browser.android && AppInfo.isNativeApp) {
return true;
}
var media = document.createElement('video'); var media = document.createElement('video');
// safari // safari
@ -501,7 +538,7 @@
} }
if ($.browser.chrome) { if ($.browser.chrome) {
// viblast can help us here // viblast can help us here
//return true; //return true;
//return window.MediaSource != null; //return window.MediaSource != null;
@ -572,13 +609,13 @@
Events.off(mediaRenderer, 'ended', self.onPlaybackStopped); Events.off(mediaRenderer, 'ended', self.onPlaybackStopped);
Events.off(mediaRenderer, 'ended', self.playNextAfterEnded); Events.off(mediaRenderer, 'ended', self.playNextAfterEnded);
$(mediaRenderer).one("play", function () { $(mediaRenderer).one("play", function () {
self.updateCanClientSeek(this); self.updateCanClientSeek(this);
Events.on(this, 'ended', self.onPlaybackStopped); Events.on(this, 'ended', self.onPlaybackStopped);
$(this).one('ended', self.playNextAfterEnded); $(this).one('ended', self.playNextAfterEnded);
self.startProgressInterval(); self.startProgressInterval();
@ -1381,7 +1418,7 @@
Events.off(mediaRenderer, 'ended', self.playNextAfterEnded); Events.off(mediaRenderer, 'ended', self.playNextAfterEnded);
$(mediaRenderer).one("ended", function() { $(mediaRenderer).one("ended", function () {
$(this).off('.mediaplayerevent'); $(this).off('.mediaplayerevent');
@ -1392,7 +1429,7 @@
self.currentMediaSource = null; self.currentMediaSource = null;
}); });
Events.trigger(mediaRenderer, "ended"); Events.trigger(mediaRenderer, "ended");
} else { } else {
@ -1588,7 +1625,7 @@
var mediaRenderer = this; var mediaRenderer = this;
Events.off(mediaRenderer, '.mediaplayerevent'); Events.off(mediaRenderer, '.mediaplayerevent');
Events.off(mediaRenderer, 'ended', self.onPlaybackStopped); Events.off(mediaRenderer, 'ended', self.onPlaybackStopped);
var item = self.currentItem; var item = self.currentItem;
@ -1654,7 +1691,7 @@
self.canPlayWebm = function () { self.canPlayWebm = function () {
if (self._canPlayWebm == null) { if (self._canPlayWebm == null) {
self._canPlayWebm = document.createElement('video').canPlayType('video/webm').replace(/no/, ''); self._canPlayWebm = ($.browser.android && AppInfo.isNativeApp) || document.createElement('video').canPlayType('video/webm').replace(/no/, '');
} }
return self._canPlayWebm; return self._canPlayWebm;
}; };
@ -1705,7 +1742,7 @@
mediaRenderer.setPoster(self.getPosterUrl(item)); mediaRenderer.setPoster(self.getPosterUrl(item));
mediaRenderer.setCurrentSrc(audioUrl, item, mediaSource); mediaRenderer.setCurrentSrc(audioUrl, item, mediaSource);
Events.on(mediaRenderer, "volumechange.mediaplayerevent", function() { Events.on(mediaRenderer, "volumechange.mediaplayerevent", function () {
Logger.log('audio element event: volumechange'); Logger.log('audio element event: volumechange');

View file

@ -15,15 +15,45 @@
EnableImageTypes: "Primary,Backdrop,Banner,Thumb" EnableImageTypes: "Primary,Backdrop,Banner,Thumb"
}; };
var data = {};
function getQuery() {
var key = getSavedQueryKey();
var pageData = data[key];
if (!pageData) {
pageData = data[key] = {
query: {
SortBy: "AlbumArtist,SortName",
SortOrder: "Ascending",
IncludeItemTypes: "MusicAlbum",
Recursive: true,
Fields: "PrimaryImageAspectRatio,SortName,SyncInfo",
StartIndex: 0,
ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Banner,Thumb",
Limit: LibraryBrowser.getDefaultPageSize()
}
};
pageData.query.ParentId = LibraryMenu.getTopParentId();
LibraryBrowser.loadSavedQueryValues(key, pageData.query);
}
return pageData.query;
}
function getSavedQueryKey() { function getSavedQueryKey() {
return 'musicalbums' + (query.ParentId || ''); return getWindowUrl();
} }
function reloadItems(page) { function reloadItems(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var query = getQuery();
ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) { ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) {
// Scroll back up so they can see the results from the beginning // Scroll back up so they can see the results from the beginning
@ -109,13 +139,15 @@
}); });
LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
LibraryBrowser.setLastRefreshed(page);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
}); });
} }
function updateFilterControls(page) { function updateFilterControls(page) {
var query = getQuery();
$('#selectView', page).val(view).selectmenu('refresh'); $('#selectView', page).val(view).selectmenu('refresh');
// Reset form values using the last used query // Reset form values using the last used query
@ -142,6 +174,8 @@
filtersLoaded = true; filtersLoaded = true;
var query = getQuery();
QueryFilters.loadFilters(page, Dashboard.getCurrentUserId(), query, function () { QueryFilters.loadFilters(page, Dashboard.getCurrentUserId(), query, function () {
reloadItems(page); reloadItems(page);
@ -159,6 +193,8 @@
}); });
$('.radioSortBy', page).on('click', function () { $('.radioSortBy', page).on('click', function () {
var query = getQuery();
query.SortBy = this.getAttribute('data-sortby'); query.SortBy = this.getAttribute('data-sortby');
query.StartIndex = 0; query.StartIndex = 0;
@ -171,6 +207,8 @@
}); });
$('.radioSortOrder', page).on('click', function () { $('.radioSortOrder', page).on('click', function () {
var query = getQuery();
query.SortOrder = this.getAttribute('data-sortorder'); query.SortOrder = this.getAttribute('data-sortorder');
query.StartIndex = 0; query.StartIndex = 0;
@ -183,6 +221,7 @@
}); });
$('.chkStandardFilter', page).on('change', function () { $('.chkStandardFilter', page).on('change', function () {
var query = getQuery();
var filterName = this.getAttribute('data-filter'); var filterName = this.getAttribute('data-filter');
var filters = query.Filters || ""; var filters = query.Filters || "";
@ -203,6 +242,8 @@
view = this.value; view = this.value;
var query = getQuery();
if (view == "Timeline") { if (view == "Timeline") {
query.SortBy = "PremiereDate"; query.SortBy = "PremiereDate";
@ -218,6 +259,8 @@
$('.alphabetPicker', page).on('alphaselect', function (e, character) { $('.alphabetPicker', page).on('alphaselect', function (e, character) {
var query = getQuery();
if (query.SortBy.indexOf('AlbumArtist') == -1) { if (query.SortBy.indexOf('AlbumArtist') == -1) {
query.NameStartsWithOrGreater = character; query.NameStartsWithOrGreater = character;
query.AlbumArtistStartsWithOrGreater = ''; query.AlbumArtistStartsWithOrGreater = '';
@ -232,6 +275,8 @@
}).on('alphaclear', function (e) { }).on('alphaclear', function (e) {
var query = getQuery();
query.NameStartsWithOrGreater = ''; query.NameStartsWithOrGreater = '';
query.AlbumArtistStartsWithOrGreater = ''; query.AlbumArtistStartsWithOrGreater = '';
@ -239,6 +284,8 @@
}); });
$('#selectPageSize', page).on('change', function () { $('#selectPageSize', page).on('change', function () {
var query = getQuery();
query.Limit = parseInt(this.value); query.Limit = parseInt(this.value);
query.StartIndex = 0; query.StartIndex = 0;
reloadItems(page); reloadItems(page);
@ -246,29 +293,22 @@
}).on('pagebeforeshowready', "#musicAlbumsPage", function () { }).on('pagebeforeshowready', "#musicAlbumsPage", function () {
query.ParentId = LibraryMenu.getTopParentId();
var page = this; var page = this;
var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset
if (limit != query.Limit) {
query.Limit = limit;
query.StartIndex = 0;
}
var viewKey = getSavedQueryKey(); var viewKey = getSavedQueryKey();
LibraryBrowser.loadSavedQueryValues(viewKey, query); LibraryBrowser.loadSavedQueryValues(viewKey, query);
QueryFilters.onPageShow(page, query); QueryFilters.onPageShow(page, query);
LibraryBrowser.getSavedViewSetting(viewKey).done(function (val) { if (LibraryBrowser.needsRefresh(page)) {
LibraryBrowser.getSavedViewSetting(viewKey).done(function (val) {
if (val) { if (val) {
$('#selectView', page).val(val).selectmenu('refresh').trigger('change'); $('#selectView', page).val(val).selectmenu('refresh').trigger('change');
} else { } else {
reloadItems(page); reloadItems(page);
} }
}); });
}
updateFilterControls(this); updateFilterControls(this);
}); });

View file

@ -1,6 +1,6 @@
(function ($, document) { (function ($, document) {
var view = LibraryBrowser.getDefaultItemsView('PosterCard', 'PosterCard'); var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster');
// The base query options // The base query options
var query = { var query = {
@ -78,6 +78,19 @@
cardLayout: true cardLayout: true
}); });
} }
else if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "square",
context: 'playlists',
showTitle: true,
lazy: true,
coverImage: true,
showItemCounts: true,
centerText: true,
overlayPlayButton: true
});
}
$('.noItemsMessage', page).hide(); $('.noItemsMessage', page).hide();

View file

@ -1721,8 +1721,10 @@ var AppInfo = {};
if (isCordova && isAndroid) { if (isCordova && isAndroid) {
AppInfo.directPlayAudioContainers = ['aac', 'mp3', 'ogg', 'flac', 'wma', 'm4a', 'oga']; AppInfo.directPlayAudioContainers = ['aac', 'mp3', 'ogg', 'flac', 'wma', 'm4a', 'oga'];
AppInfo.directPlayVideoContainers = ['mkv', 'mp4', 'mov', 'm4v', 'avi', 'flv', 'wmv', 'webm'];
} else { } else {
AppInfo.directPlayAudioContainers = []; AppInfo.directPlayAudioContainers = [];
AppInfo.directPlayVideoContainers = [];
} }
} }
@ -2061,7 +2063,9 @@ var AppInfo = {};
function initCordovaWithDeviceId(deferred, deviceId) { function initCordovaWithDeviceId(deferred, deviceId) {
require(['cordova/imagestore']); if ($.browser.android) {
require(['cordova/imagestore']);
}
var capablities = Dashboard.capabilities(); var capablities = Dashboard.capabilities();

View file

@ -85,9 +85,9 @@
// If less than 200, this happens on the home page // If less than 200, this happens on the home page
// Need to fix those before this can be set to 0 // Need to fix those before this can be set to 0
if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) { //if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) {
return 7000; // return 7000;
} //}
var screens = $.browser.mobile ? 2.5 : 1; var screens = $.browser.mobile ? 2.5 : 1;