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

add subtitle fix for tizen

This commit is contained in:
Luke Pulverenti 2016-11-17 22:12:03 -05:00
parent 220c6197b6
commit 374a543064
14 changed files with 44 additions and 129 deletions

View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.338",
"_release": "1.4.338",
"version": "1.4.339",
"_release": "1.4.339",
"_resolution": {
"type": "version",
"tag": "1.4.338",
"commit": "89d5917a0c6425e6f07868b92c9cabb04dcd0139"
"tag": "1.4.339",
"commit": "57c814e242079d68032820513d52174cc1051e32"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

View file

@ -133,7 +133,6 @@ button {
background-size: contain;
background-repeat: no-repeat;
background-position: center center;
display: -ms-flex;
display: -webkit-flex;
display: flex;
align-items: center;

View file

@ -14,7 +14,6 @@
.indicator {
border-radius: 500px;
display: -ms-flex;
display: -webkit-flex;
display: flex;
align-items: center;
@ -45,7 +44,6 @@
.countIndicator {
background: rgba(82,181,75,1);
border-radius: 500px;
display: -ms-flex;
display: -webkit-flex;
display: flex;
align-items: center;
@ -57,7 +55,6 @@
.playedIndicator {
background: rgba(82,181,75,1);
border-radius: 500px;
display: -ms-flex;
display: -webkit-flex;
display: flex;
align-items: center;

View file

@ -5,7 +5,7 @@
(function UMD(name,context,definition){
// special form of UMD for polyfilling across evironments
context[name] = context[name] || definition();
context[name] = definition();
if (typeof module != "undefined" && module.exports) { module.exports = context[name]; }
else if (typeof define == "function" && define.amd) { define(function $AMD$(){ return context[name]; }); }
})("Promise",typeof global != "undefined" ? global : this,function DEF(){

View file

@ -11,12 +11,12 @@
"test/"
],
"homepage": "https://github.com/github/fetch",
"version": "1.1.0",
"_release": "1.1.0",
"version": "1.1.1",
"_release": "1.1.1",
"_resolution": {
"type": "version",
"tag": "v1.1.0",
"commit": "76f6a09cbfc1c955479dd9da2a333f7404c79de2"
"tag": "v1.1.1",
"commit": "f7a514829820fc77c0f884c74cf2d36356a781c0"
},
"_source": "https://github.com/github/fetch.git",
"_target": "^1.0.0",

View file

@ -186,6 +186,16 @@
return promise
}
function readArrayBufferAsText(buf) {
var view = new Uint8Array(buf)
var chars = new Array(view.length)
for (var i = 0; i < view.length; i++) {
chars[i] = String.fromCharCode(view[i])
}
return chars.join('')
}
function bufferClone(buf) {
if (buf.slice) {
return buf.slice(0)
@ -249,6 +259,14 @@
return Promise.resolve(new Blob([this._bodyText]))
}
}
this.arrayBuffer = function() {
if (this._bodyArrayBuffer) {
return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
} else {
return this.blob().then(readBlobAsArrayBuffer)
}
}
}
this.text = function() {
@ -260,9 +278,7 @@
if (this._bodyBlob) {
return readBlobAsText(this._bodyBlob)
} else if (this._bodyArrayBuffer) {
var view = new Uint8Array(this._bodyArrayBuffer)
var str = String.fromCharCode.apply(null, view)
return Promise.resolve(str)
return Promise.resolve(readArrayBufferAsText(this._bodyArrayBuffer))
} else if (this._bodyFormData) {
throw new Error('could not read FormData body as text')
} else {
@ -270,16 +286,6 @@
}
}
if (support.arrayBuffer) {
this.arrayBuffer = function() {
if (this._bodyArrayBuffer) {
return consumed(this) || Promise.resolve(this._bodyArrayBuffer)
} else {
return this.blob().then(readBlobAsArrayBuffer)
}
}
}
if (support.formData) {
this.formData = function() {
return this.text().then(decode)

View file

@ -1,15 +0,0 @@
{
"name": "native-promise-only",
"homepage": "https://github.com/getify/native-promise-only",
"version": "0.8.0-a",
"_release": "0.8.0-a",
"_resolution": {
"type": "version",
"tag": "0.8.0-a",
"commit": "d40a2d0197feea4f9b0bf5f8bf3079465ced3758"
},
"_source": "git://github.com/getify/native-promise-only.git",
"_target": "~0.8.0-a",
"_originalSource": "native-promise-only",
"_direct": true
}

View file

@ -1,2 +0,0 @@
node_modules
npo.js

View file

@ -1,2 +0,0 @@
node_modules
.gitignore

View file

@ -1,34 +0,0 @@
#!/usr/bin/env node
var fs = require("fs"),
path = require("path"),
exec = require("child_process").exec,
ugly = require("uglify-js"),
result
;
console.log("*** Building ***");
console.log("Minifying to npo.js.");
try {
result = ugly.minify(path.join(__dirname,"lib","npo.src.js"),{
mangle: true,
compress: true,
output: {
comments: /^!/
}
});
fs.writeFileSync(
path.join(__dirname,"npo.js"),
result.code + "\n",
{ encoding: "utf8" }
);
console.log("Complete.");
}
catch (err) {
console.error(err);
process.exit(1);
}

View file

@ -1,31 +0,0 @@
{
"name": "native-promise-only",
"version": "0.8.0-a",
"description": "Native Promise Only: A polyfill for native ES6 Promises **only**, nothing else.",
"main": "./npo.js",
"scripts": {
"test": "promises-aplus-tests test_adapter.js",
"build": "./build.js"
},
"devDependencies": {
"promises-aplus-tests": "*",
"uglify-js": "~2.4.8"
},
"repository": {
"type": "git",
"url": "git://github.com/getify/native-promise-only.git"
},
"keywords": [
"ES6",
"Promise",
"async",
"promises-aplus"
],
"bugs": {
"url": "https://github.com/getify/native-promise-only/issues",
"email": "getify@gmail.com"
},
"homepage": "http://github.com/getify/native-promise-only",
"author": "Kyle Simpson <getify@gmail.com>",
"license": "MIT"
}

View file

@ -295,7 +295,7 @@
getThumbShape();
var supportsImageAnalysis = appHost.supports('imageanalysis');
var cardLayout = supportsImageAnalysis && (viewType === 'music' || !viewType);
var cardLayout = supportsImageAnalysis && (viewType === 'music' || viewType === 'movies' || viewType === 'tvshows' || !viewType);
html += cardBuilder.getCardsHtml({
items: items,
@ -309,9 +309,12 @@
overlayPlayButton: viewType !== 'photos',
allowBottomPadding: !enableScrollX() && !cardLayout,
cardLayout: cardLayout,
showTitle: viewType === 'music' || !viewType,
showParentTitle: viewType === 'music' || !viewType,
vibrant: supportsImageAnalysis && cardLayout
showTitle: viewType === 'music' || !viewType || (cardLayout && (viewType === 'movies' || viewType === 'tvshows')),
showYear: cardLayout && viewType === 'movies',
showSeriesYear: cardLayout && viewType === 'tvshows',
showParentTitle: viewType === 'music' || !viewType || (cardLayout && (viewType === 'tvshows')),
vibrant: supportsImageAnalysis && cardLayout,
lines: 2
});
html += '</div>';
}

View file

@ -1368,7 +1368,6 @@ var AppInfo = {};
define('arraypolyfills', [embyWebComponentsBowerPath + '/polyfills/array']);
define('objectassign', [embyWebComponentsBowerPath + '/polyfills/objectassign']);
define('native-promise-only', [bowerPath + '/native-promise-only/lib/npo.src']);
define("clearButtonStyle", ['css!' + embyWebComponentsBowerPath + '/clearbutton']);
define("userdataButtons", [embyWebComponentsBowerPath + "/userdatabuttons/userdatabuttons"], returnFirstDependency);
define("listView", [embyWebComponentsBowerPath + "/listview/listview"], returnFirstDependency);
@ -2792,29 +2791,24 @@ var AppInfo = {};
initRequire();
function onWebComponentsReady() {
function onWebComponentsReady(browser) {
var initialDependencies = [];
initialDependencies.push('browser');
if (!window.Promise) {
initialDependencies.push('native-promise-only');
if (!window.Promise || browser.web0s) {
initialDependencies.push('bower_components/emby-webcomponents/native-promise-only/lib/npo.src');
}
require(initialDependencies, function (browser) {
initRequireWithBrowser(browser);
window.browserInfo = browser;
setAppInfo();
setDocumentClasses(browser);
init();
});
require(initialDependencies, init);
}
onWebComponentsReady();
require(['browser'], onWebComponentsReady);
})();
function pageClassOn(eventName, className, fn) {