From a75e37be7376a93c8809e59fc20ed35af3d32eeb Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sat, 12 Dec 2015 01:49:03 -0500 Subject: [PATCH] update keyframe setting --- dashboard-ui/addplugin.html | 2 +- dashboard-ui/apiclient/apiclient.js | 2 +- dashboard-ui/apiclient/connectionmanager.js | 2 +- .../iron-behaviors/.bower.json | 6 ++--- .../bower_components/iron-meta/.bower.json | 6 ++--- .../iron-selector/.bower.json | 4 ++-- .../paper-material/.bower.json | 4 ++-- .../bower_components/paper-ripple/.bower.json | 6 ++--- dashboard-ui/metadataadvanced.html | 12 ---------- dashboard-ui/scripts/chromecast.js | 16 ++++++-------- dashboard-ui/scripts/globalize.js | 4 ++++ dashboard-ui/scripts/livetvsuggested.js | 2 +- dashboard-ui/scripts/mediacontroller.js | 2 +- dashboard-ui/scripts/mediaplayer.js | 8 +++++++ dashboard-ui/scripts/metadataadvanced.js | 4 ---- dashboard-ui/scripts/site.js | 22 ++++++++++++------- dashboard-ui/scripts/sync.js | 2 +- dashboard-ui/scripts/syncactivity.js | 2 +- 18 files changed, 53 insertions(+), 53 deletions(-) diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html index 6d2650212..bbcefe455 100644 --- a/dashboard-ui/addplugin.html +++ b/dashboard-ui/addplugin.html @@ -4,7 +4,7 @@ ${TitlePlugins} -
+
diff --git a/dashboard-ui/apiclient/apiclient.js b/dashboard-ui/apiclient/apiclient.js index f9d79e38a..e5dd53f13 100644 --- a/dashboard-ui/apiclient/apiclient.js +++ b/dashboard-ui/apiclient/apiclient.js @@ -230,7 +230,7 @@ resolve(response); }, function (error) { clearTimeout(timeout); - throw error; + reject(); }); }); } diff --git a/dashboard-ui/apiclient/connectionmanager.js b/dashboard-ui/apiclient/connectionmanager.js index f1fd5d594..d1fbba968 100644 --- a/dashboard-ui/apiclient/connectionmanager.js +++ b/dashboard-ui/apiclient/connectionmanager.js @@ -140,7 +140,7 @@ logger.log('fetchWithTimeout: timed out connecting to url: ' + url); - throw error; + reject(); }); }); } diff --git a/dashboard-ui/bower_components/iron-behaviors/.bower.json b/dashboard-ui/bower_components/iron-behaviors/.bower.json index db08f2170..17f68b335 100644 --- a/dashboard-ui/bower_components/iron-behaviors/.bower.json +++ b/dashboard-ui/bower_components/iron-behaviors/.bower.json @@ -29,14 +29,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "ignore": [], - "homepage": "https://github.com/PolymerElements/iron-behaviors", + "homepage": "https://github.com/polymerelements/iron-behaviors", "_release": "1.0.12", "_resolution": { "type": "version", "tag": "v1.0.12", "commit": "657f526a2382a659cdf4e13be87ecc89261588a3" }, - "_source": "git://github.com/PolymerElements/iron-behaviors.git", + "_source": "git://github.com/polymerelements/iron-behaviors.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-behaviors" + "_originalSource": "polymerelements/iron-behaviors" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index f4bfef4a7..e1304d174 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -26,14 +26,14 @@ "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, "main": "iron-meta.html", - "homepage": "https://github.com/polymerelements/iron-meta", + "homepage": "https://github.com/PolymerElements/iron-meta", "_release": "1.1.1", "_resolution": { "type": "version", "tag": "v1.1.1", "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" }, - "_source": "git://github.com/polymerelements/iron-meta.git", + "_source": "git://github.com/PolymerElements/iron-meta.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/iron-meta" + "_originalSource": "PolymerElements/iron-meta" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json index 52d44c190..ebb18c5b7 100644 --- a/dashboard-ui/bower_components/iron-selector/.bower.json +++ b/dashboard-ui/bower_components/iron-selector/.bower.json @@ -36,7 +36,7 @@ "tag": "v1.0.8", "commit": "e9a66727f3da0446f04956d4e4f1dcd51cdec2ff" }, - "_source": "git://github.com/PolymerElements/iron-selector.git", + "_source": "git://github.com/polymerelements/iron-selector.git", "_target": "^1.0.0", - "_originalSource": "PolymerElements/iron-selector" + "_originalSource": "polymerelements/iron-selector" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-material/.bower.json b/dashboard-ui/bower_components/paper-material/.bower.json index af7e84675..b60239473 100644 --- a/dashboard-ui/bower_components/paper-material/.bower.json +++ b/dashboard-ui/bower_components/paper-material/.bower.json @@ -37,7 +37,7 @@ "tag": "v1.0.4", "commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8" }, - "_source": "git://github.com/polymerelements/paper-material.git", + "_source": "git://github.com/PolymerElements/paper-material.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-material" + "_originalSource": "PolymerElements/paper-material" } \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index 2f654d71c..157225ee7 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -32,14 +32,14 @@ "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" }, "ignore": [], - "homepage": "https://github.com/polymerelements/paper-ripple", + "homepage": "https://github.com/PolymerElements/paper-ripple", "_release": "1.0.5", "_resolution": { "type": "version", "tag": "v1.0.5", "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" }, - "_source": "git://github.com/polymerelements/paper-ripple.git", + "_source": "git://github.com/PolymerElements/paper-ripple.git", "_target": "^1.0.0", - "_originalSource": "polymerelements/paper-ripple" + "_originalSource": "PolymerElements/paper-ripple" } \ No newline at end of file diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html index eadd5999b..b082ff233 100644 --- a/dashboard-ui/metadataadvanced.html +++ b/dashboard-ui/metadataadvanced.html @@ -143,18 +143,6 @@
-
-

