mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
fix sync status display
This commit is contained in:
Luke Pulverenti
parent
a07e6b59a3
commit
94a5cf7549
26 changed files with 415 additions and 276 deletions
52
dashboard-ui/cordova/android/iap.js
vendored
52
dashboard-ui/cordova/android/iap.js
vendored
|
|
@ -1,8 +1,16 @@
|
|||
(function () {
|
||||
|
||||
var unlockId = "com.mb.android.unlock";
|
||||
var updatedProducts = [];
|
||||
|
||||
function getStoreFeatureId(feature) {
|
||||
|
||||
if (feature == 'embypremieremonthly') {
|
||||
return "emby.supporter.monthly";
|
||||
}
|
||||
|
||||
return "com.mb.android.unlock";
|
||||
}
|
||||
|
||||
function updateProductInfo(id, owned, price) {
|
||||
|
||||
updatedProducts = updatedProducts.filter(function (r) {
|
||||
|
|
@ -20,7 +28,10 @@
|
|||
Events.trigger(IapManager, 'productupdated', [product]);
|
||||
}
|
||||
|
||||
function getProduct(id) {
|
||||
function getProduct(feature) {
|
||||
|
||||
var id = getStoreFeatureId(feature);
|
||||
|
||||
var products = updatedProducts.filter(function (r) {
|
||||
return r.id == id;
|
||||
});
|
||||
|
|
@ -28,13 +39,14 @@
|
|||
return products.length ? products[0] : null;
|
||||
}
|
||||
|
||||
function isPurchaseAvailable(id) {
|
||||
function isPurchaseAvailable(feature) {
|
||||
|
||||
return NativeIapManager.isStoreAvailable();
|
||||
}
|
||||
|
||||
function beginPurchase(id) {
|
||||
return MainActivity.beginPurchase(id);
|
||||
function beginPurchase(feature, email) {
|
||||
var id = getStoreFeatureId(feature);
|
||||
return MainActivity.beginPurchase(id, email);
|
||||
}
|
||||
|
||||
function onPurchaseComplete(result) {
|
||||
|
|
@ -45,7 +57,31 @@
|
|||
}
|
||||
|
||||
function refreshPurchases() {
|
||||
NativeIapManager.isPurchased(unlockId, "window.IapManager.updateProduct");
|
||||
NativeIapManager.isPurchased(getStoreFeatureId("") + "|" + getStoreFeatureId("embypremieremonthly"), "window.IapManager.updateProduct");
|
||||
//NativeIapManager.isPurchased(getStoreFeatureId("embypremieremonthly"), "window.IapManager.updateProduct");
|
||||
}
|
||||
|
||||
function getSubscriptionOptions() {
|
||||
var deferred = DeferredBuilder.Deferred();
|
||||
|
||||
var options = [];
|
||||
|
||||
options.push({
|
||||
feature: 'embypremieremonthly',
|
||||
buttonText: 'EmbyPremiereMonthlyWithPrice'
|
||||
});
|
||||
|
||||
options = options.filter(function (o) {
|
||||
return getProduct(o.feature) != null;
|
||||
|
||||
}).map(function (o) {
|
||||
|
||||
o.buttonText = Globalize.translate(o.buttonText, o.price);
|
||||
return o;
|
||||
});
|
||||
|
||||
deferred.resolveWith(null, [options]);
|
||||
return deferred.promise();
|
||||
}
|
||||
|
||||
window.IapManager = {
|
||||
|
|
@ -53,7 +89,9 @@
|
|||
getProductInfo: getProduct,
|
||||
updateProduct: updateProductInfo,
|
||||
beginPurchase: beginPurchase,
|
||||
onPurchaseComplete: onPurchaseComplete
|
||||
onPurchaseComplete: onPurchaseComplete,
|
||||
getStoreFeatureId: getStoreFeatureId,
|
||||
getSubscriptionOptions: getSubscriptionOptions
|
||||
};
|
||||
|
||||
refreshPurchases();
|
||||
|
|
|
|||
122
dashboard-ui/cordova/iap.js
vendored
122
dashboard-ui/cordova/iap.js
vendored
|
|
@ -1,10 +1,16 @@
|
|||
(function () {
|
||||
|
||||
var unlockAlias = "premium features";
|
||||
var unlockAppProductId = 'appunlock';
|
||||
|
||||
var updatedProducts = [];
|
||||
|
||||
function getStoreFeatureId(feature) {
|
||||
|
||||
if (feature == 'embypremieremonthly') {
|
||||
return 'emby.subscription.monthly';
|
||||
}
|
||||
|
||||
return 'appunlock';
|
||||
}
|
||||
|
||||
function updateProductInfo(product) {
|
||||
|
||||
updatedProducts = updatedProducts.filter(function (r) {
|
||||
|
|
@ -16,17 +22,9 @@
|
|||
Events.trigger(IapManager, 'productupdated', [product]);
|
||||
}
|
||||
|
||||
function normalizeId(id) {
|
||||
function getProduct(feature) {
|
||||
|
||||
// This is what i named it in itunes
|
||||
id = id.replace('premiumunlock', 'appunlock');
|
||||
|
||||
return id;
|
||||
}
|
||||
|
||||
function getProduct(id) {
|
||||
|
||||
id = normalizeId(id);
|
||||
var id = getStoreFeatureId(feature);
|
||||
|
||||
var products = updatedProducts.filter(function (r) {
|
||||
return r.id == id;
|
||||
|
|
@ -35,19 +33,19 @@
|
|||
return products.length ? products[0] : null;
|
||||
}
|
||||
|
||||
function isPurchaseAvailable(id) {
|
||||
var product = getProduct(id);
|
||||
function isPurchaseAvailable(feature) {
|
||||
|
||||
var product = getProduct(feature);
|
||||
|
||||
return product != null && product.valid /*&& product.canPurchase*/;
|
||||
}
|
||||
|
||||
function beginPurchase(id) {
|
||||
id = normalizeId(id);
|
||||
function beginPurchase(feature, email) {
|
||||
var id = getStoreFeatureId(feature);
|
||||
store.order(id);
|
||||
}
|
||||
|
||||
function restorePurchase(id) {
|
||||
id = normalizeId(id);
|
||||
store.refresh();
|
||||
}
|
||||
|
||||
|
|
@ -74,6 +72,36 @@
|
|||
//callback(false, "Impossible to proceed with validation");
|
||||
}
|
||||
|
||||
function initProduct(id, alias, type) {
|
||||
|
||||
store.register({
|
||||
id: id,
|
||||
alias: alias,
|
||||
type: type
|
||||
});
|
||||
|
||||
// When purchase of the full version is approved,
|
||||
// show some logs and finish the transaction.
|
||||
store.when(id).approved(function (order) {
|
||||
order.finish();
|
||||
});
|
||||
|
||||
store.when(id).verified(function (p) {
|
||||
p.finish();
|
||||
});
|
||||
|
||||
// The play button can only be accessed when the user
|
||||
// owns the full version.
|
||||
store.when(id).updated(function (product) {
|
||||
|
||||
if (product.loaded && product.valid && product.state == store.APPROVED) {
|
||||
Logger.log('finishing previously created transaction');
|
||||
product.finish();
|
||||
}
|
||||
updateProductInfo(product);
|
||||
});
|
||||
}
|
||||
|
||||
function initializeStore() {
|
||||
|
||||
// Let's set a pretty high verbosity level, so that we see a lot of stuff
|
||||
|
|
@ -82,35 +110,8 @@
|
|||
|
||||
store.validator = validateProduct;
|
||||
|
||||
// iOS
|
||||
store.register({
|
||||
id: unlockAppProductId,
|
||||
alias: unlockAlias,
|
||||
type: store.NON_CONSUMABLE
|
||||
});
|
||||
|
||||
// When purchase of the full version is approved,
|
||||
// show some logs and finish the transaction.
|
||||
store.when(unlockAppProductId).approved(function (order) {
|
||||
log('You just unlocked the FULL VERSION!');
|
||||
order.finish();
|
||||
});
|
||||
|
||||
store.when(unlockAppProductId).verified(function (p) {
|
||||
log("verified");
|
||||
p.finish();
|
||||
});
|
||||
|
||||
// The play button can only be accessed when the user
|
||||
// owns the full version.
|
||||
store.when(unlockAppProductId).updated(function (product) {
|
||||
|
||||
if (product.loaded && product.valid && product.state == store.APPROVED) {
|
||||
Logger.log('finishing previously created transaction');
|
||||
product.finish();
|
||||
}
|
||||
updateProductInfo(product);
|
||||
});
|
||||
initProduct(getStoreFeatureId(""), "premium features", store.NON_CONSUMABLE);
|
||||
initProduct(getStoreFeatureId("embypremieremonthly"), "emby premiere monthly", store.PAID_SUBSCRIPTION);
|
||||
|
||||
// When every goes as expected, it's time to celebrate!
|
||||
// The "ready" event should be welcomed with music and fireworks,
|
||||
|
|
@ -125,11 +126,36 @@
|
|||
store.refresh();
|
||||
}
|
||||
|
||||
function getSubscriptionOptions() {
|
||||
var deferred = DeferredBuilder.Deferred();
|
||||
|
||||
var options = [];
|
||||
|
||||
options.push({
|
||||
feature: 'embypremieremonthly',
|
||||
buttonText: 'EmbyPremiereMonthlyWithPrice'
|
||||
});
|
||||
|
||||
options = options.filter(function (o) {
|
||||
return getProduct(o.feature) != null;
|
||||
|
||||
}).map(function (o) {
|
||||
|
||||
o.buttonText = Globalize.translate(o.buttonText, o.price);
|
||||
return o;
|
||||
});
|
||||
|
||||
deferred.resolveWith(null, [options]);
|
||||
return deferred.promise();
|
||||
}
|
||||
|
||||
window.IapManager = {
|
||||
isPurchaseAvailable: isPurchaseAvailable,
|
||||
getProductInfo: getProduct,
|
||||
beginPurchase: beginPurchase,
|
||||
restorePurchase: restorePurchase
|
||||
restorePurchase: restorePurchase,
|
||||
getStoreFeatureId: getStoreFeatureId,
|
||||
getSubscriptionOptions: getSubscriptionOptions
|
||||
};
|
||||
|
||||
initializeStore();
|
||||
|
|
|
|||
10
dashboard-ui/cordova/ios/backgroundfetch.js
vendored
10
dashboard-ui/cordova/ios/backgroundfetch.js
vendored
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
function onDeviceReady() {
|
||||
|
||||
var fetcher = window.BackgroundFetch;
|
||||
//var fetcher = window.BackgroundFetch;
|
||||
|
||||
fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
|
||||
stopOnTerminate: false // <-- false is default
|
||||
});
|
||||
//fetcher.configure(onBackgroundFetch, onBackgroundFetchFailed, {
|
||||
// stopOnTerminate: false // <-- false is default
|
||||
//});
|
||||
}
|
||||
|
||||
function onSyncFinish() {
|
||||
|
|
@ -86,7 +86,7 @@
|
|||
});
|
||||
});
|
||||
|
||||
pageClassOn('pageshow', "page", function () {
|
||||
pageClassOn('pageshow', "libraryPage", function () {
|
||||
|
||||
if (!Dashboard.getCurrentUserId()) {
|
||||
return;
|
||||
|
|
|
|||
2
dashboard-ui/cordova/localassetmanager.js
vendored
2
dashboard-ui/cordova/localassetmanager.js
vendored
|
|
@ -523,7 +523,7 @@
|
|||
function downloadFile(url, localPath, enableBackground, enableNewDownloads) {
|
||||
|
||||
if (!enableBackground) {
|
||||
return downloadWithFileTransfer(url, localPath);
|
||||
return downloadWithFileTransfer(url, localPath, enableBackground);
|
||||
}
|
||||
|
||||
var deferred = DeferredBuilder.Deferred();
|
||||
|
|
|
|||
17
dashboard-ui/cordova/prompt.js
vendored
Normal file
17
dashboard-ui/cordova/prompt.js
vendored
Normal file
|
|
@ -0,0 +1,17 @@
|
|||
define([], function () {
|
||||
return function (options) {
|
||||
|
||||
var callback = function (result) {
|
||||
|
||||
if (result.buttonIndex == 1) {
|
||||
options.callback(result.input1);
|
||||
} else {
|
||||
options.callback(null);
|
||||
}
|
||||
};
|
||||
|
||||
var buttonLabels = [Globalize.translate('ButtonOk'), Globalize.translate('ButtonCancel')];
|
||||
|
||||
navigator.notification.prompt(options.text, callback, options.title, buttonLabels, options.defaultText || '');
|
||||
};
|
||||
});
|
||||
245
dashboard-ui/cordova/registrationservices.js
vendored
245
dashboard-ui/cordova/registrationservices.js
vendored
|
|
@ -1,86 +1,56 @@
|
|||
(function () {
|
||||
|
||||
function isAndroid() {
|
||||
|
||||
return $.browser.android;
|
||||
}
|
||||
|
||||
function getPremiumUnlockFeatureId() {
|
||||
|
||||
if (isAndroid()) {
|
||||
return "com.mb.android.unlock";
|
||||
}
|
||||
|
||||
return 'appunlock';
|
||||
}
|
||||
|
||||
function validatePlayback(deferred) {
|
||||
|
||||
// Don't require validation on android
|
||||
if (isAndroid()) {
|
||||
deferred.resolve();
|
||||
return;
|
||||
}
|
||||
|
||||
validateFeature(getPremiumUnlockFeatureId(), deferred);
|
||||
}
|
||||
|
||||
function validateLiveTV(deferred) {
|
||||
|
||||
validateFeature(getPremiumUnlockFeatureId(), deferred);
|
||||
}
|
||||
|
||||
function validateServerManagement(deferred) {
|
||||
deferred.resolve();
|
||||
}
|
||||
|
||||
function getRegistrationInfo(feature, enableSupporterUnlock) {
|
||||
function getRegistrationInfo(feature) {
|
||||
|
||||
if (!enableSupporterUnlock) {
|
||||
var deferred = $.Deferred();
|
||||
deferred.resolveWith(null, [{}]);
|
||||
return deferred.promise();
|
||||
}
|
||||
return ConnectionManager.getRegistrationInfo(feature, ApiClient);
|
||||
}
|
||||
|
||||
var validatedFeatures = [];
|
||||
|
||||
function validateFeature(id, deferred) {
|
||||
function validateFeature(feature, deferred) {
|
||||
|
||||
if (validatedFeatures.indexOf(id) != -1) {
|
||||
var id = IapManager.getStoreFeatureId(feature);
|
||||
|
||||
if (validatedFeatures.indexOf(feature) != -1) {
|
||||
deferred.resolve();
|
||||
return;
|
||||
}
|
||||
|
||||
var info = IapManager.getProductInfo(id) || {};
|
||||
var info = IapManager.getProductInfo(feature) || {};
|
||||
|
||||
if (info.owned) {
|
||||
notifyServer(id);
|
||||
validatedFeatures.push(id);
|
||||
validatedFeatures.push(feature);
|
||||
deferred.resolve();
|
||||
return;
|
||||
}
|
||||
|
||||
var productInfo = {
|
||||
enableSupporterUnlock: true,
|
||||
enableAppUnlock: IapManager.isPurchaseAvailable(id),
|
||||
enableAppUnlock: IapManager.isPurchaseAvailable(feature),
|
||||
id: id,
|
||||
price: info.price
|
||||
price: info.price,
|
||||
feature: feature
|
||||
};
|
||||
|
||||
var prefix = isAndroid() ? 'android' : 'ios';
|
||||
var prefix = $.browser.android ? 'android' : 'ios';
|
||||
|
||||
// Get supporter status
|
||||
getRegistrationInfo(prefix + 'appunlock', productInfo.enableSupporterUnlock).done(function (registrationInfo) {
|
||||
getRegistrationInfo(prefix + 'appunlock').done(function (registrationInfo) {
|
||||
|
||||
if (registrationInfo.IsRegistered) {
|
||||
validatedFeatures.push(id);
|
||||
validatedFeatures.push(feature);
|
||||
deferred.resolve();
|
||||
return;
|
||||
}
|
||||
|
||||
showInAppPurchaseInfo(productInfo, registrationInfo, deferred);
|
||||
IapManager.getSubscriptionOptions().done(function (subscriptionOptions) {
|
||||
|
||||
showInAppPurchaseInfo(productInfo, subscriptionOptions, registrationInfo, deferred);
|
||||
});
|
||||
|
||||
}).fail(function () {
|
||||
deferred.reject();
|
||||
|
|
@ -114,42 +84,32 @@
|
|||
});
|
||||
}
|
||||
|
||||
function getInAppPurchaseElement(info) {
|
||||
function getInAppPurchaseElement(info, subscriptionOptions) {
|
||||
|
||||
cancelInAppPurchase();
|
||||
var dlg = PaperDialogHelper.createDialog();
|
||||
|
||||
var html = '';
|
||||
html += '<div class="inAppPurchaseOverlay" style="background-image:url(css/images/splash.jpg);top:0;left:0;right:0;bottom:0;position:fixed;background-position:center center;background-size:100% 100%;background-repeat:no-repeat;z-index:999999;">';
|
||||
html += '<div class="inAppPurchaseOverlayInner" style="background:rgba(10,10,10,.8);width:100%;height:100%;color:#eee;">';
|
||||
html += '<h2 class="dialogHeader">';
|
||||
html += '<paper-fab icon="arrow-back" class="mini btnCloseDialog"></paper-fab>';
|
||||
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + Globalize.translate('HeaderUnlockApp') + '</div>';
|
||||
html += '</h2>';
|
||||
|
||||
html += '<div class="editorContent">';
|
||||
|
||||
html += '<div class="inAppPurchaseForm" style="margin: 0 auto;padding: 30px 1em 0;">';
|
||||
|
||||
html += '<h1 style="color:#fff;">' + Globalize.translate('HeaderUnlockApp') + '</h1>';
|
||||
|
||||
html += '<form style="max-width: 800px;margin:auto;">';
|
||||
html += '<p style="margin:2em 0;">';
|
||||
|
||||
var showSupporterInfo = info.enableSupporterUnlock && !$.browser.safari;
|
||||
|
||||
if (showSupporterInfo && info.enableAppUnlock) {
|
||||
if (info.enableAppUnlock) {
|
||||
html += Globalize.translate('MessageUnlockAppWithPurchaseOrSupporter');
|
||||
}
|
||||
else if (showSupporterInfo) {
|
||||
else {
|
||||
html += Globalize.translate('MessageUnlockAppWithSupporter');
|
||||
} else if (info.enableAppUnlock) {
|
||||
html += Globalize.translate('MessageUnlockAppWithPurchase');
|
||||
} else {
|
||||
html += '<span style="color:red;">';
|
||||
html += Globalize.translate('MessagePaymentServicesUnavailable');
|
||||
html += '</span>';
|
||||
}
|
||||
html += '</p>';
|
||||
|
||||
if (showSupporterInfo) {
|
||||
html += '<p style="margin:2em 0;">';
|
||||
html += Globalize.translate('MessageToValidateSupporter');
|
||||
html += '</p>';
|
||||
}
|
||||
html += '<p style="margin:2em 0;">';
|
||||
html += Globalize.translate('MessageToValidateSupporter');
|
||||
html += '</p>';
|
||||
|
||||
if (info.enableAppUnlock) {
|
||||
|
||||
|
|
@ -158,76 +118,118 @@
|
|||
unlockText = Globalize.translate('ButtonUnlockPrice', info.price);
|
||||
}
|
||||
html += '<p>';
|
||||
html += '<paper-button raised class="secondary block btnAppUnlock"><iron-icon icon="check"></iron-icon><span>' + unlockText + '</span></paper-button>';
|
||||
html += '<paper-button raised class="secondary block btnPurchase" data-feature="' + info.feature + '"><iron-icon icon="check"></iron-icon><span>' + unlockText + '</span></paper-button>';
|
||||
html += '</p>';
|
||||
|
||||
if (IapManager.restorePurchase) {
|
||||
html += '<p>';
|
||||
html += '<paper-button raised class="secondary block btnRestorePurchase" style="background-color: #673AB7;"><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonRestorePreviousPurchase') + '</span></paper-button>';
|
||||
html += '</p>';
|
||||
}
|
||||
}
|
||||
|
||||
html += '<p>';
|
||||
html += '<paper-button raised class="cancelDark block btnCancel"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></paper-button>';
|
||||
html += '</p>';
|
||||
for (var i = 0, length = subscriptionOptions.length; i < length; i++) {
|
||||
|
||||
html += '<p>';
|
||||
html += '<paper-button raised class="submit block btnPurchase" data-email="true" data-feature="' + subscriptionOptions[i].feature + '"><iron-icon icon="check"></iron-icon><span>';
|
||||
html += subscriptionOptions[i].buttonText;
|
||||
html += '</span></paper-button>';
|
||||
html += '</p>';
|
||||
}
|
||||
|
||||
if (IapManager.restorePurchase) {
|
||||
html += '<p>';
|
||||
html += '<paper-button raised class="secondary block btnRestorePurchase" style="background-color: #673AB7;"><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonRestorePreviousPurchase') + '</span></paper-button>';
|
||||
html += '</p>';
|
||||
}
|
||||
|
||||
html += '</form>';
|
||||
html += '</div>';
|
||||
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
dlg.innerHTML = html;
|
||||
document.body.appendChild(dlg);
|
||||
|
||||
$(document.body).append(html);
|
||||
// init dlg content here
|
||||
|
||||
return $('.inAppPurchaseOverlay');
|
||||
PaperDialogHelper.openWithHash(dlg, 'iap');
|
||||
|
||||
$('.btnCloseDialog', dlg).on('click', function () {
|
||||
|
||||
PaperDialogHelper.close(dlg);
|
||||
});
|
||||
|
||||
dlg.classList.add('inAppPurchaseOverlay');
|
||||
|
||||
return dlg;
|
||||
}
|
||||
|
||||
function cancelInAppPurchase() {
|
||||
|
||||
$('.inAppPurchaseOverlay').remove();
|
||||
var elem = document.querySelector('.inAppPurchaseOverlay');
|
||||
if (elem) {
|
||||
PaperDialogHelper.close(elem);
|
||||
}
|
||||
}
|
||||
|
||||
var currentDisplayingProductInfo = null;
|
||||
var currentDisplayingProductInfos = [];
|
||||
var currentDisplayingDeferred = null;
|
||||
var isCancelled = true;
|
||||
|
||||
function clearCurrentDisplayingInfo() {
|
||||
currentDisplayingProductInfo = null;
|
||||
currentDisplayingProductInfos = [];
|
||||
currentDisplayingDeferred = null;
|
||||
}
|
||||
|
||||
function showInAppPurchaseInfo(info, serverRegistrationInfo, deferred) {
|
||||
function showInAppPurchaseInfo(info, subscriptionOptions, serverRegistrationInfo, deferred) {
|
||||
|
||||
var elem = getInAppPurchaseElement(info);
|
||||
require(['components/paperdialoghelper'], function () {
|
||||
|
||||
currentDisplayingProductInfo = info;
|
||||
currentDisplayingDeferred = deferred;
|
||||
|
||||
$('.btnAppUnlock', elem).on('click', function () {
|
||||
|
||||
IapManager.beginPurchase(info.id);
|
||||
});
|
||||
|
||||
$('.btnRestorePurchase', elem).on('click', function () {
|
||||
|
||||
IapManager.restorePurchase(info.id);
|
||||
});
|
||||
|
||||
$('.btnCancel', elem).on('click', function () {
|
||||
|
||||
clearCurrentDisplayingInfo();
|
||||
cancelInAppPurchase();
|
||||
isCancelled = true;
|
||||
|
||||
deferred.reject();
|
||||
});
|
||||
$('.btnSignInSupporter', elem).on('click', function () {
|
||||
var elem = getInAppPurchaseElement(info, subscriptionOptions);
|
||||
|
||||
clearCurrentDisplayingInfo();
|
||||
// clone
|
||||
currentDisplayingProductInfos = subscriptionOptions.slice(0);
|
||||
currentDisplayingProductInfos.push(info);
|
||||
|
||||
Dashboard.alert({
|
||||
message: Globalize.translate('MessagePleaseSignInLocalNetwork'),
|
||||
callback: function () {
|
||||
currentDisplayingDeferred = deferred;
|
||||
|
||||
$('.btnPurchase', elem).on('click', function () {
|
||||
|
||||
isCancelled = false;
|
||||
|
||||
if (this.getAttribute('data-email') == 'true') {
|
||||
promptForEmail(this.getAttribute('data-feature'));
|
||||
} else {
|
||||
IapManager.beginPurchase(this.getAttribute('data-feature'));
|
||||
}
|
||||
});
|
||||
|
||||
$('.btnRestorePurchase', elem).on('click', function () {
|
||||
|
||||
isCancelled = false;
|
||||
IapManager.restorePurchase(info.feature);
|
||||
});
|
||||
|
||||
$(elem).on('iron-overlay-closed', function () {
|
||||
|
||||
if (isCancelled) {
|
||||
clearCurrentDisplayingInfo();
|
||||
cancelInAppPurchase();
|
||||
Dashboard.logout();
|
||||
|
||||
deferred.reject();
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function promptForEmail(feature) {
|
||||
|
||||
require(['prompt'], function (prompt) {
|
||||
|
||||
prompt({
|
||||
text: Globalize.translate('TextPleaseEnterYourEmailAddressForSubscription'),
|
||||
title: Globalize.translate('HeaderEmailAddress'),
|
||||
callback: function(email) {
|
||||
|
||||
if (email) {
|
||||
IapManager.beginPurchase(this.getAttribute('data-feature'), email);
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
@ -235,12 +237,15 @@
|
|||
|
||||
function onProductUpdated(e, product) {
|
||||
|
||||
var currentInfo = currentDisplayingProductInfo;
|
||||
var deferred = currentDisplayingDeferred;
|
||||
|
||||
if (currentInfo && deferred) {
|
||||
if (product.owned && product.id == currentInfo.id) {
|
||||
if (deferred && product.owned) {
|
||||
|
||||
if (currentDisplayingProductInfos.filter(function (p) {
|
||||
|
||||
return product.id == p.id;
|
||||
|
||||
}).length) {
|
||||
clearCurrentDisplayingInfo();
|
||||
cancelInAppPurchase();
|
||||
deferred.resolve();
|
||||
|
|
@ -305,11 +310,9 @@
|
|||
var deferred = DeferredBuilder.Deferred();
|
||||
|
||||
if (name == 'playback') {
|
||||
validatePlayback(deferred);
|
||||
validateFeature(name, deferred);
|
||||
} else if (name == 'livetv') {
|
||||
validateLiveTV(deferred);
|
||||
} else if (name == 'manageserver') {
|
||||
validateServerManagement(deferred);
|
||||
validateFeature(name, deferred);
|
||||
} else if (name == 'sync') {
|
||||
validateSync(deferred);
|
||||
} else {
|
||||
|
|
@ -324,7 +327,7 @@
|
|||
Events.on(IapManager, 'productupdated', onProductUpdated);
|
||||
}
|
||||
|
||||
if (isAndroid()) {
|
||||
if ($.browser.android) {
|
||||
requirejs(['cordova/android/iap'], onIapManagerLoaded);
|
||||
} else {
|
||||
requirejs(['cordova/iap'], onIapManagerLoaded);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue