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

update search css loading

Browse source
This commit is contained in:
Luke Pulverenti 2015-12-02 15:50:25 -05:00
parent 96eb9ea63a
commit 3118991c21
15 changed files with 161 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/cordova/android/iap.js vendored
View file

@ -110,7 +110,7 @@
function isUnlockedOverride(feature) {
if (feature == 'playback' || feature == 'livetv') {
if (feature == 'playback') {
return isPlaybackUnlockedViaOldApp();
} else {
return new Promise(function (resolve, reject) {

73
dashboard-ui/cordova/fileupload.js vendored
View file

@ -6,57 +6,56 @@
self.upload = function (path, name, url) {
var deferred = DeferredBuilder.Deferred();
return new Promise(function (resolve, reject) {
resolveLocalFileSystemURL(path, function (fileEntry) {
resolveLocalFileSystemURL(path, function (fileEntry) {
fileEntry.file(function (file) {
fileEntry.file(function (file) {
var mimeType = (file.type || '');
var mimeType = (file.type || '');
if (mimeType.indexOf('image/') != 0) {
Logger.log('Skipping upload because file is not an image. path: ' + path + ' mimeType: ' + mimeType);
deferred.reject();
return;
}
if (mimeType.indexOf('image/') != 0) {
Logger.log('Skipping upload because file is not an image. path: ' + path + ' mimeType: ' + mimeType);
reject();
return;
}
Logger.log('mimeType for file ' + path + ' is ' + file);
Logger.log('mimeType for file ' + path + ' is ' + file);
var onSuccess = function (r) {
console.log("Code = " + r.responseCode);
console.log("Response = " + r.response);
console.log("Sent = " + r.bytesSent);
deferred.resolve();
}
var onSuccess = function (r) {
console.log("Code = " + r.responseCode);
console.log("Response = " + r.response);
console.log("Sent = " + r.bytesSent);
resolve();
}
var onFail = function (error) {
console.log("upload error source " + error.source);
console.log("upload error target " + error.target);
deferred.reject();
}
var onFail = function (error) {
console.log("upload error source " + error.source);
console.log("upload error target " + error.target);
reject();
}
var options = new FileUploadOptions();
options.fileKey = "file";
options.fileName = name;
options.mimeType = mimeType;
var options = new FileUploadOptions();
options.fileKey = "file";
options.fileName = name;
options.mimeType = mimeType;
var params = {};
options.params = params;
var params = {};
options.params = params;
new FileTransfer().upload(path, url, onSuccess, onFail, options);
new FileTransfer().upload(path, url, onSuccess, onFail, options);
}, function () {
Logger.log('File upload failed. fileEntry.file returned an error');
reject();
});
}, function () {
Logger.log('File upload failed. fileEntry.file returned an error');
deferred.reject();
Logger.log('File upload failed. resolveLocalFileSystemURL returned an error');
reject();
});
}, function () {
Logger.log('File upload failed. resolveLocalFileSystemURL returned an error');
deferred.reject();
});
return deferred.promise();
};
}

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

@ -124,7 +124,7 @@
} else {
promise = fetch("http://mb3admin.com/admin/service/appstore/register", {
method: 'POST',
body: JSON.stringify(postData),
headers: {
@ -250,35 +250,37 @@
}
function getSubscriptionOptions() {
var deferred = DeferredBuilder.Deferred();
var options = [];
return new Promise(function (resolve, reject) {
options.push({
feature: 'embypremieremonthly',
buttonText: 'EmbyPremiereMonthlyWithPrice'
var options = [];
options.push({
feature: 'embypremieremonthly',
buttonText: 'EmbyPremiereMonthlyWithPrice'
});
options = options.filter(function (o) {
return getProduct(o.feature) != null;
}).map(function (o) {
o.id = getStoreFeatureId(o.feature);
o.buttonText = Globalize.translate(o.buttonText, getProduct(o.feature).price);
o.owned = getProduct(o.feature).owned;
return o;
});
resolve(options);
});
options = options.filter(function (o) {
return getProduct(o.feature) != null;
}).map(function (o) {
o.id = getStoreFeatureId(o.feature);
o.buttonText = Globalize.translate(o.buttonText, getProduct(o.feature).price);
o.owned = getProduct(o.feature).owned;
return o;
});
deferred.resolveWith(null, [options]);
return deferred.promise();
}
function isUnlockedOverride(feature) {
var deferred = DeferredBuilder.Deferred();
deferred.resolveWith(null, [false]);
return deferred.promise();
return new Promise(function (resolve, reject) {
resolve(false);
});
}
window.IapManager = {