${HeaderVideos}

-
-
-
- ${OptionEnableVideoFrameAnalysis} -
${OptionEnableVideoFrameAnalysisHelp}
-
-
-
-
-

  • diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js index b93bc47cd..3335ef8e7 100644 --- a/dashboard-ui/scripts/chromecast.js +++ b/dashboard-ui/scripts/chromecast.js @@ -811,13 +811,11 @@ self.getPlayerState = function () { - var deferred = $.Deferred(); + return new Promise(function (resolve, reject) { - var result = self.getPlayerStateInternal(); - - deferred.resolveWith(null, [result]); - - return deferred.promise(); + var result = self.getPlayerStateInternal(); + resolve(result); + }); }; self.lastPlayerData = {}; @@ -833,9 +831,9 @@ self.tryPair = function (target) { - var deferred = $.Deferred(); - deferred.resolve(); - return deferred.promise(); + return new Promise(function (resolve, reject) { + resolve(); + }); }; } diff --git a/dashboard-ui/scripts/globalize.js b/dashboard-ui/scripts/globalize.js index edc2ac491..8663d0d31 100644 --- a/dashboard-ui/scripts/globalize.js +++ b/dashboard-ui/scripts/globalize.js @@ -30,11 +30,15 @@ var requestUrl = url + "?v=" + AppInfo.appVersion; + Logger.log('Requesting ' + requestUrl); + var xhr = new XMLHttpRequest(); xhr.open('GET', requestUrl, true); xhr.onload = function (e) { + Logger.log('Globalize response status: ' + this.status); + if (this.status < 400) { dictionaries[url] = JSON.parse(this.response); diff --git a/dashboard-ui/scripts/livetvsuggested.js b/dashboard-ui/scripts/livetvsuggested.js index 0a5195030..d0816a26a 100644 --- a/dashboard-ui/scripts/livetvsuggested.js +++ b/dashboard-ui/scripts/livetvsuggested.js @@ -152,7 +152,7 @@ initMethod = 'initSuggestedTab'; break; case 1: - depends.push('scripts/registrationservices'); + depends.push('registrationservices'); depends.push('scripts/livetvguide'); renderMethod = 'renderGuideTab'; initMethod = 'initGuideTab'; diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index 76cc3469b..83c86291f 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -469,7 +469,7 @@ return; } - requirejs(["scripts/registrationservices"], function () { + requirejs(["registrationservices"], function () { self.playbackTimeLimitMs = null; diff --git a/dashboard-ui/scripts/mediaplayer.js b/dashboard-ui/scripts/mediaplayer.js index 5bb265e0f..a243f96dc 100644 --- a/dashboard-ui/scripts/mediaplayer.js +++ b/dashboard-ui/scripts/mediaplayer.js @@ -201,6 +201,14 @@ profile.TranscodingProfiles = []; + //profile.TranscodingProfiles.push({ + // Container: 'mkv', + // Type: 'Video', + // AudioCodec: 'aac' + (canPlayAc3 ? ',ac3' : ''), + // VideoCodec: 'h264', + // Context: 'Streaming' + //}); + if (self.canPlayHls()) { profile.TranscodingProfiles.push({ Container: 'ts', diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js index 249b5db28..e61725e01 100644 --- a/dashboard-ui/scripts/metadataadvanced.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -14,8 +14,6 @@ $('#chkPeopleOthers', page).checked(config.PeopleMetadataOptions.DownloadOtherPeopleMetadata).checkboxradio("refresh"); $('#chkPeopleGuestStars', page).checked(config.PeopleMetadataOptions.DownloadGuestStarMetadata).checkboxradio("refresh"); - $('.chkEnableVideoFrameAnalysis', page).checked(config.EnableVideoFrameByFrameAnalysis); - Dashboard.hideLoadingMsg(); } @@ -174,8 +172,6 @@ config.SaveMetadataHidden = $('#chkSaveMetadataHidden', form).checked(); - config.EnableVideoFrameByFrameAnalysis = $('.chkEnableVideoFrameAnalysis', form).checked(); - config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); config.EnableTmdbUpdates = $('#chkEnableTmdbUpdates', form).checked(); config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked(); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index b625c117e..c43f044e0 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1867,6 +1867,13 @@ var AppInfo = {}; define('fetch', [bowerPath + '/fetch/fetch']); define('webcomponentsjs', [bowerPath + '/webcomponentsjs/webcomponents-lite.min.js']); 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) { @@ -2145,25 +2152,19 @@ var AppInfo = {}; } if (Dashboard.isRunningInCordova()) { - deps.push('cordova/registrationservices'); + deps.push('registrationservices'); + deps.push('cordova/back'); if (browserInfo.android) { deps.push('cordova/android/androidcredentials'); } - } else { - deps.push('scripts/registrationservices'); } if (browserInfo.msie) { deps.push('devices/ie/ie'); } - if (AppInfo.isNativeApp && browserInfo.safari) { - - deps.push('cordova/ios/tabbar'); - } - deps.push('scripts/search'); deps.push('scripts/librarylist'); deps.push('scripts/alphapicker'); @@ -2223,6 +2224,11 @@ var AppInfo = {}; postInitDependencies.push('scripts/nowplayingbar'); } + if (AppInfo.isNativeApp && browserInfo.safari) { + + postInitDependencies.push('cordova/ios/tabbar'); + } + require(postInitDependencies); }); } diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index 449a610e0..0203ff483 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -203,7 +203,7 @@ function showSyncMenu(options) { - requirejs(["scripts/registrationservices"], function () { + requirejs(["registrationservices"], function () { RegistrationServices.validateFeature('sync').then(function () { showSyncMenuInternal(options); }); diff --git a/dashboard-ui/scripts/syncactivity.js b/dashboard-ui/scripts/syncactivity.js index 199c1d8d2..9699da4a9 100644 --- a/dashboard-ui/scripts/syncactivity.js +++ b/dashboard-ui/scripts/syncactivity.js @@ -388,7 +388,7 @@ $('.btnSyncSupporter', page).on('click', function () { - requirejs(["scripts/registrationservices"], function () { + requirejs(["registrationservices"], function () { RegistrationServices.validateFeature('sync').then(function () { }); });