Updated: "in derived classes, super() should be called before" (nervgh#492)

Author: nervgh

dist/angular-file-upload.min.js

@@ -1,6 +1,6 @@
 {
     "name": "angular-file-upload",
-    "version": "2.1.2",
+    "version": "2.1.3",
     "homepage": "https://github.com/nervgh/angular-file-upload",
     "description": "Angular File Upload is a module for the AngularJS framework",
     "author": {

dist/angular-file-upload.min.js.map

@@ -5,6 +5,7 @@ import CONFIG from './../config.json';
 
 
 let {
+    extend,
     forEach
     } = angular;
 
@@ -19,17 +20,19 @@ export default (FileDirective) => {
          * @constructor
          */
         constructor(options) {
-            // Map of events
-            this.events = {
-                $destroy: 'destroy',
-                drop: 'onDrop',
-                dragover: 'onDragOver',
-                dragleave: 'onDragLeave'
-            };
-            // Name of property inside uploader._directive object
-            this.prop = 'drop';
+            let extendedOptions = extend(options, {
+                // Map of events
+                events: {
+                    $destroy: 'destroy',
+                    drop: 'onDrop',
+                    dragover: 'onDragOver',
+                    dragleave: 'onDragLeave'
+                },
+                // Name of property inside uploader._directive object
+                prop: 'drop'
+            });
 
-            super(options);
+            super(extendedOptions);
         }
         /**
          * Returns options

package.json

@@ -4,6 +4,11 @@
 import CONFIG from './../config.json';
 
 
+let {
+    extend
+    } = angular;
+
+
 export default (FileDirective) => {
 
 
@@ -14,16 +19,18 @@ export default (FileDirective) => {
          * @constructor
          */
         constructor(options) {
-            // Map of events
-            this.events = {
-                $destroy: 'destroy'
-            };
-            // Name of property inside uploader._directive object
-            this.prop = 'over';
-            // Over class
-            this.overClass = 'nv-file-over';
+            let extendedOptions = extend(options, {
+                // Map of events
+                events: {
+                    $destroy: 'destroy'
+                },
+                // Name of property inside uploader._directive object
+                prop: 'over',
+                // Over class
+                overClass: 'nv-file-over'
+            });
 
-            super(options);
+            super(extendedOptions);
         }
         /**
          * Adds over class

src/services/FileDrop.js

@@ -4,6 +4,11 @@
 import CONFIG from './../config.json';
 
 
+let {
+    extend
+    } = angular;
+
+
 export default (FileDirective) => {
 
 
@@ -14,15 +19,17 @@ export default (FileDirective) => {
          * @constructor
          */
         constructor(options) {
-            // Map of events
-            this.events = {
-                $destroy: 'destroy',
-                change: 'onChange'
-            };
-            // Name of property inside uploader._directive object
-            this.prop = 'select';
+            let extendedOptions = extend(options, {
+                // Map of events
+                events: {
+                    $destroy: 'destroy',
+                    change: 'onChange'
+                },
+                // Name of property inside uploader._directive object
+                prop: 'select'
+            });
 
-            super(options);
+            super(extendedOptions);
 
             if(!this.uploader.isHTML5) {
                 this.element.removeAttr('multiple');