Skip to content

Configure on server startup and check for settings #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
productiveme wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Configure on server startup and check for settings #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
242bdd8
Configure on server startup and check for settings
productiveme Jul 2, 2016
5eff8ca
Preventing error with lepozepo package assuming ops.fields exists
productiveme Jul 3, 2016
ab29469
Fixed image-delete by rename property to public_id (was publicId)
teyrow Jul 29, 2016
c2c1ec4
Fixed upload check-error when progress is undefined
teyrow Jul 29, 2016
def34ae
Merge pull request #1 from teyrow/master
productiveme Jul 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions cloudinary.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ if (Meteor.isClient) {

Cloudinary.upload(files, {
folder: Meteor.settings.public.cloudinary.folder,
fields: {}
}, function (error, result) {
if (error) {
failure(new Meteor.Error('rwatts:orionjs-cloudinary', i18n('filesystem.messages.errorUploading')));
Expand All @@ -13,17 +14,17 @@ if (Meteor.isClient) {
}
Cloudinary.collection.remove({});
});

Tracker.autorun(function () {
var file = Cloudinary.collection.findOne();
if (file) {
progress(file.percent_uploaded);
progress(file.percent_uploaded || 0);
}
});
};

orion.filesystem.providerRemove = function (file, success, failure) {
Cloudinary.delete(file.meta.publicId, function (error, result) {
Cloudinary.delete(file.meta.public_id, function (error, result) {
if (error) {
failure(new Meteor.Error('rwatts:orionjs-cloudinary', i18n('filesystem.messages.errorRemoving')));
} else {
Expand All @@ -34,12 +35,15 @@ if (Meteor.isClient) {
}

if (Meteor.isServer) {
Cloudinary.config({
cloud_name: Meteor.settings.private.cloudinary.cloud_name,
api_key: Meteor.settings.private.cloudinary.api_key,
api_secret: Meteor.settings.private.cloudinary.api_secret
Meteor.startup(function() {
if (Meteor.settings.private && Meteor.settings.private.cloudinary) {
Cloudinary.config({
cloud_name: Meteor.settings.private.cloudinary.cloud_name,
api_key: Meteor.settings.private.cloudinary.api_key,
api_secret: Meteor.settings.private.cloudinary.api_secret
});
}
});

}
if (Meteor.isClient) {
let cloud_name = Meteor.settings.public.cloudinary.cloud_name;
Expand Down
6 changes: 3 additions & 3 deletions package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ Package.onUse(function(api) {
'orionjs:core@1.6.0',
'orionjs:filesystem@1.6.0',
'orionjs:config@1.6.0',
'lepozepo:cloudinary@4.1.3',
'lepozepo:cloudinary@4.2.2',
'ecmascript'
]);

api.addFiles([
'cloudinary.js'
]);

api.mainModule("cloudinary.js", "client");
api.export(['orion', 'Cloudinary']);
});