v2.0.1

 - Compatibility with `meteor@1.5.1`
 - Update `aldeed:autoform` to `v6.2.0`
 - Update `ostrio:file` to `v1.8.1`

Author: dr-dimitru

.versions

@@ -1,62 +1,62 @@
-aldeed:autoform@5.8.1
-aldeed:simple-schema@1.1.0
-allow-deny@1.0.5
-babel-compiler@6.9.0
-babel-runtime@0.1.10
-base64@1.0.9
-binary-heap@1.0.9
-blaze@2.1.8
-blaze-tools@1.0.9
-boilerplate-generator@1.0.9
-caching-compiler@1.1.6
+aldeed:autoform@6.2.0
+allow-deny@1.0.6
+babel-compiler@6.19.4
+babel-runtime@1.0.1
+base64@1.0.10
+binary-heap@1.0.10
+blaze@2.3.2
+blaze-tools@1.0.10
+boilerplate-generator@1.1.1
+caching-compiler@1.1.9
 caching-html-compiler@1.0.6
-callback-hook@1.0.9
-check@1.2.3
-coffeescript@1.2.3
-ddp@1.2.5
-ddp-client@1.2.5
-ddp-common@1.2.5
-ddp-server@1.2.6
+callback-hook@1.0.10
+check@1.2.5
+coffeescript@1.11.1_3
+ddp@1.3.0
+ddp-client@2.0.0
+ddp-common@1.2.9
+ddp-server@2.0.0
 deps@1.0.12
-diff-sequence@1.0.6
-ecmascript@0.5.7
-ecmascript-runtime@0.3.12
-ejson@1.0.12
-geojson-utils@1.0.9
-html-tools@1.0.10
-htmljs@1.0.10
-http@1.2.8
-id-map@1.0.8
-jquery@1.11.9
-livedata@1.0.15
-logging@1.1.14
-meteor@1.2.16
-minifier-js@1.1.13
-minimongo@1.0.17
-modules@0.7.5
-modules-runtime@0.7.5
+diff-sequence@1.0.7
+ecmascript@0.8.1
+ecmascript-runtime@0.4.1
+ecmascript-runtime-client@0.4.3
+ecmascript-runtime-server@0.4.1
+ejson@1.0.13
+geojson-utils@1.0.10
+html-tools@1.0.11
+htmljs@1.0.11
+http@1.2.12
+id-map@1.0.9
+jquery@1.11.10
+livedata@1.0.18
+logging@1.1.17
+meteor@1.7.0
+minimongo@1.2.1
+modules@0.9.2
+modules-runtime@0.8.0
 momentjs:moment@2.10.6
-mongo@1.1.10
-mongo-id@1.0.5
-npm-mongo@1.5.45
-observe-sequence@1.0.12
-ordered-dict@1.0.8
-ostrio:autoform-files@1.0.12
-ostrio:cookies@2.1.3
-ostrio:files@1.7.11
-promise@0.8.3
+mongo@1.1.19
+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:cookies@2.2.2
+ostrio:files@1.8.1
+promise@0.8.9
 random@1.0.10
-reactive-dict@1.1.3
-reactive-var@1.0.10
-retry@1.0.7
-routepolicy@1.0.11
-spacebars@1.0.12
-spacebars-compiler@1.0.12
+reactive-dict@1.1.9
+reactive-var@1.0.11
+retry@1.0.9
+routepolicy@1.0.12
+spacebars@1.0.15
+spacebars-compiler@1.1.2
 templating@1.2.13
-templating-tools@1.0.4
-tracker@1.1.0
-ui@1.0.11
-underscore@1.0.9
-url@1.0.10
-webapp@1.3.10
+templating-tools@1.1.1
+tracker@1.1.3
+ui@1.0.13
+underscore@1.0.10
+url@1.1.0
+webapp@1.3.17
 webapp-hashing@1.0.9

lib/client/autoform.js

@@ -1,5 +1,15 @@
+import { AutoForm } from 'meteor/aldeed:autoform';
+
+if (!global.Buffer) {
+  global.Buffer = function () {};
+  global.Buffer.isBuffer = () => false;
+}
+
 AutoForm.addInputType('fileUpload', {
-  template: 'afFileUpload'
+  template: 'afFileUpload',
+  valueOut() {
+    return this.val();
+  }
 });
 
 AutoForm._globalHooks.onSuccess.push(function (type) {

lib/client/fileUpload.js

@@ -1,3 +1,9 @@
+import { $ }           from 'meteor/jquery';
+import { Meteor }      from 'meteor/meteor';
+import { AutoForm }    from 'meteor/aldeed:autoform';
+import { Template }    from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+
 Template.afFileUpload.onCreated(function () {
   if (!this.data) {
     this.data = {
@@ -20,23 +26,24 @@ Template.afFileUpload.onCreated(function () {
   this.currentUpload  = new ReactiveVar(false);
   this.inputName      = this.data.name;
   this.fileId         = new ReactiveVar(this.data.value || false);
+  this.formId         = this.data.atts.id;
   return;
 });
 
 Template.afFileUpload.helpers({
-  previewTemplate: function () {
+  previewTemplate() {
     return Template.instance().previewTemplate;
   },
-  uploadTemplate: function () {
+  uploadTemplate() {
     return Template.instance().uploadTemplate;
   },
-  currentUpload: function () {
+  currentUpload() {
     return Template.instance().currentUpload.get();
   },
-  fileId: function () {
+  fileId() {
     return Template.instance().fileId.get() || this.value;
   },
-  uploadedFile: function () {
+  uploadedFile() {
     return global[Template.instance().collectionName()].findOne({
       _id: Template.instance().fileId.get() || this.value
     });
@@ -67,15 +74,17 @@ Template.afFileUpload.events({
         chunkSize: 'dynamic'
       }, false);
 
+      const ctx = AutoForm.getValidationContext(template.formId);
+
       upload.on('start', function () {
-        AutoForm.getValidationContext().reset();
+        ctx.reset();
         template.currentUpload.set(this);
         return;
       });
 
       upload.on('error', function (error) {
-        AutoForm.getValidationContext().reset();
-        AutoForm.getValidationContext().addInvalidKeys([{name: Template.instance().inputName, type: 'uploadError', value: error.reason}]);
+        ctx.reset();
+        ctx.addValidationErrors([{name: template.inputName, type: 'uploadError', value: error.reason}]);
         $(e.currentTarget).val('');
         return;
       });

package.js

@@ -11,11 +11,12 @@ Package.onUse(function(api) {
 
   api.use([
     'check',
+    'ecmascript',
     'underscore',
     'reactive-var',
     'templating',
-    'aldeed:autoform@6.0.0',
-    'ostrio:files@1.7.11'
+    'aldeed:autoform@6.2.0',
+    'ostrio:files@1.8.1'
   ]);
 
   api.addFiles([