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 keyframe setting

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-12 01:49:03 -05:00
parent 79fa61fa33
commit a75e37be73
18 changed files with 53 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/addplugin.html
View file

@ -4,7 +4,7 @@
<title>${TitlePlugins}</title> <title>${TitlePlugins}</title>
</head> </head>
<body> <body>
<div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="scripts/registrationservices,scripts/ratingdialog,scripts/addpluginpage"> <div id="addPluginPage" data-role="page" class="page type-interior pluginConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Plugins" data-require="registrationservices,scripts/ratingdialog,scripts/addpluginpage">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">

2
dashboard-ui/apiclient/apiclient.js
View file

@ -230,7 +230,7 @@
resolve(response); resolve(response);
}, function (error) { }, function (error) {
clearTimeout(timeout); clearTimeout(timeout);
throw error; reject();
}); });
}); });
} }

2
dashboard-ui/apiclient/connectionmanager.js
View file

@ -140,7 +140,7 @@
logger.log('fetchWithTimeout: timed out connecting to url: ' + url); logger.log('fetchWithTimeout: timed out connecting to url: ' + url);
throw error; reject();
}); });
}); });
} }

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View file

@ -29,14 +29,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-behaviors", "homepage": "https://github.com/polymerelements/iron-behaviors",
"_release": "1.0.12", "_release": "1.0.12",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.12", "tag": "v1.0.12",
"commit": "657f526a2382a659cdf4e13be87ecc89261588a3" "commit": "657f526a2382a659cdf4e13be87ecc89261588a3"
}, },
"_source": "git://github.com/PolymerElements/iron-behaviors.git", "_source": "git://github.com/polymerelements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-behaviors" "_originalSource": "polymerelements/iron-behaviors"
} }

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

4
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View file

@ -36,7 +36,7 @@
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff"
}, },
"_source": "git://github.com/PolymerElements/iron-selector.git", "_source": "git://github.com/polymerelements/iron-selector.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-selector" "_originalSource": "polymerelements/iron-selector"
} }

4
dashboard-ui/bower_components/paper-material/.bower.json vendored
View file

@ -37,7 +37,7 @@
"tag": "v1.0.4", "tag": "v1.0.4",
"commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8" "commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8"
}, },
"_source": "git://github.com/polymerelements/paper-material.git", "_source": "git://github.com/PolymerElements/paper-material.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-material" "_originalSource": "PolymerElements/paper-material"
} }

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/paper-ripple", "homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/polymerelements/paper-ripple.git", "_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple" "_originalSource": "PolymerElements/paper-ripple"
} }

12
dashboard-ui/metadataadvanced.html
View file

@ -143,18 +143,6 @@
</div> </div>
</div> </div>
<div data-role="collapsible" style="display:none;">
<h2>${HeaderVideos}</h2>
<div>
<div>
<br />
<paper-checkbox class="chkEnableVideoFrameAnalysis">${OptionEnableVideoFrameAnalysis}</paper-checkbox>
<div class="fieldDescription paperCheckboxFieldDescription">${OptionEnableVideoFrameAnalysisHelp}</div>
</div>
<br />
</div>
</div>
<br /><br /> <br /><br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>

16
dashboard-ui/scripts/chromecast.js
View file

@ -811,13 +811,11 @@
self.getPlayerState = function () { self.getPlayerState = function () {
var deferred = $.Deferred(); return new Promise(function (resolve, reject) {
var result = self.getPlayerStateInternal(); var result = self.getPlayerStateInternal();
resolve(result);
deferred.resolveWith(null, [result]); });
return deferred.promise();
}; };
self.lastPlayerData = {}; self.lastPlayerData = {};
@ -833,9 +831,9 @@
self.tryPair = function (target) { self.tryPair = function (target) {
var deferred = $.Deferred(); return new Promise(function (resolve, reject) {
deferred.resolve(); resolve();
return deferred.promise(); });
}; };
} }

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

