diff --git a/dashboard-ui/apiclient/sync/mediasync.js b/dashboard-ui/apiclient/sync/mediasync.js index 2470913455..2a2b67c75b 100644 --- a/dashboard-ui/apiclient/sync/mediasync.js +++ b/dashboard-ui/apiclient/sync/mediasync.js @@ -287,6 +287,10 @@ return; } + // Just for now while media syncing gets worked out + deferred.resolve(); + return; + var libraryItem = localItem.Item; var serverId = libraryItem.ServerId; diff --git a/dashboard-ui/apiclient/sync/multiserversync.js b/dashboard-ui/apiclient/sync/multiserversync.js index b4136be797..7f1a868995 100644 --- a/dashboard-ui/apiclient/sync/multiserversync.js +++ b/dashboard-ui/apiclient/sync/multiserversync.js @@ -27,9 +27,6 @@ var server = servers[index]; - // get fresh info from connection manager - server = connectionManager.getServerInfo(server.Id) || server; - Logger.log("Creating ServerSync to server: " + server.Id); require(['serversync'], function () { diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json index 9e650790be..8119ebcf41 100644 --- a/dashboard-ui/bower_components/iron-meta/.bower.json +++ b/dashboard-ui/bower_components/iron-meta/.bower.json @@ -25,14 +25,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/iron-meta", + "homepage": "https://github.com/polymerelements/iron-meta", "_release": "1.0.3", "_resolution": { "type": "version", "tag": "v1.0.3", "commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04" }, - "_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/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json index c9e9b86273..d289efd9cf 100644 --- a/dashboard-ui/bower_components/paper-ripple/.bower.json +++ b/dashboard-ui/bower_components/paper-ripple/.bower.json @@ -30,14 +30,14 @@ "web-component-tester": "*", "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" }, - "homepage": "https://github.com/PolymerElements/paper-ripple", + "homepage": "https://github.com/polymerelements/paper-ripple", "_release": "1.0.2", "_resolution": { "type": "version", "tag": "v1.0.2", "commit": "b546dbe6ad0b1f58cac80caec3136cf3232e12fc" }, - "_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/cordova/localassetmanager.js b/dashboard-ui/cordova/localassetmanager.js index dc1a7af265..de722ed620 100644 --- a/dashboard-ui/cordova/localassetmanager.js +++ b/dashboard-ui/cordova/localassetmanager.js @@ -661,6 +661,13 @@ var deferred = DeferredBuilder.Deferred(); + if (window.NativeFileSystem) { + var exists = NativeFileSystem.fileExists(path); + Logger.log('fileExists: ' + exists + ' - path: ' + path); + deferred.resolveWith(null, [exists]); + return deferred.promise(); + } + resolveFile(path, function (fileEntry) { Logger.log('fileExists: true - path: ' + path); deferred.resolveWith(null, [true]); @@ -701,6 +708,11 @@ var deferred = DeferredBuilder.Deferred(); + if ($.browser.android) { + deferred.resolveWith(null, ['file://' + ]); + return deferred.promise(); + } + resolveFile(path, function (fileEntry) { Logger.log('translateFilePath fileExists: true - path: ' + path); Logger.log('translateFilePath resolving with: ' + fileEntry.toURL()); diff --git a/dashboard-ui/scripts/notificationsettings.js b/dashboard-ui/scripts/notificationsettings.js index 52812ef617..f0142d0633 100644 --- a/dashboard-ui/scripts/notificationsettings.js +++ b/dashboard-ui/scripts/notificationsettings.js @@ -6,7 +6,7 @@ ApiClient.getJSON(ApiClient.getUrl("Notifications/Types")).done(function (list) { - var html = '
' + Globalize.translate('LabelEnabled') + '
'; - } else { - itemHtml += '' + Globalize.translate('LabelDisabled') + '
'; + itemHtml += '