diff --git a/dashboard-ui/bower_components/emby-apiclient/.bower.json b/dashboard-ui/bower_components/emby-apiclient/.bower.json index 3b3a51426b..1a3df41565 100644 --- a/dashboard-ui/bower_components/emby-apiclient/.bower.json +++ b/dashboard-ui/bower_components/emby-apiclient/.bower.json @@ -16,12 +16,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.1.106", - "_release": "1.1.106", + "version": "1.1.107", + "_release": "1.1.107", "_resolution": { "type": "version", - "tag": "1.1.106", - "commit": "2bed46ebe6ee1e213b5f89476ca8c285937ba343" + "tag": "1.1.107", + "commit": "82a9be9ffc4359043cbbae83031491dc4d2182cc" }, "_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git", "_target": "^1.1.51", diff --git a/dashboard-ui/bower_components/emby-apiclient/cameraroll.js b/dashboard-ui/bower_components/emby-apiclient/cameraroll.js new file mode 100644 index 0000000000..ce730450b0 --- /dev/null +++ b/dashboard-ui/bower_components/emby-apiclient/cameraroll.js @@ -0,0 +1,15 @@ +define([], function () { + 'use strict'; + + function CameraRoll() { + + } + + CameraRoll.prototype.getFiles = function () { + + return Promise.resolve([]); + }; + + return new CameraRoll(); + +}); \ No newline at end of file diff --git a/dashboard-ui/bower_components/emby-apiclient/localassetmanager.js b/dashboard-ui/bower_components/emby-apiclient/localassetmanager.js index bafee75229..60c1a9cf5f 100644 --- a/dashboard-ui/bower_components/emby-apiclient/localassetmanager.js +++ b/dashboard-ui/bower_components/emby-apiclient/localassetmanager.js @@ -23,11 +23,6 @@ return userrepository.remove(id); } - //TODO: - function getCameraPhotos() { - return Promise.resolve([]); - } - function recordUserAction(action) { action.Id = createGuid(); @@ -454,7 +449,6 @@ getLocalItem: getLocalItem, saveOfflineUser: saveOfflineUser, deleteOfflineUser: deleteOfflineUser, - getCameraPhotos: getCameraPhotos, recordUserAction: recordUserAction, getUserActions: getUserActions, deleteUserAction: deleteUserAction, diff --git a/dashboard-ui/bower_components/emby-apiclient/nullassetmanager.js b/dashboard-ui/bower_components/emby-apiclient/nullassetmanager.js index 9420639f40..f7e783f735 100644 --- a/dashboard-ui/bower_components/emby-apiclient/nullassetmanager.js +++ b/dashboard-ui/bower_components/emby-apiclient/nullassetmanager.js @@ -17,10 +17,6 @@ return Promise.resolve(); } - function getCameraPhotos() { - return Promise.resolve([]); - } - function recordUserAction(action) { return Promise.resolve(); } @@ -110,7 +106,6 @@ getLocalItem: getLocalItem, saveOfflineUser: saveOfflineUser, deleteOfflineUser: deleteOfflineUser, - getCameraPhotos: getCameraPhotos, recordUserAction: recordUserAction, getUserActions: getUserActions, deleteUserAction: deleteUserAction, diff --git a/dashboard-ui/bower_components/emby-apiclient/sync/contentuploader.js b/dashboard-ui/bower_components/emby-apiclient/sync/contentuploader.js index b3c423e93b..fcb4fbd0d9 100644 --- a/dashboard-ui/bower_components/emby-apiclient/sync/contentuploader.js +++ b/dashboard-ui/bower_components/emby-apiclient/sync/contentuploader.js @@ -1,4 +1,4 @@ -define(['localassetmanager'], function (localAssetManager) { +define(['localassetmanager', 'cameraRoll'], function (localAssetManager, cameraRoll) { 'use strict'; return function (connectionManager) { @@ -7,7 +7,7 @@ self.uploadImages = function (server) { - return LocalAssetManager.getCameraPhotos().then(function (photos) { + return cameraRoll.getFiles().then(function (photos) { if (!photos.length) { return Promise.resolve(); diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json index f15d36ada6..43c84e47cf 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json +++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json @@ -14,12 +14,12 @@ }, "devDependencies": {}, "ignore": [], - "version": "1.4.405", - "_release": "1.4.405", + "version": "1.4.406", + "_release": "1.4.406", "_resolution": { "type": "version", - "tag": "1.4.405", - "commit": "6745a06a14f978824ceaf9cebdb07f8bca2677e1" + "tag": "1.4.406", + "commit": "5ef7b315244a1804f2892269a42db94a52a86ea8" }, "_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_target": "^1.2.1", diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js b/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js index 2a80fe5425..4ac9979c8f 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js +++ b/dashboard-ui/bower_components/emby-webcomponents/emby-connect/connecthelper.js @@ -42,7 +42,7 @@ define(['globalize', 'loading', 'alert'], function (globalize, loading, alert) { loading.hide(); - if (response.status == 404) { + if (response.status === 404) { // User doesn't exist alert({ text: globalize.translate('GuestUserNotFound') @@ -138,7 +138,7 @@ define(['globalize', 'loading', 'alert'], function (globalize, loading, alert) { }); } - else if (currentConnectUsername != enteredConnectUsername) { + else if (currentConnectUsername !== enteredConnectUsername) { // Add/Update connect info return apiClient.ajax({ diff --git a/dashboard-ui/bower_components/emby-webcomponents/sync/syncjoblist.js b/dashboard-ui/bower_components/emby-webcomponents/sync/syncjoblist.js index 1b86c4f463..3ed7b77881 100644 --- a/dashboard-ui/bower_components/emby-webcomponents/sync/syncjoblist.js +++ b/dashboard-ui/bower_components/emby-webcomponents/sync/syncjoblist.js @@ -218,7 +218,7 @@ globalize.translate('sharedcomponents#CancelSyncJobConfirmation'); options.ExcludeTargetIds = apiClient.deviceId(); } - return apiClient.getJSON(ApiClient.getUrl('Sync/Jobs', options)).then(function (response) { + return apiClient.getJSON(apiClient.getUrl('Sync/Jobs', options)).then(function (response) { renderList(listInstance, response.Items); loading.hide(); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index c36dce77b9..d2d077b221 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1192,7 +1192,6 @@ var AppInfo = {}; apiclient: apiClientBowerPath + '/apiclient', connectionManagerFactory: bowerPath + '/emby-apiclient/connectionmanager', visibleinviewport: embyWebComponentsBowerPath + "/visibleinviewport", - filesystem: embyWebComponentsBowerPath + "/filesystem", browserdeviceprofile: embyWebComponentsBowerPath + "/browserdeviceprofile", browser: embyWebComponentsBowerPath + "/browser", inputManager: embyWebComponentsBowerPath + "/inputmanager", @@ -1322,8 +1321,10 @@ var AppInfo = {}; // hack for an android test before browserInfo is loaded if (Dashboard.isRunningInCordova() && window.MainActivity) { paths.appStorage = "cordova/android/appstorage"; + paths.filesystem = 'cordova/filesystem'; } else { paths.appStorage = getAppStorage(apiClientBowerPath); + paths.filesystem = embyWebComponentsBowerPath + '/filesystem'; } var sha1Path = bowerPath + "/cryptojslib/components/sha1-min"; @@ -1392,15 +1393,14 @@ var AppInfo = {}; if (Dashboard.isRunningInCordova()) { define("iapManager", ["cordova/iap"], returnFirstDependency); - define("localassetmanager", ["cordova/localassetmanager"], returnFirstDependency); define("fileupload", ["cordova/fileupload"], returnFirstDependency); } else { define("iapManager", ["components/iap"], returnFirstDependency); - define("localassetmanager", [apiClientBowerPath + "/localassetmanager"], returnFirstDependency); define("fileupload", [apiClientBowerPath + "/fileupload"], returnFirstDependency); } define("connectionmanager", [apiClientBowerPath + "/connectionmanager"]); + define("cameraRoll", [apiClientBowerPath + "/cameraroll"], returnFirstDependency); define("contentuploader", [apiClientBowerPath + "/sync/contentuploader"]); define("serversync", [apiClientBowerPath + "/sync/serversync"]); define("multiserversync", [apiClientBowerPath + "/sync/multiserversync"]); @@ -1640,7 +1640,7 @@ var AppInfo = {}; function initRequireWithBrowser(browser) { var bowerPath = getBowerPath(); - + var apiClientBowerPath = bowerPath + "/emby-apiclient"; var embyWebComponentsBowerPath = bowerPath + '/emby-webcomponents'; if (Dashboard.isRunningInCordova()) { @@ -1664,7 +1664,7 @@ var AppInfo = {}; } if (Dashboard.isRunningInCordova() && browser.safari) { - define("imageFetcher", ['cordova/ios/imagestore'], returnFirstDependency); + define("imageFetcher", ['cordova/imagestore'], returnFirstDependency); } else { define("imageFetcher", [embyWebComponentsBowerPath + "/images/basicimagefetcher"], returnFirstDependency); } @@ -1703,8 +1703,10 @@ var AppInfo = {}; if (Dashboard.isRunningInCordova() && browser.android) { define("fileDownloader", ['cordova/android/filedownloader'], returnFirstDependency); + define("localassetmanager", ["cordova/localassetmanager"], returnFirstDependency); } else { define("fileDownloader", [embyWebComponentsBowerPath + '/filedownloader'], returnFirstDependency); + define("localassetmanager", [apiClientBowerPath + "/localassetmanager"], returnFirstDependency); } } @@ -1722,7 +1724,7 @@ var AppInfo = {}; define("videorenderer", ["cordova/android/vlcplayer"]); } else if (Dashboard.isRunningInCordova() && browserInfo.safari) { - define("audiorenderer", ["cordova/ios/audioplayer"]); + define("audiorenderer", ["cordova/audioplayer"]); define("videorenderer", ["scripts/htmlmediarenderer"]); } else { @@ -2697,12 +2699,12 @@ var AppInfo = {}; } else if (browserInfo.safari) { - postInitDependencies.push('cordova/ios/volume'); - postInitDependencies.push('cordova/ios/chromecast'); - postInitDependencies.push('cordova/ios/orientation'); - postInitDependencies.push('cordova/ios/remotecontrols'); + postInitDependencies.push('cordova/volume'); + postInitDependencies.push('cordova/chromecast'); + postInitDependencies.push('cordova/orientation'); + postInitDependencies.push('cordova/remotecontrols'); - //postInitDependencies.push('cordova/ios/backgroundfetch'); + //postInitDependencies.push('cordova/backgroundfetch'); } } else if (browserInfo.chrome) {