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

update search css loading

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-02 15:50:25 -05:00
parent 96eb9ea63a
commit 3118991c21
15 changed files with 161 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

18
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -586,20 +586,16 @@
self.init = function () {
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
if (options.type == 'video' && enableHlsPlayer()) {
if (options.type == 'video' && enableHlsPlayer()) {
requireHlsPlayer(function () {
requireHlsPlayer(resolve);
deferred.resolve();
});
} else {
deferred.resolve();
}
return deferred.promise();
} else {
resolve();
}
});
};
if (options.type == 'audio') {

4
dashboard-ui/scripts/librarylist.js
View file

@ -851,6 +851,7 @@
function disableEvent(e) {
e.preventDefault();
e.stopPropagation();
return false;
}
@ -879,6 +880,8 @@
chkItemSelect.checked = !chkItemSelect.checked;
}
}
e.preventDefault();
return false;
}
}
@ -896,6 +899,7 @@
}
e.preventDefault();
e.stopPropagation();
return false;
}

17
dashboard-ui/scripts/searchmenu.js
View file

@ -6,16 +6,17 @@
self.show = function () {
require(['css!css/search.css']);
$('.headerSearchInput').val('');
require(['css!css/search.css'], function() {
$('.headerSearchInput').val('');
$('.btnCloseSearch').hide();
var elem = $('.viewMenuSearch').removeClass('hide')[0];
$('.btnCloseSearch').hide();
var elem = $('.viewMenuSearch').removeClass('hide')[0];
fadeIn(elem, 1).onfinish = function () {
$('.headerSearchInput').focus();
$('.btnCloseSearch').show();
};
fadeIn(elem, 1).onfinish = function () {
$('.headerSearchInput').focus();
$('.btnCloseSearch').show();
};
});
};
function fadeIn(elem, iterations) {