From 69a57de9280c48df0970fcc3f676d3b7f920a150 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Fri, 29 May 2015 19:51:33 -0400 Subject: [PATCH] consolidate slideout panels --- dashboard-ui/css/card.css | 8 +- dashboard-ui/css/librarybrowser.css | 2 +- dashboard-ui/css/librarymenu.css | 8 +- dashboard-ui/css/site.css | 26 ++- dashboard-ui/scripts/extensions.js | 11 +- dashboard-ui/scripts/itemlistpage.js | 2 +- dashboard-ui/scripts/librarymenu.js | 139 +++++------ dashboard-ui/scripts/mediacontroller.js | 5 + dashboard-ui/scripts/moviesrecommended.js | 7 +- dashboard-ui/scripts/photos.js | 7 +- dashboard-ui/scripts/site.js | 78 +------ .../thirdparty/cordova/android/filesystem.js | 11 + .../thirdparty/cordova/android/imagestore.js | 220 ++++++++++++++++++ dashboard-ui/thirdparty/cordova/chromecast.js | 26 +-- dashboard-ui/thirdparty/cordova/filesystem.js | 11 + dashboard-ui/thirdparty/cordova/imagestore.js | 14 +- dashboard-ui/thirdparty/filesystem.js | 11 + 17 files changed, 388 insertions(+), 198 deletions(-) create mode 100644 dashboard-ui/thirdparty/cordova/android/filesystem.js create mode 100644 dashboard-ui/thirdparty/cordova/android/imagestore.js create mode 100644 dashboard-ui/thirdparty/cordova/filesystem.js create mode 100644 dashboard-ui/thirdparty/filesystem.js diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 9305d1ebbe..e166310677 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -44,7 +44,7 @@ } .cardBox { - margin: 1px; + margin: 3px; } .largeCardMargin .cardBox { @@ -55,12 +55,12 @@ margin: 4px; } -/*@media all and (max-width: 600px) { +@media all and (max-width: 600px) { .cardBox { - margin: 0; + margin: 1px; } -}*/ +} .grayscale { -webkit-filter: grayscale(100%); diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index baa9882179..68dcb63aa3 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -704,7 +704,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .lblDetailTab { - border-color: #1f1f1f !important; + border-color: #212121 !important; } .editMetadataForm { diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css index bfa482ffda..d18c1f1a30 100644 --- a/dashboard-ui/css/librarymenu.css +++ b/dashboard-ui/css/librarymenu.css @@ -8,7 +8,7 @@ .libraryMenuDivider { height: 1px; - background: #282828; + background: #333; margin: .5em 0; } @@ -196,7 +196,7 @@ } .librarySidebarLinks a:hover { - background-color: #38c !important; + background-color: #383838 !important; color: #fff !important; } @@ -208,7 +208,7 @@ } .selectedMediaFolder { - background-color: #52B54B !important; + background-color: #3388cc !important; color: #fff !important; } @@ -217,7 +217,7 @@ } .ui-panel.ui-body-b { - background-color: #161616; + background-color: #212121; } .libraryViewNav .ui-btn-active { diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 80d5303960..66f3f6eabf 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -243,6 +243,22 @@ body:not(.enableBackButton) .headerBackButton { left: 270px !important; } +@media all and (min-width: 340px) { + + .largePanel { + width: 300px; + } + + /* Make panels larger */ + .largePanelModalOpen.ui-panel-dismiss-position-right { + right: 300px !important; + } + + .largePanelModalOpen.ui-panel-dismiss-position-left { + left: 300px !important; + } +} + pre, textarea.pre { display: block; @@ -453,12 +469,17 @@ h1 .imageLink { } .sidebarLinkIcon { - font-size: 17px; + font-size: 16px; width: 66px; text-align: center; vertical-align: middle; + color: #ddd; } + .sidebarLinkIcon + span { + vertical-align: middle; + } + .ui-page-theme-a .sidebarLinkIcon { color: #666; } @@ -473,8 +494,9 @@ h1 .imageLink { .sidebarHeader { padding-left: 20px; - margin: 1em 0; + margin: 15px 0 10px; font-size: 90%; + color: #ccc; } .ui-page-theme-a .sidebarHeader { diff --git a/dashboard-ui/scripts/extensions.js b/dashboard-ui/scripts/extensions.js index 0dc58dd4e4..28717e674b 100644 --- a/dashboard-ui/scripts/extensions.js +++ b/dashboard-ui/scripts/extensions.js @@ -126,8 +126,17 @@ var WebNotifications = { if (window.cordova && window.cordova.plugins && window.cordova.plugins.notification) { + if (!WebNotifications.lastId) { + // Cordova plugin will crash on android with long. need an int + WebNotifications.lastId = new Date().getDate() + new Date().getMilliseconds(); + } + + WebNotifications.lastId++; + window.cordova.plugins.notification.local.schedule({ - id: new Date().getTime(), + + id: WebNotifications.lastId, + title: data.title, text: data.body, //firstAt: monday_9_am, diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index a8a63d99b8..48e88b7e72 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -1,6 +1,6 @@ (function ($, document) { - var view = LibraryBrowser.getDefaultItemsView('Poster', 'PosterCard'); + var view = LibraryBrowser.getDefaultItemsView('Poster', 'Poster'); // The base query options var query = { diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js index afb1c332ce..0e6d0bebd6 100644 --- a/dashboard-ui/scripts/librarymenu.js +++ b/dashboard-ui/scripts/librarymenu.js @@ -20,15 +20,9 @@ html += '
'; - if (!AppInfo.enableHeaderImages) { - html += ''; - } else { - html += ''; - } + html += ''; - html += ''; + html += ''; html += '
'; html += '
'; html += ''; @@ -37,12 +31,6 @@ html += '
'; html += '
'; - html += ''; - html += ''; html += '
'; @@ -73,26 +61,6 @@ } else { $('.dashboardEntryHeaderButton', header).hide(); } - - var userButtonHtml = ''; - if (user.name) { - - if (user.imageUrl && AppInfo.enableUserImage) { - - var userButtonHeight = 26; - - var url = user.imageUrl; - - if (user.supportsImageParams) { - url += "&height=" + (userButtonHeight * Math.max(devicePixelRatio || 1, 2)); - } - - userButtonHtml += '
'; - } else { - userButtonHtml += '
'; - } - $('.headerUserButton', header).html(userButtonHtml).lazyChildren(); - } } function bindMenuEvents() { @@ -143,11 +111,25 @@ html += '
'; html += '
'; - html += '' + Globalize.translate('ButtonDashboard') + ''; + html += '
'; + html += Globalize.translate('HeaderAdmin'); + html += '
'; + html += '' + Globalize.translate('ButtonMetadataManager') + ''; html += '' + Globalize.translate('ButtonReports') + ''; + html += '' + Globalize.translate('ButtonServer') + ''; html += '
'; - html += '' + Globalize.translate('ButtonSync') + ''; + + html += '
'; + html += '
'; + + if (Dashboard.isConnectMode()) { + html += '' + Globalize.translate('ButtonSelectServer') + ''; + } + + html += '' + Globalize.translate('ButtonSignOut') + ''; + html += '
'; + return html; } @@ -162,11 +144,15 @@ panel = getLibraryMenu(user); updateLibraryNavLinks(page); - $(panel).panel('toggle').off('mouseleave.librarymenu').on('mouseleave.librarymenu', function () { + panel = $(panel).panel('toggle').off('mouseleave.librarymenu'); - $(this).panel("close"); + if (!AppInfo.isTouchPreferred) { + panel.on('mouseleave.librarymenu', function () { - }); + $(this).panel("close"); + + }); + } }); } @@ -175,11 +161,15 @@ var page = $.mobile.activePage; var panel = getDashboardMenu(page); - $(panel).panel('toggle').off('mouseleave.librarymenu').on('mouseleave.librarymenu', function () { + panel = $(panel).panel('toggle').off('mouseleave.librarymenu'); - $(this).panel("close"); + if (!AppInfo.isTouchPreferred) { + panel.on('mouseleave.librarymenu', function () { - }); + $(this).panel("close"); + + }); + } } function updateLibraryMenu(panel) { @@ -190,6 +180,7 @@ $('.adminMenuOptions').hide(); $('.syncViewMenu').hide(); + $('.userMenuOptions').hide(); return; } @@ -199,7 +190,12 @@ var items = result.Items; - var html = items.map(function (i) { + var html = ''; + html += '
'; + html += Globalize.translate('HeaderLibrary'); + html += '
'; + + html += items.map(function (i) { var iconCssClass = 'fa'; @@ -290,53 +286,40 @@ html += '
'; - var showUserAtTop = AppInfo.isTouchPreferred; + var userHref = user.localUser && user.localUser.Policy.EnableUserPreferenceAccess ? + 'mypreferencesdisplay.html?userId=' + user.localUser.Id : + (user.localUser ? 'index.html' : '#'); - if (showUserAtTop) { + var hasUserImage = user.imageUrl && AppInfo.enableUserImage; + var paddingLeft = hasUserImage ? 'padding-left:.7em;' : ''; + html += ''; - var userHref = user.localUser && user.localUser.Policy.EnableUserPreferenceAccess ? - 'mypreferencesdisplay.html?userId=' + user.localUser.Id : - (user.localUser ? 'index.html' : '#'); + var imgWidth = 44; - var hasUserImage = user.imageUrl && AppInfo.enableUserImage; - var paddingLeft = hasUserImage ? 'padding-left:.7em;' : ''; - html += ''; + if (hasUserImage) { + var url = user.imageUrl; - var imgWidth = 44; - - if (hasUserImage) { - var url = user.imageUrl; - - if (user.supportsImageParams) { - url += "&width=" + (imgWidth * Math.max(devicePixelRatio || 1, 2)); - } - - html += '
'; - } else { - html += ''; + if (user.supportsImageParams) { + url += "&width=" + (imgWidth * Math.max(devicePixelRatio || 1, 2)); } - html += user.name; - html += ''; - - html += '
'; + html += '
'; + } else { + html += ''; } + html += user.name; + html += ''; + + html += '
'; + var homeHref = window.ApiClient ? 'index.html' : 'selectserver.html'; - if (showUserAtTop) { - html += '' + Globalize.translate('ButtonHome') + ''; + html += '' + Globalize.translate('ButtonHome') + ''; - } else { - html += ''; + html += '' + Globalize.translate('ButtonRemote') + ''; - html += ''; - - 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 += '
'; - - if (AppInfo.supportsFullScreen) { - var checkedHtml = AppSettings.enableFullScreen() ? ' checked="checked"' : ''; - html += '

'; - } - - html += '

'; - - if (Dashboard.isConnectMode()) { - html += '

' + Globalize.translate('ButtonSelectServer') + ''; - } - - html += '

'; - - html += '
'; - html += '
'; - - $(document.body).append(html); - - var elem = $('#userFlyout').panel({}).lazyChildren().trigger('create').panel("open").on("panelclose", function () { - - $(this).off("panelclose").remove(); - }); - - ConnectionManager.user(window.ApiClient).done(function (user) { - Dashboard.updateUserFlyout(elem, user); - }); - }, - - updateUserFlyout: function (elem, user) { - - var html = ''; - var imgWidth = 48; - - if (user.imageUrl && AppInfo.enableUserImage) { - var url = user.imageUrl; - - if (user.supportsImageParams) { - url += "&width=" + (imgWidth * Math.max(window.devicePixelRatio || 1, 2)); - } - - html += '
'; - } - html += user.name; - - $('.userHeader', elem).html(html).lazyChildren(); - - html = ''; - - if (user.localUser && user.localUser.Policy.EnableUserPreferenceAccess) { - 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