milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

retry image saving to internal location

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-06 10:59:42 -04:00
parent d96a2b7946
commit 65442321a0
5 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/apiclient/apiclient.js
View file

@ -355,8 +355,8 @@
if (!url) { if (!url) {
throw new Error("serverAddress is yet not set"); throw new Error("serverAddress is yet not set");
} }
var lowered = url.toLowerCase();
if (url.toLowerCase().indexOf('/emby') == -1) { if (lowered.indexOf('/emby') == -1 && lowered.indexOf('/mediabrowser') == -1) {
url += '/emby'; url += '/emby';
} }

6
dashboard-ui/apiclient/connectionmanager.js
View file

@ -410,7 +410,7 @@
url: url, url: url,
dataType: "json", dataType: "json",
headers: { headers: {
"X-Emby-Token": server.ExchangeToken "X-MediaBrowser-Token": server.ExchangeToken
} }
}).done(function (auth) { }).done(function (auth) {
@ -437,7 +437,7 @@
url: getEmbyServerUrl(url, "System/Info"), url: getEmbyServerUrl(url, "System/Info"),
dataType: "json", dataType: "json",
headers: { headers: {
"X-Emby-Token": server.AccessToken "X-MediaBrowser-Token": server.AccessToken
} }
}).done(function (systemInfo) { }).done(function (systemInfo) {
@ -452,7 +452,7 @@
url: getEmbyServerUrl(url, "users/" + server.UserId), url: getEmbyServerUrl(url, "users/" + server.UserId),
dataType: "json", dataType: "json",
headers: { headers: {
"X-Emby-Token": server.AccessToken "X-MediaBrowser-Token": server.AccessToken
} }
}).done(function (user) { }).done(function (user) {

6
dashboard-ui/bower_components/iron-behaviors/.bower.json vendored
View file

@ -27,14 +27,14 @@
"web-component-tester": "*", "web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"homepage": "https://github.com/PolymerElements/iron-behaviors", "homepage": "https://github.com/polymerelements/iron-behaviors",
"_release": "1.0.8", "_release": "1.0.8",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.8", "tag": "v1.0.8",
"commit": "663ad706b43989f4961d945b8116cf4db346532f" "commit": "663ad706b43989f4961d945b8116cf4db346532f"
}, },
"_source": "git://github.com/PolymerElements/iron-behaviors.git", "_source": "git://github.com/polymerelements/iron-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-behaviors" "_originalSource": "polymerelements/iron-behaviors"
} }

11
dashboard-ui/cordova/iap.js vendored
View file

@ -54,6 +54,8 @@
// product attributes: // product attributes:
// https://github.com/j3k0/cordova-plugin-purchase/blob/master/doc/api.md#validation-error-codes // https://github.com/j3k0/cordova-plugin-purchase/blob/master/doc/api.md#validation-error-codes
alert(JSON.stringify(product.transaction));
callback(true, { callback(true, {
}); });
@ -82,8 +84,13 @@
// When purchase of the full version is approved, // When purchase of the full version is approved,
// show some logs and finish the transaction. // show some logs and finish the transaction.
store.when(id).approved(function (order) { store.when(id).approved(function (product) {
order.finish();
if (product.type == store.PAID_SUBSCRIPTION) {
product.verify();
} else {
product.finish();
}
}); });
store.when(id).verified(function (p) { store.when(id).verified(function (p) {

2
dashboard-ui/themes/ios.css
View file

@ -33,7 +33,7 @@ body {
} }
.background-theme-b, paper-dialog.background-theme-b { .background-theme-b, paper-dialog.background-theme-b {
background: radial-gradient(circle, #303030, #101010) fixed; background: radial-gradient(circle, #303030, #101010);
} }
.backdropContainer .pageBackground { .backdropContainer .pageBackground {