';
- var showUserAtTop = $.browser.mobile;
+ var showUserAtTop = AppInfo.isTouchPreferred;
if (showUserAtTop) {
@@ -545,16 +542,25 @@
$(document).scrollTop(0);
}
- $('.libraryViewNav', page).each(function() {
-
- // construct an instance of Headroom, passing the element
- var headroom = new Headroom(this);
- // initialise
- headroom.init();
+ $('.libraryViewNav', page).each(function () {
+
+ initHeadRoom(this);
});
});
+ function initHeadRoom(elem) {
+
+ if (!AppInfo.enableHeadRoom) {
+ return;
+ }
+
+ // construct an instance of Headroom, passing the element
+ var headroom = new Headroom(elem);
+ // initialise
+ headroom.init();
+ }
+
function initializeApiClient(apiClient) {
$(apiClient).off('websocketmessage.librarymenu', onWebSocketMessage).on('websocketmessage.librarymenu', onWebSocketMessage);
@@ -573,7 +579,7 @@
});
-})(window, document, jQuery);
+})(window, document, jQuery, window.devicePixelRatio);
$.fn.createHoverTouch = function () {
diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js
index 89b1266a34..cf951bca05 100644
--- a/dashboard-ui/scripts/livetvguide.js
+++ b/dashboard-ui/scripts/livetvguide.js
@@ -419,14 +419,16 @@
});
}
- $('.tvGuideHeader', page).each(function () {
+ if (AppInfo.enableHeadRoom) {
+ $('.tvGuideHeader', page).each(function () {
- // construct an instance of Headroom, passing the element
- var headroom = new Headroom(this);
- // initialise
- headroom.init();
+ // construct an instance of Headroom, passing the element
+ var headroom = new Headroom(this);
+ // initialise
+ headroom.init();
- });
+ });
+ }
}).on('pageshow', "#liveTvGuidePage", function () {
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 49f07a2818..860c196c65 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -90,6 +90,7 @@
function onPopupOpen(elem) {
elem.popup("open").parents(".ui-popup-container").css("margin-top", 30);
+ // TODO: With iOS 8 this might not be required anymore
if ($.browser.safari) {
$('.itemVideo').css('visibility', 'hidden');
}
diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js
index 94f51a87ec..0f1a987335 100644
--- a/dashboard-ui/scripts/mediaplayer.js
+++ b/dashboard-ui/scripts/mediaplayer.js
@@ -26,7 +26,7 @@
self.getTargets = function () {
var targets = [{
- name: 'My Browser',
+ name: Globalize.translate('MyDevice'),
id: ConnectionManager.deviceId(),
playerName: self.name,
playableMediaTypes: ['Audio', 'Video'],
@@ -139,6 +139,13 @@
VideoCodec: 'h264',
AudioCodec: 'aac,mp3'
});
+ // TODO: Test this
+ //profile.DirectPlayProfiles.push({
+ // Container: 'mov',
+ // Type: 'Video',
+ // VideoCodec: 'h264',
+ // AudioCodec: 'aac,mp3'
+ //});
}
profile.DirectPlayProfiles.push({
@@ -208,7 +215,6 @@
profile.ContainerProfiles = [];
var audioConditions = [];
- var videoAudioAacConditions = [];
var videoAudioMp3Conditions = [];
var maxAudioChannels = $.browser.msie || $.browser.safari ?
@@ -222,7 +228,6 @@
};
audioConditions.push(channelCondition);
- videoAudioAacConditions.push(channelCondition);
videoAudioMp3Conditions.push(channelCondition);
profile.CodecProfiles = [];
@@ -239,22 +244,32 @@
});
}
- videoAudioAacConditions.push({
- Condition: 'NotEquals',
- Property: 'AudioProfile',
- Value: 'LC'
- });
-
- videoAudioAacConditions.push({
- Condition: 'NotEquals',
- Property: 'AudioProfile',
- Value: 'HE-AAC'
+ profile.CodecProfiles.push({
+ Type: 'VideoAudio',
+ Codec: 'aac',
+ Container: 'mkv,mov',
+ Conditions: [
+ channelCondition,
+ {
+ Condition: 'NotEquals',
+ Property: 'AudioProfile',
+ Value: 'HE-AAC'
+ },
+ {
+ Condition: 'NotEquals',
+ Property: 'AudioProfile',
+ Value: 'LC'
+ }
+ ]
});
profile.CodecProfiles.push({
Type: 'VideoAudio',
Codec: 'aac',
- Conditions: videoAudioAacConditions
+ Container: 'mp4,m4v',
+ Conditions: [
+ channelCondition
+ ]
});
profile.CodecProfiles.push({
@@ -319,6 +334,18 @@
MimeType: 'video/mp4'
});
+ //profile.ResponseProfiles.push({
+ // Type: 'Video',
+ // Container: 'mkv',
+ // MimeType: 'video/webm'
+ //});
+
+ profile.ResponseProfiles.push({
+ Type: 'Video',
+ Container: 'mov',
+ MimeType: 'video/webm'
+ });
+
return profile;
};
@@ -833,7 +860,10 @@
var deviceProfile = self.getDeviceProfile();
- Dashboard.showLoadingMsg();
+ if (item.MediaType === "Video") {
+
+ Dashboard.showModalLoadingMsg();
+ }
getPlaybackInfo(item.Id, deviceProfile, startPosition).done(function (playbackInfoResult) {
@@ -856,7 +886,7 @@
playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback);
}
} else {
- Dashboard.hideLoadingMsg();
+ Dashboard.hideModalLoadingMsg();
showPlaybackInfoErrorMessage('NoCompatibleStream');
}
}
@@ -866,7 +896,7 @@
function playInternalPostMediaSourceSelection(item, mediaSource, startPosition, callback) {
- Dashboard.hideLoadingMsg();
+ Dashboard.hideModalLoadingMsg();
self.currentMediaSource = mediaSource;
self.currentItem = item;
diff --git a/dashboard-ui/scripts/selectserver.js b/dashboard-ui/scripts/selectserver.js
index b777f6ad8a..985afa8fab 100644
--- a/dashboard-ui/scripts/selectserver.js
+++ b/dashboard-ui/scripts/selectserver.js
@@ -128,12 +128,12 @@
var id = this.getAttribute('data-serverid');
if (id == 'new') {
- window.location = 'connectlogin.html?mode=manualserver';
+ Dashboard.navigate('connectlogin.html?mode=manualserver');
return;
}
if (id == 'connect') {
- window.location = 'connectlogin.html?mode=connect';
+ Dashboard.navigate('connectlogin.html?mode=connect');
return;
}
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 5e871e86e4..2b1c8efc18 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -368,6 +368,10 @@ var Dashboard = {
showFooterNotification: function (options) {
+ if (Dashboard.isRunningInCordova()) {
+ return;
+ }
+
var removeOnHide = !options.id;
options.id = options.id || "notification" + new Date().getTime() + parseInt(Math.random());
@@ -441,6 +445,29 @@ var Dashboard = {
$.mobile.loading("hide");
},
+ getModalLoadingMsg: function () {
+
+ var elem = $('.modalLoading');
+
+ if (!elem.length) {
+
+ elem = $('').appendTo(document.body);
+
+ }
+
+ return elem;
+ },
+
+ showModalLoadingMsg: function () {
+ Dashboard.showLoadingMsg();
+ Dashboard.getModalLoadingMsg().show();
+ },
+
+ hideModalLoadingMsg: function () {
+ Dashboard.getModalLoadingMsg().hide();
+ Dashboard.hideLoadingMsg();
+ },
+
processPluginConfigurationUpdateResult: function () {
Dashboard.hideLoadingMsg();
@@ -613,7 +640,7 @@ var Dashboard = {
var url = user.imageUrl;
if (user.supportsImageParams) {
- url += "&width=" + (imgWidth * Math.max(devicePixelRatio || 1, 2));
+ url += "&width=" + (imgWidth * Math.max(window.devicePixelRatio || 1, 2));
}
html += '
';
@@ -1330,7 +1357,7 @@ var Dashboard = {
quality -= 15;
}
- if ($.browser.safari && $.browser.mobile) {
+ if (AppInfo.hasLowImageBandwidth) {
quality -= 10;
@@ -1416,11 +1443,34 @@ var Dashboard = {
}
};
+var AppInfo = {};
+
(function () {
- if (!window.WebSocket) {
+ function isTouchDevice() {
+ return (('ontouchstart' in window)
+ || (navigator.MaxTouchPoints > 0)
+ || (navigator.msMaxTouchPoints > 0));
+ }
- alert(Globalize.translate('MessageBrowserDoesNotSupportWebSockets'));
+ function setAppInfo() {
+
+ if (isTouchDevice()) {
+ AppInfo.isTouchPreferred = true;
+ }
+
+ if ($.browser.safari) {
+
+ if ($.browser.mobile) {
+ AppInfo.hasLowImageBandwidth = true;
+ }
+ }
+ else {
+
+ if (!$.browser.tv) {
+ AppInfo.enableHeadRoom = true;
+ }
+ }
}
function initializeApiClient(apiClient) {
@@ -1487,6 +1537,12 @@ var Dashboard = {
function onReady() {
+ //FastClick.attach(document.body);
+
+ if (AppInfo.hasLowImageBandwidth) {
+ $(document.body).addClass('largeCardMargin');
+ }
+
var videoPlayerHtml = '