@ -30,11 +30,15 @@
var requestUrl = url + "?v=" + AppInfo.appVersion; var requestUrl = url + "?v=" + AppInfo.appVersion;
Logger.log('Requesting ' + requestUrl);
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.open('GET', requestUrl, true); xhr.open('GET', requestUrl, true);
xhr.onload = function (e) { xhr.onload = function (e) {
Logger.log('Globalize response status: ' + this.status);
if (this.status < 400) { if (this.status < 400) {
dictionaries[url] = JSON.parse(this.response); dictionaries[url] = JSON.parse(this.response);

2
dashboard-ui/scripts/livetvsuggested.js
View file

@ -152,7 +152,7 @@
initMethod = 'initSuggestedTab'; initMethod = 'initSuggestedTab';
break; break;
case 1: case 1:
depends.push('scripts/registrationservices'); depends.push('registrationservices');
depends.push('scripts/livetvguide'); depends.push('scripts/livetvguide');
renderMethod = 'renderGuideTab'; renderMethod = 'renderGuideTab';
initMethod = 'initGuideTab'; initMethod = 'initGuideTab';

2
dashboard-ui/scripts/mediacontroller.js
View file

@ -469,7 +469,7 @@
return; return;
} }
requirejs(["scripts/registrationservices"], function () { requirejs(["registrationservices"], function () {
self.playbackTimeLimitMs = null; self.playbackTimeLimitMs = null;

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

@ -201,6 +201,14 @@
profile.TranscodingProfiles = []; profile.TranscodingProfiles = [];
//profile.TranscodingProfiles.push({
// Container: 'mkv',
// Type: 'Video',
// AudioCodec: 'aac' + (canPlayAc3 ? ',ac3' : ''),
// VideoCodec: 'h264',
// Context: 'Streaming'
//});
if (self.canPlayHls()) { if (self.canPlayHls()) {
profile.TranscodingProfiles.push({ profile.TranscodingProfiles.push({
Container: 'ts', Container: 'ts',

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

@ -14,8 +14,6 @@
$('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh"); $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh");
$('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh"); $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh");
$('.chkEnableVideoFrameAnalysis', page).checked(config.EnableVideoFrameByFrameAnalysis);
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
@ -174,8 +172,6 @@
config.SaveMetadataHidden = $('#chkSaveMetadataHidden', form).checked(); config.SaveMetadataHidden = $('#chkSaveMetadataHidden', form).checked();
config.EnableVideoFrameByFrameAnalysis = $('.chkEnableVideoFrameAnalysis', form).checked();
config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked();
config.EnableTmdbUpdates = $('#chkEnableTmdbUpdates', form).checked(); config.EnableTmdbUpdates = $('#chkEnableTmdbUpdates', form).checked();
config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked(); config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked();

22
dashboard-ui/scripts/site.js
View file

@ -1867,6 +1867,13 @@ var AppInfo = {};
define('fetch', [bowerPath + '/fetch/fetch']); define('fetch', [bowerPath + '/fetch/fetch']);
define('webcomponentsjs', [bowerPath + '/webcomponentsjs/webcomponents-lite.min.js']); define('webcomponentsjs', [bowerPath + '/webcomponentsjs/webcomponents-lite.min.js']);
define('native-promise-only', [bowerPath + '/native-promise-only/lib/npo.src']); define('native-promise-only', [bowerPath + '/native-promise-only/lib/npo.src']);
if (Dashboard.isRunningInCordova()) {
define('registrationservices', ['cordova/registrationservices']);
} else {
define('registrationservices', ['scripts/registrationservices']);
}
} }
function init(hostingAppInfo) { function init(hostingAppInfo) {
@ -2145,25 +2152,19 @@ var AppInfo = {};
} }
if (Dashboard.isRunningInCordova()) { if (Dashboard.isRunningInCordova()) {
deps.push('cordova/registrationservices'); deps.push('registrationservices');
deps.push('cordova/back'); deps.push('cordova/back');
if (browserInfo.android) { if (browserInfo.android) {
deps.push('cordova/android/androidcredentials'); deps.push('cordova/android/androidcredentials');
} }
} else {
deps.push('scripts/registrationservices');
} }
if (browserInfo.msie) { if (browserInfo.msie) {
deps.push('devices/ie/ie'); deps.push('devices/ie/ie');
} }
if (AppInfo.isNativeApp && browserInfo.safari) {
deps.push('cordova/ios/tabbar');
}
deps.push('scripts/search'); deps.push('scripts/search');
deps.push('scripts/librarylist'); deps.push('scripts/librarylist');
deps.push('scripts/alphapicker'); deps.push('scripts/alphapicker');
@ -2223,6 +2224,11 @@ var AppInfo = {};
postInitDependencies.push('scripts/nowplayingbar'); postInitDependencies.push('scripts/nowplayingbar');
} }
if (AppInfo.isNativeApp && browserInfo.safari) {
postInitDependencies.push('cordova/ios/tabbar');
}
require(postInitDependencies); require(postInitDependencies);
}); });
} }

2
dashboard-ui/scripts/sync.js
View file

@ -203,7 +203,7 @@
function showSyncMenu(options) { function showSyncMenu(options) {
requirejs(["scripts/registrationservices"], function () { requirejs(["registrationservices"], function () {
RegistrationServices.validateFeature('sync').then(function () { RegistrationServices.validateFeature('sync').then(function () {
showSyncMenuInternal(options); showSyncMenuInternal(options);
}); });

2
dashboard-ui/scripts/syncactivity.js
View file

@ -388,7 +388,7 @@
$('.btnSyncSupporter', page).on('click', function () { $('.btnSyncSupporter', page).on('click', function () {
requirejs(["scripts/registrationservices"], function () { requirejs(["registrationservices"], function () {
RegistrationServices.validateFeature('sync').then(function () { RegistrationServices.validateFeature('sync').then(function () {
}); });
}); });