Skip to content

Commit 208a46c

Browse files
committed
v2.0.2
- Support for `dburles:mongo-collection-instances`, see #28 , thanks to @jankapunkt - `dburles:mongo-collection-instances` is possible fix for issues like #19
1 parent ac6a073 commit 208a46c

File tree

4 files changed

+19
-27
lines changed

4 files changed

+19
-27
lines changed

.versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ mongo-id@1.0.6
4141
npm-mongo@2.2.30
4242
observe-sequence@1.0.16
4343
ordered-dict@1.0.9
44-
ostrio:autoform-files@2.0.1
44+
ostrio:autoform-files@2.0.2
4545
ostrio:cookies@2.2.2
46-
ostrio:files@1.8.1
46+
ostrio:files@1.8.2
4747
promise@0.8.9
4848
random@1.0.10
4949
reactive-dict@1.1.9

README.md

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,34 +21,35 @@ SimpleSchema.setDefaultMessages({
2121
```
2222
- Create your Files Collection (See [`ostrio:files`](https://github.com/VeliovGroup/Meteor-Files))
2323
```javascript
24-
var Images = new FilesCollection({
24+
const Images = new FilesCollection({
2525
collectionName: 'Images',
2626
allowClientCode: true, // Required to let you remove uploaded file
27-
onBeforeUpload: function (file) {
27+
onBeforeUpload(file) {
2828
// Allow upload files under 10MB, and only in png/jpg/jpeg formats
2929
if (file.size <= 10485760 && /png|jpg|jpeg/i.test(file.ext)) {
3030
return true;
3131
} else {
3232
return 'Please upload image, with size equal or less than 10MB';
3333
}
3434
}
35-
})
36-
37-
// if you want to make use of dburles:mongo-collection-instances
38-
// you need to create a 'parent' reference to the underlying collection
39-
Images.collection.filesCollection = Images;
35+
});
4036

4137
if (Meteor.isClient) {
4238
Meteor.subscribe('files.images.all');
4339
}
4440

4541
if (Meteor.isServer) {
46-
Meteor.publish('files.images.all', function () {
42+
Meteor.publish('files.images.all', () => {
4743
return Images.collection.find({});
4844
});
4945
}
5046
```
51-
__Note:__ If you don't use Mongo Collection instances, then the `Images` variable must be attached to *Global* scope. And has same name (*case-sensitive*) as `collectionName` option passed into `FilesCollection#insert({collectionName: 'Images'})` method, `Images` in our case.
47+
__Note:__ If you don't use Mongo Collection instances (`dburles:mongo-collection-instances`), then the `Images` variable must be attached to *Global* scope. And has same name (*case-sensitive*) as `collectionName` option passed into `FilesCollection#insert({collectionName: 'Images'})` method, `Images` in our case.
48+
49+
To start using `dburles:mongo-collection-instances` simply install it:
50+
```shell
51+
meteor add dburles:mongo-collection-instances
52+
```
5253

5354

5455
- Define your schema and set the `autoform` property like in the example below

lib/client/fileUpload.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Template.afFileUpload.onCreated(function () {
1111
atts: {}
1212
};
1313
}
14-
console.log(this.data);
14+
1515
this.collection = Mongo.Collection.get
1616
? Mongo.Collection.get(this.data.atts.collection).filesCollection
17-
: Meteor.connection._mongo_livedata_collections[this.data.atts.collection];
17+
: (global[this.data.atts.collection] || Meteor.connection._mongo_livedata_collections[this.data.atts.collection].filesCollection);
1818
this.uploadTemplate = this.data.atts.uploadTemplate || null;
1919
this.previewTemplate = this.data.atts.previewTemplate || null;
2020

@@ -47,12 +47,9 @@ Template.afFileUpload.helpers({
4747
return Template.instance().fileId.get() || this.value;
4848
},
4949
uploadedFile() {
50-
var collectionName = Template.instance().collectionName();
51-
var collection = Mongo.Collection.get
52-
? Mongo.Collection.get(collectionName).filesCollection
53-
: global[collectionName];
54-
return collection.findOne({
55-
_id: Template.instance().fileId.get() || this.value
50+
const template = Template.instance();
51+
return template.collection.findOne({
52+
_id: template.fileId.get() || this.value
5653
});
5754
}
5855
});
@@ -75,13 +72,7 @@ Template.afFileUpload.events({
7572
},
7673
'change [data-files-collection-upload]'(e, template) {
7774
if (e.currentTarget.files && e.currentTarget.files[0]) {
78-
79-
var collectionName = template.collectionName();
80-
var collection = Mongo.Collection.get
81-
? Mongo.Collection.get(collectionName)
82-
: global[template.collectionName()];
83-
84-
var upload = collection.filesCollection.insert({
75+
const upload = template.collection.insert({
8576
file: e.currentTarget.files[0],
8677
streams: 'dynamic',
8778
chunkSize: 'dynamic'

package.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Package.onUse(function(api) {
1717
'reactive-var',
1818
'templating',
1919
'aldeed:autoform@6.2.0',
20-
'ostrio:files@1.8.1'
20+
'ostrio:files@1.8.2'
2121
]);
2222

2323
api.addFiles([

0 commit comments

Comments
 (0)