Merge branch 'master' into master

Author: jankapunkt

.versions

@@ -41,9 +41,9 @@ mongo-id@1.0.6
 npm-mongo@2.2.30
 observe-sequence@1.0.16
 ordered-dict@1.0.9
-ostrio:autoform-files@2.0.1
+ostrio:autoform-files@2.0.2
 ostrio:cookies@2.2.2
-ostrio:files@1.8.1
+ostrio:files@1.8.2
 promise@0.8.9
 random@1.0.10
 reactive-dict@1.1.9

README.md

@@ -21,34 +21,35 @@ SimpleSchema.setDefaultMessages({
 ```
  - Create your Files Collection (See [`ostrio:files`](https://github.com/VeliovGroup/Meteor-Files))
 ```javascript
-var Images = new FilesCollection({
+const Images = new FilesCollection({
   collectionName: 'Images',
   allowClientCode: true, // Required to let you remove uploaded file
-  onBeforeUpload: function (file) {
+  onBeforeUpload(file) {
     // Allow upload files under 10MB, and only in png/jpg/jpeg formats
     if (file.size <= 10485760 && /png|jpg|jpeg/i.test(file.ext)) {
       return true;
     } else {
       return 'Please upload image, with size equal or less than 10MB';
     }
   }
-})
-
-// if you want to make use of dburles:mongo-collection-instances
-// you need to create a 'parent' reference to the underlying collection
-Images.collection.filesCollection = Images;
+});
 
 if (Meteor.isClient) {
   Meteor.subscribe('files.images.all');
 }
 
 if (Meteor.isServer) {
-  Meteor.publish('files.images.all', function () {
+  Meteor.publish('files.images.all', () => {
     return Images.collection.find({});
   });
 }
 ```
-__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.
+__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.
+
+To start using `dburles:mongo-collection-instances` simply install it:
+```shell
+meteor add dburles:mongo-collection-instances
+```
 
 
  - Define your schema and set the `autoform` property like in the example below

lib/client/fileUpload.js

@@ -11,10 +11,10 @@ Template.afFileUpload.onCreated(function () {
       atts: {}
     };
   }
-  console.log(this.data);
+
   this.collection      = Mongo.Collection.get
     ? Mongo.Collection.get(this.data.atts.collection).filesCollection
-    : Meteor.connection._mongo_livedata_collections[this.data.atts.collection];
+    : (global[this.data.atts.collection] || Meteor.connection._mongo_livedata_collections[this.data.atts.collection].filesCollection);
   this.uploadTemplate  = this.data.atts.uploadTemplate || null;
   this.previewTemplate = this.data.atts.previewTemplate || null;
 
@@ -47,15 +47,10 @@ Template.afFileUpload.helpers({
     return Template.instance().fileId.get() || this.value;
   },
   uploadedFile() {
-    var collectionName = Template.instance().collectionName();
-    var collection = Mongo.Collection.get
-      ? Mongo.Collection.get(collectionName).filesCollection
-      : global[collectionName];
-    if (!collectionName || !collection) return null;
-
-    var _id = Template.instance().fileId.get() || this.value;
+    const template = Template.instance();
+    var _id = template.fileId.get() || this.value;
     if (typeof _id !== 'string' || _id.length === 0) return null;
-    return collection.findOne({_id:_id});
+    return template.collection.findOne({_id:_id});
   }
 });
 
@@ -77,13 +72,7 @@ Template.afFileUpload.events({
   },
   'change [data-files-collection-upload]'(e, template) {
     if (e.currentTarget.files && e.currentTarget.files[0]) {
-
-      var collectionName = template.collectionName();
-      var collection = Mongo.Collection.get
-        ? Mongo.Collection.get(collectionName)
-        : global[template.collectionName()];
-
-      var upload = collection.filesCollection.insert({
+      const upload = template.collection.insert({
         file: e.currentTarget.files[0],
         streams: 'dynamic',
         chunkSize: 'dynamic'