cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update ffmpeg

Browse Source
This commit is contained in:
Luke Pulverenti 2016-04-02 00:16:18 -04:00
parent 37e35b51d2
commit 90f0116bf8
3 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dashboard-ui/metadatasubtitles.html
View File

@ -33,7 +33,7 @@
<div class="fieldDescription paperCheckboxFieldDescription">${LabelSkipIfGraphicalSubsPresentHelp}</div> <div class="fieldDescription paperCheckboxFieldDescription">${LabelSkipIfGraphicalSubsPresentHelp}</div>
</li> </li>
<li> <li>
<paper-input type="text" id="txtOpenSubtitleUsername" autocomplete="off" required label="${LabelOpenSubtitlesUsername}"></paper-input> <paper-input type="text" id="txtOpenSubtitleUsername" autocomplete="off" label="${LabelOpenSubtitlesUsername}"></paper-input>
<div class="fieldDescription"><a target="_blank" href="http://www.opensubtitles.org/">${ButtonRegister}</a></div> <div class="fieldDescription"><a target="_blank" href="http://www.opensubtitles.org/">${ButtonRegister}</a></div>
</li> </li>
<li> <li>

16
dashboard-ui/scripts/search.js
View File

@ -158,6 +158,8 @@
document.body.appendChild(div); document.body.appendChild(div);
libraryBrowser.createCardMenus(div); libraryBrowser.createCardMenus(div);
elem = div;
} }
return elem; return elem;
@ -203,7 +205,10 @@
{ opacity: '0', offset: 0 }, { opacity: '0', offset: 0 },
{ opacity: '1', offset: 1 }]; { opacity: '1', offset: 1 }];
var timing = { duration: 200, iterations: iterations, fill: 'both' }; var timing = { duration: 200, iterations: iterations, fill: 'both' };
elem.animate(keyframes, timing);
if (elem.animate) {
elem.animate(keyframes, timing);
}
} }
function fadeOut(elem, iterations) { function fadeOut(elem, iterations) {
@ -211,9 +216,16 @@
{ opacity: '1', offset: 0 }, { opacity: '1', offset: 0 },
{ opacity: '0', offset: 1 }]; { opacity: '0', offset: 1 }];
var timing = { duration: 600, iterations: iterations, fill: 'both' }; var timing = { duration: 600, iterations: iterations, fill: 'both' };
elem.animate(keyframes, timing).onfinish = function () {
var onfinish = function () {
elem.parentNode.removeChild(elem); elem.parentNode.removeChild(elem);
}; };
if (elem.animate) {
elem.animate(keyframes, timing).onfinish = onfinish;
} else {
onfinish();
}
} }
function bindSearchEvents() { function bindSearchEvents() {

35
dashboard-ui/scripts/site.js
View File

@ -3127,7 +3127,7 @@ var AppInfo = {};
if (browserInfo.safari) { if (browserInfo.safari) {
postInitDependencies.push('cordova/connectsdk/connectsdk'); postInitDependencies.push('cordova/ios/chromecast');
postInitDependencies.push('cordova/ios/orientation'); postInitDependencies.push('cordova/ios/orientation');
@ -3170,22 +3170,31 @@ var AppInfo = {};
cordova.getAppVersion.getVersionNumber(function (appVersion) { cordova.getAppVersion.getVersionNumber(function (appVersion) {
var name = browserInfo.android ? "Emby for Android Mobile" : (browserInfo.safari ? "Emby for iOS" : "Emby Mobile"); require(['appStorage'], function (appStorage) {
// Remove special characters var name = browserInfo.android ? "Emby for Android Mobile" : (browserInfo.safari ? "Emby for iOS" : "Emby Mobile");
var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
var deviceId = null; // Remove special characters
var cleanDeviceName = device.model.replace(/[^\w\s]/gi, '');
if (window.MainActivity) { var deviceId = null;
deviceId = MainActivity.getLegacyDeviceId();
}
resolve({ if (window.MainActivity) {
deviceId: deviceId || device.uuid,
deviceName: cleanDeviceName, deviceId = appStorage.getItem('legacyDeviceId');
appName: name,
appVersion: appVersion if (!deviceId) {
deviceId = MainActivity.getLegacyDeviceId();
appStorage.setItem('legacyDeviceId', deviceId);
}
}
resolve({
deviceId: deviceId || device.uuid,
deviceName: cleanDeviceName,
appName: name,
appVersion: appVersion
});
}); });
}); });