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 qsv encoding

Browse source
This commit is contained in:
Luke Pulverenti 2015-11-22 15:46:02 -05:00
parent 62b528a41c
commit e92784271b
5 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/bower_components/doc-ready/.bower.json vendored
View file

@ -39,6 +39,6 @@
"commit": "cec8e49744a1e18b14a711eea77e201bb70de544"
},
"_source": "git://github.com/desandro/doc-ready.git",
"_target": "1.0.x",
"_target": "~1.0.4",
"_originalSource": "doc-ready"
}

7
dashboard-ui/components/subtitleeditor/subtitleeditor.js
View file

@ -11,7 +11,12 @@
var url = 'Videos/' + currentItem.Id + '/Subtitles/' + index;
$.get(ApiClient.getUrl(url)).done(function (result) {
ApiClient.ajax({
type: 'GET',
url: url
}).then(function (result) {
$('.subtitleContent', page).html(result);

2
dashboard-ui/css/librarybrowser.css
View file

@ -1246,7 +1246,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
}
.itemsContainerWithAlphaPicker {
margin-right: 15px;
margin-right: 20px;
}
}

34
dashboard-ui/scripts/globalize.js
View file

@ -29,34 +29,32 @@
var url = getUrl(name, culture);
var requestUrl = url + "?v=" + window.dashboardVersion;
fetch(requestUrl, { mode: 'no-cors' }).then(function (response) {
var xhr = new XMLHttpRequest();
xhr.open('GET', requestUrl, true);
if (response.status < 400) {
xhr.onload = function (e) {
return response.json();
if (this.status < 400) {
dictionaries[url] = JSON.parse(this.response);
resolve();
} else {
// Grab the english version
fetch(getUrl(name, 'en-US'), { mode: 'no-cors' }).then(function (response) {
var xhr2 = new XMLHttpRequest();
xhr2.open('GET', getUrl(name, 'en-US'), true);
return response.json();
}).then(function (json) {
dictionaries[url] = json;
xhr2.onload = function (e) {
dictionaries[url] = JSON.parse(this.response);
resolve();
});
};
xhr2.send();
}
};
}).then(function (json) {
if (json) {
dictionaries[url] = json;
resolve();
}
});
xhr.send();
});
}

11
dashboard-ui/thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.js vendored
View file

@ -3123,13 +3123,14 @@
// success: successFn,
// error: this._loadError(absUrl, triggerData, settings, deferred)
//});
fetch(fileUrl, {
mode: 'no-cors'
var xhr = new XMLHttpRequest();
xhr.open('GET', fileUrl, true);
}).then(function (response) {
xhr.onload = function(e) {
successFn(this.response);
};
return response.text();
}).then(successFn);
xhr.send();
return deferred.promise();
},