';
-
- html += Globalize.translate('ButtonHome');
- html += '';
- }
-
- html += '' + Globalize.translate('ButtonRemote') + '';
+ html += '' + Globalize.translate('ButtonSync') + '';
html += '';
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index 0ece48d46d..242a0e8773 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -561,6 +561,11 @@
return true;
}
+ if (mediaSource.SupportsDirectPlay && mediaSource.Protocol == 'File') {
+
+ return FileSystem.fileExists(mediaSource.Path);
+ }
+
return false;
};
}
diff --git a/dashboard-ui/scripts/moviesrecommended.js b/dashboard-ui/scripts/moviesrecommended.js
index df183f7a67..49046c295a 100644
--- a/dashboard-ui/scripts/moviesrecommended.js
+++ b/dashboard-ui/scripts/moviesrecommended.js
@@ -2,12 +2,12 @@
function getView() {
- return 'PosterCard';
+ return 'Poster';
}
function getResumeView() {
- return 'ThumbCard';
+ return 'Thumb';
}
function enableScrollX() {
@@ -62,7 +62,8 @@
shape: getPortraitShape(),
centerText: true,
lazy: true,
- overlayText: true
+ overlayText: true,
+ showDetailsMenu: true
});
}
diff --git a/dashboard-ui/scripts/photos.js b/dashboard-ui/scripts/photos.js
index beac8ee4ec..328166f603 100644
--- a/dashboard-ui/scripts/photos.js
+++ b/dashboard-ui/scripts/photos.js
@@ -168,12 +168,17 @@
function showSlideshow(page, items, startItemId) {
+ var screenWidth = $(window).width();
+ var screenHeight = $(window).height();
+
var slideshowItems = items.map(function (item) {
var imgUrl = ApiClient.getScaledImageUrl(item.Id, {
tag: item.ImageTags.Primary,
- type: 'Primary'
+ type: 'Primary',
+ maxWidth: screenWidth,
+ maxHeight: screenHeight
});
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 78bdfd466d..531c66c420 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -630,71 +630,6 @@ var Dashboard = {
}, 500);
},
- showUserFlyout: function (context) {
-
- var html = ''; - - html += '
'; - - html += ''; - html += '' + Globalize.translate('ButtonMyPreferences') + ''; - } - - $('.preferencesContainer', elem).html(html).trigger('create'); - }, - getPluginSecurityInfo: function () { var apiClient = ApiClient; @@ -1546,7 +1481,6 @@ var AppInfo = {}; AppInfo.enableDetailPageChapters = true; AppInfo.enableDetailsMenuImages = true; - AppInfo.enableHeaderImages = true; AppInfo.enableMovieHomeSuggestions = true; AppInfo.enableAppStorePolicy = isCordova; @@ -1568,7 +1502,6 @@ var AppInfo = {}; } else { AppInfo.enableDetailPageChapters = false; AppInfo.enableDetailsMenuImages = false; - AppInfo.enableHeaderImages = false; AppInfo.enableMovieHomeSuggestions = false; AppInfo.cardMargin = 'largeCardMargin'; } @@ -1849,7 +1782,9 @@ var AppInfo = {}; requirejs(['thirdparty/cordova/connectsdk', 'scripts/registrationservices']); if ($.browser.android) { - requirejs(['thirdparty/cordova/android/androidcredentials', 'thirdparty/cordova/android/immersive']); + requirejs(['thirdparty/cordova/android/androidcredentials', 'thirdparty/cordova/android/immersive', 'thirdparty/cordova/android/filesystem']); + } else { + requirejs(['thirdparty/cordova/filesystem']); } if ($.browser.safari) { @@ -1860,6 +1795,7 @@ var AppInfo = {}; if ($.browser.chrome) { requirejs(['scripts/chromecast']); } + requirejs(['thirdparty/filesystem']); } } @@ -1908,7 +1844,11 @@ var AppInfo = {}; function initCordovaWithDeviceProfile(deferred, deviceId, deviceProfile) { - requirejs(['thirdparty/cordova/imagestore.js']); + if ($.browser.android) { + requirejs(['thirdparty/cordova/android/imagestore.js']); + } else { + requirejs(['thirdparty/cordova/imagestore.js']); + } var capablities = Dashboard.capabilities(); diff --git a/dashboard-ui/thirdparty/cordova/android/filesystem.js b/dashboard-ui/thirdparty/cordova/android/filesystem.js new file mode 100644 index 0000000000..60d8519845 --- /dev/null +++ b/dashboard-ui/thirdparty/cordova/android/filesystem.js @@ -0,0 +1,11 @@ +(function () { + + window.FileSystem = { + + fileExists: function (path) { + var exists = NativeFileSystem.fileExists(path); + return false; + } + }; + +})(); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/cordova/android/imagestore.js b/dashboard-ui/thirdparty/cordova/android/imagestore.js new file mode 100644 index 0000000000..1162fa7e31 --- /dev/null +++ b/dashboard-ui/thirdparty/cordova/android/imagestore.js @@ -0,0 +1,220 @@ + +(function () { + + function setImageIntoElement(elem, url) { + + if (elem.tagName === "DIV") { + + elem.style.backgroundImage = "url('" + url + "')"; + + } else { + elem.setAttribute("src", url); + } + } + + // IndexedDB + var indexedDb = window.indexedDB || window.webkitIndexedDB || window.mozIndexedDB || window.OIndexedDB || window.msIndexedDB, + dbVersion = 1.0; + + var dbName = "emby7"; + var imagesStoreName = "images"; + + function createObjectStore(dataBase) { + // Create an objectStore + console.log("Creating objectStore"); + dataBase.createObjectStore(imagesStoreName); + } + + function openDb() { + + var deferred = $.Deferred(); + + // Create/open database + var request = indexedDb.open(dbName, dbVersion); + + request.onerror = function (event) { + + console.log("Error creating/accessing IndexedDB database"); + deferred.reject(); + }; + + request.onsuccess = function (event) { + console.log("Success creating/accessing IndexedDB database"); + + var db = request.result || event.target.result; + + db.onerror = function (event) { + console.log("Error creating/accessing IndexedDB database"); + }; + + // Interim solution for Google Chrome to create an objectStore. Will be deprecated + if (db.setVersion) { + if (db.version != dbVersion) { + var setVersion = db.setVersion(dbVersion); + setVersion.onsuccess = function () { + createObjectStore(db); + deferred.resolveWith(null, [db]); + }; + } else { + deferred.resolveWith(null, [db]); + } + } else { + deferred.resolveWith(null, [db]); + } + } + + // For future use. Currently only in latest Firefox versions + request.onupgradeneeded = function (event) { + createObjectStore(event.target.result); + }; + + return deferred.promise(); + } + + function indexedDbBlobImageStore() { + + var self = this; + + openDb().done(function (db) { + + self._db = db; + window.ImageStore = self; + }); + + self.addImageToDatabase = function (blob, key, deferred) { + + console.log("addImageToDatabase"); + + // Open a transaction to the database + var transaction = self.db().transaction([imagesStoreName], "readwrite"); + + // Put the blob into the dabase + var putRequest = transaction.objectStore(imagesStoreName).put(blob, key); + + putRequest.onsuccess = function (event) { + deferred.resolve(); + }; + + putRequest.onerror = function () { + deferred.reject(); + }; + }; + + self.db = function () { + + return self._db; + }; + + self.get = function (key) { + + var deferred = DeferredBuilder.Deferred(); + + var transaction = self.db().transaction([imagesStoreName], "readonly"); + + // Open a transaction to the database + var getRequest = transaction.objectStore(imagesStoreName).get(key); + + getRequest.onsuccess = function (event) { + + var imgFile = event.target.result; + + if (imgFile) { + + // Get window.URL object + var URL = window.URL || window.webkitURL; + + // Create and revoke ObjectURL + var imgUrl = URL.createObjectURL(imgFile); + + deferred.resolveWith(null, [imgUrl]); + } else { + deferred.reject(); + } + }; + + getRequest.onerror = function () { + deferred.reject(); + }; + + return deferred.promise(); + }; + + self.getImageUrl = function (originalUrl) { + + console.log('getImageUrl:' + originalUrl); + + var key = CryptoJS.MD5(originalUrl + "1").toString(); + + var deferred = DeferredBuilder.Deferred(); + + self.get(key).done(function (url) { + + deferred.resolveWith(null, [url]); + + }).fail(function () { + + self.downloadImage(originalUrl, key).done(function () { + self.get(key).done(function (url) { + + deferred.resolveWith(null, [url]); + + }).fail(function () { + + deferred.reject(); + }); + }).fail(function () { + + deferred.reject(); + }); + }); + + return deferred.promise(); + }; + + self.downloadImage = function (url, key) { + + var deferred = DeferredBuilder.Deferred(); + + console.log('downloadImage:' + url); + + // Create XHR + var xhr = new XMLHttpRequest(); + + xhr.open("GET", url, true); + // Set the responseType to blob + xhr.responseType = "blob"; + + xhr.addEventListener("load", function () { + + if (xhr.status === 200) { + console.log("Image retrieved"); + + // Put the received blob into IndexedDB + self.addImageToDatabase(this.response, key, deferred); + } else { + deferred.reject(); + } + }, false); + + // Send XHR + xhr.send(); + return deferred.promise(); + }; + + self.setImageInto = function (elem, url) { + + function onFail() { + setImageIntoElement(elem, url); + } + + self.getImageUrl(url).done(function (localUrl) { + + setImageIntoElement(elem, localUrl); + + }).fail(onFail); + }; + } + + new indexedDbBlobImageStore(); + +})(); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/cordova/chromecast.js b/dashboard-ui/thirdparty/cordova/chromecast.js index 13b4aaf4e9..b4543c92c2 100644 --- a/dashboard-ui/thirdparty/cordova/chromecast.js +++ b/dashboard-ui/thirdparty/cordova/chromecast.js @@ -537,6 +537,8 @@ function tryJoinWebSession(device, enableRetry) { + // First try to join existing session. If it fails, launch a new one + console.log('calling joinWebApp'); device.getWebAppLauncher().joinWebApp(ApplicationID).success(function (session) { @@ -560,29 +562,7 @@ function launchWebApp(device) { - // First try to join existing session. If it fails, launch a new one - - device.getWebAppLauncher().joinWebApp(ApplicationID).success(function (session) { - - console.log('joinWebApp success. calling onSessionConnected'); - setupWebAppSession(device, session); - - }).error(function (err) { - - console.log('joinWebApp error: ' + JSON.stringify(err) + '. calling launchWebApp'); - - device.getWebAppLauncher().launchWebApp(ApplicationID).success(function (session) { - - console.log('launchWebApp success. calling onSessionConnected'); - setupWebAppSession(device, session); - - }).error(function (err1) { - - console.log('launchWebApp error:' + JSON.stringify(err1)); - - }); - - }); + tryJoinWebSession(device, true); } function onDeviceReady(device) { diff --git a/dashboard-ui/thirdparty/cordova/filesystem.js b/dashboard-ui/thirdparty/cordova/filesystem.js new file mode 100644 index 0000000000..bf2fc59968 --- /dev/null +++ b/dashboard-ui/thirdparty/cordova/filesystem.js @@ -0,0 +1,11 @@ +(function () { + + window.FileSystem = { + + fileExists: function (path) { + return false; + } + + }; + +})(); \ No newline at end of file diff --git a/dashboard-ui/thirdparty/cordova/imagestore.js b/dashboard-ui/thirdparty/cordova/imagestore.js index 3b02ef95bb..01b953096c 100644 --- a/dashboard-ui/thirdparty/cordova/imagestore.js +++ b/dashboard-ui/thirdparty/cordova/imagestore.js @@ -35,23 +35,19 @@ var self = this; - self.addImageToDatabase = function (blob, key) { - - var deferred = DeferredBuilder.Deferred(); + self.addImageToDatabase = function (blob, key, deferred) { console.log("addImageToDatabase"); self.db().transaction(function (tx) { - tx.executeSql("INSERT INTO images (id, data) VALUES (?,?)", [key, blob], function (tx, res) { + tx.executeSql("REPLACE INTO images (id, data) VALUES (?,?)", [key, blob], function (tx, res) { deferred.resolve(); }, function (e) { deferred.reject(); }); }); - - return deferred.promise(); }; self.db = function () { @@ -146,11 +142,7 @@ var dataURL = "data:image/jpeg;base64," + b64; // Put the received blob into the database - self.addImageToDatabase(dataURL, key).done(function () { - deferred.resolve(); - }).fail(function () { - deferred.reject(); - }); + self.addImageToDatabase(dataURL, key, deferred); } catch (err) { console.log("Error adding image to database"); deferred.reject(); diff --git a/dashboard-ui/thirdparty/filesystem.js b/dashboard-ui/thirdparty/filesystem.js new file mode 100644 index 0000000000..bf2fc59968 --- /dev/null +++ b/dashboard-ui/thirdparty/filesystem.js @@ -0,0 +1,11 @@ +(function () { + + window.FileSystem = { + + fileExists: function (path) { + return false; + } + + }; + +})(); \ No newline at end of file