milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updated nuget

Browse source
This commit is contained in:
Luke Pulverenti 2015-07-10 14:30:42 -04:00
parent 4e815ceaf0
commit 4b951f485f
4 changed files with 16 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

31
dashboard-ui/scripts/mediaplayer.js
View file

@ -509,18 +509,7 @@
self.canPlayNativeHls = function () {
// Don't use HLS on android 4.x, regardless of what the browser reports
//if ($.browser.android) {
// var agent = navigator.userAgent.toLowerCase();
// for (var i = 0; i <= 4; i++) {
// if (agent.indexOf('android 4.' + i) != -1) {
// return false;
// }
// }
//}
if ($.browser.android && AppInfo.isNativeApp) {
if (AppInfo.isNativeApp) {
return true;
}
@ -541,21 +530,9 @@
return true;
}
if ($.browser.chrome) {
// viblast can help us here
//return true;
return window.MediaSource != null;
}
if ($.browser.msie) {
// viblast can help us here
//return true;
return window.MediaSource != null;
}
return false;
// viblast can help us here
//return true;
return window.MediaSource != null;
};
self.changeStream = function (ticks, params) {

10
dashboard-ui/scripts/sections.js
View file

@ -327,10 +327,14 @@
$('a', elem).on('click', function () {
var card = $(this).parents('.card');
var textElem = $('.cardText', card);
var card = this;
var text = textElem.html();
if (!this.classList.contains('card')) {
card = $(this).parents('.card')[0];
}
var textElem = $('.cardText', card);
var text = textElem.text();
LibraryMenu.setTitle(text);
});