v1.2.0

Conflicts:
	.npmignore

.config/bundle-system.js

@@ -1,107 +0,0 @@
-#!/usr/bin/env node
-'use strict';
-
-/*eslint no-console: 0, no-sync: 0*/
-
-// System.js bundler
-// simple and yet reusable system.js bundler
-// bundles, minifies and gzips
-
-const fs = require('fs');
-const del = require('del');
-const path = require('path');
-const zlib = require('zlib');
-const async = require('async');
-const Builder = require('systemjs-builder');
-
-const pkg = require('../package.json');
-const name = pkg.name;
-const targetFolder = path.resolve('./bundles');
-
-async.waterfall([
-  cleanBundlesFolder,
-  getSystemJsBundleConfig,
-  buildSystemJs({minify: false, sourceMaps: true, mangle: false}),
-  getSystemJsBundleConfig,
-  buildSystemJs({minify: true, sourceMaps: true, mangle: false}),
-  gzipSystemJsBundle
-], err => {
-  if (err) {
-    throw err;
-  }
-});
-
-function getSystemJsBundleConfig(cb) {
-  const config = {
-    baseURL: '..',
-    transpiler: 'typescript',
-    typescriptOptions: {
-      module: 'cjs'
-    },
-    map: {
-      typescript: path.resolve('node_modules/typescript/lib/typescript.js'),
-      '@angular/core': path.resolve('node_modules/@angular/core/index.js'),
-      '@angular/common': path.resolve('node_modules/@angular/common/index.js'),
-      '@angular/compiler': path.resolve('node_modules/@angular/compiler/index.js'),
-      '@angular/platform-browser': path.resolve('node_modules/@angular/platform-browser/index.js'),
-      '@angular/platform-browser-dynamic': path.resolve('node_modules/@angular/platform-browser-dynamic/'),
-      rxjs: path.resolve('node_modules/rxjs')
-    },
-    paths: {
-      '*': '*.js'
-    }
-  };
-
-  config.meta = ['@angular/common','@angular/compiler','@angular/core',
-    '@angular/platform-browser','@angular/platform-browser-dynamic', 'rxjs'].reduce((memo, currentValue) => {
-    memo[path.resolve(`node_modules/${currentValue}/*`)] = {build: false};
-    return memo;
-  }, {});
-  config.meta.moment = {build: false};
-  return cb(null, config);
-}
-
-function cleanBundlesFolder(cb) {
-  return del(targetFolder)
-    .then(paths => {
-      console.log('Deleted files and folders:\n', paths.join('\n'));
-      cb();
-    });
-}
-
-function buildSystemJs(options) {
-  return (config, cb) => {
-    const minPostFix = options && options.minify ? '.min' : '';
-    const fileName = `${name}${minPostFix}.js`;
-    const dest = path.resolve(__dirname, targetFolder, fileName);
-    const builder = new Builder();
-
-    console.log('Bundling system.js file:', fileName, options);
-    builder.config(config);
-    return builder
-      .bundle([name, name].join('/'), dest, options)
-      .then(() => cb())
-      .catch(cb);
-  };
-}
-
-function gzipSystemJsBundle(cb) {
-  const files = fs
-    .readdirSync(path.resolve(targetFolder))
-    .map(file => path.resolve(targetFolder, file))
-    .filter(file => fs.statSync(file).isFile())
-    .filter(file => path.extname(file) !== 'gz');
-
-  return async.eachSeries(files, (file, gzipcb) => {
-    process.nextTick(() => {
-      console.log('Gzipping ', file);
-      const gzip = zlib.createGzip({level: 9});
-      const inp = fs.createReadStream(file);
-      const out = fs.createWriteStream(`${file}.gz`);
-
-      inp.on('end', () => gzipcb());
-      inp.on('error', err => gzipcb(err));
-      return inp.pipe(gzip).pipe(out);
-    });
-  }, cb);
-}

.eslintrc.json

@@ -1,6 +0,0 @@
-{
-  "extends": "./node_modules/eslint-config-valorsoft/.eslintrc.json",
-  "env": {
-    "node": true
-  }
-}

.gitignore

@@ -1,31 +1,38 @@
 # Dependency directory
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 /node_modules
+/bower_components
+
+# IDEs and editors
+/.idea
+/.vscode
+.project
+.classpath
+*.launch
+.settings/
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
 npm-debug.log
 
-# type script artifacts
-/typings
-
-# WebStorm
-.idea
-
 # ignore build and dist for now
-/bundles
-/demo-build
 /dist
-/coverage
+/temp
-/ts
+/demo/dist
-
+/demo/temp
-# ignore incline compiling
-/demo/**/*.js
-/demo/**/*.d.ts
-/demo/**/*.js.map
-/components/**/*.js
-/components/**/*.d.ts
-/components/**/*.js.map
-ng2-file-upload.js
-ng2-file-upload.d.ts
-ng2-file-upload.js.map
 /logs
 
-!/demo/components/file-upload/file-catcher.js
+#System Files
+.DS_Store
+Thumbs.db
+
+
+/demo/e2e/*.js
+/demo/e2e/*.map
+src/**/*.js
+src/**/*.map
+scripts/**/*.js
+scripts/**/*.map

.npmignore

@@ -1,24 +0,0 @@
-.idea
-gulp-tasks
-logs
-
-# typings
-typings
-
-# testing
-karma.conf.js
-test.bundle.js
-coverage
-
-# demo build
-demo
-demo-build
-webpack.config.js
-
-#typescript sources
-*.ts
-*.js.map
-!*.d.ts
-/components/**/*.ts
-!/components/**/*.d.ts
-

.travis.yml

@@ -2,17 +2,20 @@ language: node_js
 node_js:
   - "6"
 
+before_install:
+  - export CHROME_BIN=chromium-browser
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
 script:
-  - npm run flow.install:typings
+  - npm run pretest
-  - npm test
+  - npm run test-coverage
 
 after_success:
   - ./node_modules/.bin/codecov
 
 addons:
-  # sauce labs tunel connector (read more https://docs.travis-ci.com/user/sauce-connect/ )
+  firefox: "latest"
-  sauce_connect: true
-  firefox: "42.0"
   apt:
     sources:
     - ubuntu-toolchain-r-test

CHANGELOG.md

@@ -1,3 +1,81 @@
+<a name="1.2.0"></a>
+# [1.2.0](https://github.com/valor-software/ng2-file-upload/compare/v1.1.3-0...v1.2.0) (2017-01-17)
+
+
+### Bug Fixes
+
+* **headers:** Add FileItem headers to XHR ([#553](https://github.com/valor-software/ng2-file-upload/issues/553)) ([e4a7099](https://github.com/valor-software/ng2-file-upload/commit/e4a7099)), closes [#552](https://github.com/valor-software/ng2-file-upload/issues/552)
+
+
+### Features
+
+* **file-select:** Clear file select automatically ([#524](https://github.com/valor-software/ng2-file-upload/issues/524)) ([410efda](https://github.com/valor-software/ng2-file-upload/commit/410efda))
+* **fileUpload:** added additionalParameter ([#565](https://github.com/valor-software/ng2-file-upload/issues/565)) ([397de09](https://github.com/valor-software/ng2-file-upload/commit/397de09))
+* **package:** upgrade to ng v2.3+ ([#574](https://github.com/valor-software/ng2-file-upload/issues/574)) ([3cc6a99](https://github.com/valor-software/ng2-file-upload/commit/3cc6a99))
+
+
+
+<a name="1.1.3-0"></a>
+## [1.1.3-0](https://github.com/valor-software/ng2-file-upload/compare/v1.1.2...v1.1.3-0) (2016-10-19)
+
+
+### Bug Fixes
+
+* **typing:** added authTokenHeader property to options and file upload class ([b55c852](https://github.com/valor-software/ng2-file-upload/commit/b55c852))
+
+
+### Features
+
+* **build:** added support for AoT and ng-cli ([f0b2879](https://github.com/valor-software/ng2-file-upload/commit/f0b2879)), closes [#436](https://github.com/valor-software/ng2-file-upload/issues/436)
+* **file-upload:** Add the possibility of set the token header ([#213](https://github.com/valor-software/ng2-file-upload/issues/213)) ([282295c](https://github.com/valor-software/ng2-file-upload/commit/282295c))
+
+
+
+<a name="1.1.2"></a>
+## [1.1.2](https://github.com/valor-software/ng2-file-upload/compare/v1.1.1...v1.1.2) (2016-10-17)
+
+
+### Features
+
+* **package:** allow of ng2 v2.0.* and v2.*.* ([87395e6](https://github.com/valor-software/ng2-file-upload/commit/87395e6))
+
+
+
+<a name="1.1.1"></a>
+## [1.1.1](https://github.com/valor-software/ng2-file-upload/compare/v1.0.3...v1.1.1) (2016-10-17)
+
+
+### Bug Fixes
+
+* **uploader:** Add the ability to upload files via PUT instead of POST ([#239](https://github.com/valor-software/ng2-file-upload/issues/239)) ([e068511](https://github.com/valor-software/ng2-file-upload/commit/e068511))
+* **zone.js:**  error in Safari, Added Typings ([#221](https://github.com/valor-software/ng2-file-upload/issues/221)) ([db77e89](https://github.com/valor-software/ng2-file-upload/commit/db77e89))
+
+
+### Features
+
+* **multipart:** Create disableMultipart option in FileUploader ([#224](https://github.com/valor-software/ng2-file-upload/issues/224)) ([22307d2](https://github.com/valor-software/ng2-file-upload/commit/22307d2))
+* **package:** angular ~2.0.1 stable release ([#425](https://github.com/valor-software/ng2-file-upload/issues/425)) ([3fec385](https://github.com/valor-software/ng2-file-upload/commit/3fec385))
+* **package:** updated to typescript 2 ([4fef496](https://github.com/valor-software/ng2-file-upload/commit/4fef496))
+
+
+
+<a name="1.1.0"></a>
+# [1.1.0](https://github.com/valor-software/ng2-file-upload/compare/v1.0.3...v1.1.0) (2016-09-21)
+
+
+### Bug Fixes
+
+* **uploader:** Add the ability to upload files via PUT instead of POST ([#239](https://github.com/valor-software/ng2-file-upload/issues/239)) ([e068511](https://github.com/valor-software/ng2-file-upload/commit/e068511))
+* **zone.js:**  error in Safari, Added Typings ([#221](https://github.com/valor-software/ng2-file-upload/issues/221)) ([db77e89](https://github.com/valor-software/ng2-file-upload/commit/db77e89))
+
+
+### Features
+
+* **multipart:** Create disableMultipart option in FileUploader ([#224](https://github.com/valor-software/ng2-file-upload/issues/224)) ([22307d2](https://github.com/valor-software/ng2-file-upload/commit/22307d2))
+* **package:** updated to typescript 2 ([4fef496](https://github.com/valor-software/ng2-file-upload/commit/4fef496))
+
+
+
 <a name="1.0.3"></a>
 ## [1.0.3](https://github.com/valor-software/ng2-file-upload/compare/v1.0.2...v1.0.3) (2016-05-12)
 

LICENSE

@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Dmitriy Shekhovtsov <valorkin@gmail.com>
+Copyright (c) 2015-2017 Dmitriy Shekhovtsov <valorkin@gmail.com>
-Copyright (c) 2015 Valor Software
+Copyright (c) 2015-1017 Valor Software
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -37,10 +37,12 @@ Follow me [![twitter](https://img.shields.io/twitter/follow/valorkin.svg?style=s
 
   - `uploader` - (`FileUploader`) - uploader object. See using in [demo](https://github.com/valor-software/ng2-file-upload/blob/master/demo/components/file-upload/simple-demo.ts)
 
-  Parameters that supported by this object:
+  Parameters supported by this object:
 
   1. `url` - URL of File Uploader's route
   2. `authToken` - Auth token that will be applied as 'Authorization' header during file send.
+  3. `disableMultipart` - If 'true', disable using a multipart form for file upload and instead stream the file. Some APIs (e.g. Amazon S3) may expect the file to be streamed rather than sent via a form. Defaults to false.
+  4. `itemAlias` - item alias (form name redefenition)
 
 ### Events
 

angular-cli.json

@@ -0,0 +1,57 @@
+{
+  "project": {
+    "name": "ng2-file-upload"
+  },
+  "apps": [
+    {
+      "root": "demo/src",
+      "outDir": "demo/dist",
+      "assets": [
+        "assets"
+      ],
+      "index": "index.html",
+      "main": "main.ts",
+      "test": "../../scripts/test.ts",
+      "tsconfig": "tsconfig.json",
+      "prefix": "",
+      "mobile": false,
+      "styles": [
+      ],
+      "scripts": [
+      ],
+      "environments": {
+        "source": "environments/environment.ts",
+        "dev": "environments/environment.ts",
+        "prod": "environments/environment.prod.ts"
+      }
+    }
+  ],
+  "addons": [],
+  "packages": [],
+  "e2e": {
+    "protractor": {
+      "config": "protractor.conf.js"
+    }
+  },
+  "test": {
+    "karma": {
+      "config": "karma.conf.js"
+    }
+  },
+  "defaults": {
+    "styleExt": "css",
+    "prefixInterfaces": false,
+    "inline": {
+      "style": false,
+      "template": false
+    },
+    "spec": {
+      "class": false,
+      "component": true,
+      "directive": true,
+      "module": false,
+      "pipe": true,
+      "service": true
+    }
+  }
+}

components/file-upload/file-drop.directive.spec.ts

@@ -1,21 +0,0 @@
-import {Component} from '@angular/core';
-import {it, inject, beforeEachProviders} from '@angular/core/testing';
-import {ComponentFixture} from '@angular/compiler/testing';
-import {FileUploader} from './file-uploader.class';
-import {FileSelectDirective} from './file-select.directive';
-@Component({
-  selector: 'container',
-  template: `<input type="file" ng2FileSelect [uploader]="uploader" />`,
-  directives: [FileSelectDirective]
-})
-export class ContainerComponent {
-  public uploader:FileUploader = new FileUploader({url: 'localhost:3000'});
-}
-describe('Directive: FileSelectDirective', () => {
-  beforeEachProviders(() => [
-    ContainerComponent
-  ]);
-  it('should be fine', inject([ContainerComponent], (fixture:ComponentFixture<ContainerComponent>) => {
-    expect(fixture).not.toBeNull();
-  }));
-});

demo/.gitignore

@@ -0,0 +1,2 @@
+# Created by .ignore support plugin (hsz.mobi)
+src/api-doc.json

demo/assets/css/prism-okaidia.css

@@ -1,119 +0,0 @@
-/**
- * okaidia theme for JavaScript, CSS and HTML
- * Loosely based on Monokai textmate theme by http://www.monokai.nl/
- * @author ocodia
- */
-
-code[class*="language-"],
-pre[class*="language-"] {
-	color: #f8f8f2;
-	text-shadow: 0 1px rgba(0, 0, 0, 0.3);
-	font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-	direction: ltr;
-	text-align: left;
-	white-space: pre;
-	word-spacing: normal;
-	word-break: normal;
-	line-height: 1.5;
-
-	-moz-tab-size: 4;
-	-o-tab-size: 4;
-	tab-size: 4;
-
-	-webkit-hyphens: none;
-	-moz-hyphens: none;
-	-ms-hyphens: none;
-	hyphens: none;
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-	padding: 1em;
-	margin: .5em 0;
-	overflow: auto;
-	border-radius: 0.3em;
-}
-
-:not(pre) > code[class*="language-"],
-pre[class*="language-"] {
-	background: #272822;
-}
-
-/* Inline code */
-:not(pre) > code[class*="language-"] {
-	padding: .1em;
-	border-radius: .3em;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-	color: slategray;
-}
-
-.token.punctuation {
-	color: #f8f8f2;
-}
-
-.namespace {
-	opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.constant,
-.token.symbol,
-.token.deleted {
-	color: #f92672;
-}
-
-.token.boolean,
-.token.number {
-	color: #ae81ff;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-	color: #a6e22e;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string,
-.token.variable {
-	color: #f8f8f2;
-}
-
-.token.atrule,
-.token.attr-value,
-.token.function {
-	color: #e6db74;
-}
-
-.token.keyword {
-	color: #66d9ef;
-}
-
-.token.regex,
-.token.important {
-	color: #fd971f;
-}
-
-.token.important,
-.token.bold {
-	font-weight: bold;
-}
-.token.italic {
-	font-style: italic;
-}
-
-.token.entity {
-	cursor: help;
-}

demo/bs-config.json

@@ -0,0 +1,4 @@
+{
+  "port": 4200,
+  "server": { "baseDir": "./demo/dist" }
+}

demo/components/file-upload-section.ts

@@ -1,81 +0,0 @@
-import {Component} from '@angular/core';
-import {CORE_DIRECTIVES} from '@angular/common';
-
-import {TAB_DIRECTIVES} from 'ng2-bootstrap/ng2-bootstrap';
-import {SimpleDemoComponent} from './file-upload/simple-demo';
-
-let name = 'File Upload';
-let doc = require('../../components/file-upload/readme.md');
-
-let tabDesc:Array<any> = [
-  {
-    heading: 'Simple',
-    ts: require('!!prismjs?lang=typescript!./file-upload/simple-demo.ts'),
-    html: require('!!prismjs?lang=markup!./file-upload/simple-demo.html'),
-    js: require('!!prismjs?lang=javascript!./file-upload/file-catcher.js')
-  }
-];
-
-let tabsContent:string = ``;
-tabDesc.forEach((desc:any) => {
-  tabsContent += `
-          <tab heading="${desc.heading}" (select)="select($event)">
-          <div class="card card-block panel panel-default panel-body">
-
-            <${desc.heading.toLowerCase()}-demo *ngIf="currentHeading === '${desc.heading}'"></${desc.heading.toLowerCase()}-demo>
-
-            <br>
-
-            <div class="row" style="margin: 0px;">
-              <tabset>
-                <tab heading="Markup">
-                  <div class="card card-block panel panel-default panel-body">
-                    <pre class="language-html"><code class="language-html" ng-non-bindable>${desc.html}</code></pre>
-                  </div>
-                </tab>
-                <tab heading="TypeScript">
-                  <div class="card card-block panel panel-default panel-body">
-                    <pre class="language-typescript"><code class="language-typescript" ng-non-bindable>${desc.ts}</code></pre>
-                  </div>
-                </tab>
-                <tab heading="Backend Demo">
-                  <div class="card card-block panel panel-default panel-body">
-                    <pre class="language-javascript"><code class="language-javascript" ng-non-bindable>${desc.js}</code></pre>
-                  </div>
-                </tab>
-              </tabset>
-            </div>
-          </div>
-        </tab>
-  `;
-});
-
-@Component({
-  selector: 'file-upload-section',
-  template: `
-  <section id="${name.toLowerCase()}">
-    <div class="row">
-      <tabset>
-
-        ${tabsContent}
-
-      </tabset>
-    </div>
-
-    <div class="row">
-      <h2>API</h2>
-      <div class="card card-block panel panel-default panel-body">${doc}</div>
-    </div>
-  </section>
-  `,
-  directives: [SimpleDemoComponent, TAB_DIRECTIVES, CORE_DIRECTIVES]
-})
-export class FileUploadSectionComponent {
-  public currentHeading:string = 'Simple';
-
-  public select(e:any):void {
-    if (e.heading) {
-      this.currentHeading = e.heading;
-    }
-  }
-}

demo/components/file-upload/zs-file-demo/demo.html

@@ -1,3 +0,0 @@
-<label class="btn btn-primary">Select File
-  <input type="file" (change)="onChange($event)" [multiple]="multiple" style="display: none;"/>
-</label>

demo/components/file-upload/zs-file-demo/demo.ts

@@ -1,122 +0,0 @@
-import {Component, ElementRef, Renderer, Input, HostListener, HostBinding, OnInit} from '@angular/core';
-import {FileUploader, FileUploaderOptions} from '../../../../ng2-file-upload';
-
-@Component({
-  selector: 'demo-file-upload',
-  providers: [FileUploader],
-  template: require('./demo.html'),
-  styles: [':host {border:1px solid black; padding:59px;display: block;}' +
-  '.hover {border: 3px solid green; backgroud: black;}']
-})
-export class DemoFileUploadComponent implements OnInit {
-
-  @Input() public url:string;
-  @Input() public queueLimit:number;
-  @Input() public maxFileSize:number;
-  @Input() public autoUpload:boolean;
-  @Input() public allowedMimeType:Array<string>;
-  @Input() public allowedFileType:Array<string>;
-  @Input() public headers:Array<any>;
-
-  @HostBinding('class.hover') private isHover:boolean = false;
-
-  private inputs:string[] = ['allowedMimeType',
-    'allowedFileType',
-    'autoUpload',
-    'isHTML5',
-    'headers',
-    'maxFileSize',
-    'queueLimit',
-    'removeAfterUpload',
-    'url'
-  ];
-
-  private uploaderOptions:FileUploaderOptions = {};
-
-  private multiple:boolean = true;
-
-  private element:ElementRef;
-  private fileUploadService:FileUploader;
-  private renderer:Renderer;
-
-  public constructor(element:ElementRef, fileUploadService:FileUploader, renderer:Renderer) {
-    this.element = element;
-    this.fileUploadService = fileUploadService;
-    this.renderer = renderer;
-  }
-
-  public ngOnInit():any {
-    for (let input of this.inputs) {
-      if (this[input]) {
-        this.uploaderOptions[input] = this[input];
-      }
-    }
-    this.fileUploadService.setOptions(this.uploaderOptions);
-
-    this.multiple = (!this.queueLimit || this.queueLimit > 1);
-  }
-
-  @HostListener('drop', ['$event'])
-  public onDrop(event:any):void {
-    this._preventAndStop(event);
-    this.isHover = false;
-
-    let transfer = this._getTransfer(event);
-    if (!transfer) {
-      return;
-    }
-    this.fileUploadService.addToQueue(transfer.files);
-  }
-
-  @HostListener('dragover', ['$event'])
-  public onDragOver(event:any):void {
-    this._preventAndStop(event);
-
-    if (this.isHover) {
-      return;
-    }
-
-    let transfer = this._getTransfer(event);
-    if (!this._haveFiles(transfer.types)) {
-      return;
-    }
-    this.isHover = true;
-  }
-
-  @HostListener('dragleave', ['$event'])
-  public onDragLeave(event:any):void {
-    this._preventAndStop(event);
-    if (event.currentTarget === (this as any).element[0]) {
-      return;
-    }
-    this.isHover = false;
-  }
-
-  public onChange($event:any):void {
-    this.fileUploadService.addToQueue($event.srcElement.files);
-  }
-
-  private _getTransfer(event:any):any {
-    return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer;
-  }
-
-  private _preventAndStop(event:any):any {
-    event.preventDefault();
-    event.stopPropagation();
-  }
-
-  private _haveFiles(types:any):any {
-    if (!types) {
-      return false;
-    }
-
-    if (types.indexOf) {
-      return types.indexOf('Files') !== -1;
-    } else if (types.contains) {
-      return types.contains('Files');
-    } else {
-      return false;
-    }
-  }
-
-}

demo/src/app/app.component.ts

@@ -1,10 +1,6 @@
-import {bootstrap} from '@angular/platform-browser-dynamic';
+import { Component } from '@angular/core';
-import {Component} from '@angular/core';
-import {NgClass} from '@angular/common';
 
-import {FileUploadSectionComponent} from './components/file-upload-section';
+let gettingStarted = require('html-loader!markdown-loader!../getting-started.md');
-
-let gettingStarted = require('./getting-started.md');
 
 @Component({
   selector: 'app',
@@ -22,7 +18,7 @@ let gettingStarted = require('./getting-started.md');
   </main>
 
   <div class="container">
-    <section id="getting-started">${gettingStarted}</section>
+    <section id="getting-started" [innerHtml]="gettingStarted"></section>
 
     <file-upload-section class="col-md-12"></file-upload-section>
   </div>
@@ -32,13 +28,16 @@ let gettingStarted = require('./getting-started.md');
       <p class="text-muted text-center"><a href="https://github.com/valor-software/ng2-file-upload">ng2-file-upload</a> is maintained by <a href="https://github.com/valor-software">valor-software</a>.</p>
     </div>
   </footer>
-  `,
+  `
-  directives: [
-    NgClass,
-    FileUploadSectionComponent
-  ]
 })
-export class DemoComponent {
+export class AppComponent {
+  public gettingStarted:string = gettingStarted;
+  public ngAfterContentInit(): any {
+    setTimeout(()=>{
+      if (typeof PR !== 'undefined') {
+        // google code-prettify
+        PR.prettyPrint();
+      }
+    }, 150);
+  }
 }
-
-bootstrap(DemoComponent);

demo/src/app/app.module.ts

@@ -0,0 +1,19 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+
+import { TabsModule } from 'ng2-bootstrap';
+import { FileUploadModule } from 'ng2-file-upload';
+
+import { AppComponent } from './app.component';
+import { FileUploadSectionComponent } from './components/file-upload-section';
+import { SimpleDemoComponent } from './components/file-upload/simple-demo';
+
+@NgModule({
+  imports: [BrowserModule, CommonModule, FileUploadModule, TabsModule.forRoot(), FormsModule],
+  declarations: [AppComponent, FileUploadSectionComponent, SimpleDemoComponent],
+  bootstrap: [AppComponent]
+})
+export class AppModule {
+}

demo/src/app/components/file-upload-section.html

@@ -0,0 +1,40 @@
+<section [attr.id]="name.toLowerCase()">
+  <div class="row">
+    <tabset>
+      <tab *ngFor="let desc of tabs" heading="{{desc.heading}}" (select)="select($event)">
+        <div class="card card-block panel panel-default panel-body">
+
+          <simple-demo></simple-demo>
+
+          <br>
+
+          <div class="row" style="margin: 0px;">
+            <tabset>
+              <tab heading="Markup">
+                <div class="card card-block panel panel-default panel-body">
+                  <pre class="prettyprint linenums lang-html">{{desc.html}}</pre>
+                </div>
+              </tab>
+              <tab heading="TypeScript">
+                <div class="card card-block panel panel-default panel-body">
+                  <pre class="prettyprint linenums lang-js">{{desc.ts}}</pre>
+                  <pre class="language-typescript"><code class="language-typescript" ng-non-bindable [innerHTML]="desc.ts"></code></pre>
+                </div>
+              </tab>
+              <tab heading="Backend Demo">
+                <div class="card card-block panel panel-default panel-body">
+                  <pre class="prettyprint linenums lang-js">{{desc.js}}</pre>
+                </div>
+              </tab>
+            </tabset>
+          </div>
+        </div>
+      </tab>
+    </tabset>
+  </div>
+
+  <div class="row">
+    <h2>API</h2>
+    <div class="card card-block panel panel-default panel-body" [innerHTML]="doc"></div>
+  </div>
+</section>

demo/src/app/components/file-upload-section.ts

@@ -0,0 +1,29 @@
+import { Component } from '@angular/core';
+
+let doc = require('html-loader!markdown-loader!../../doc.md');
+
+let tabDesc:Array<any> = [
+  {
+    heading: 'Simple',
+    ts: require('!!raw-loader?lang=typescript!./file-upload/simple-demo.ts'),
+    html: require('!!raw-loader?lang=markup!./file-upload/simple-demo.html'),
+    js: require('!!raw-loader?lang=javascript!./file-upload/file-catcher.js')
+  }
+];
+
+@Component({
+  selector: 'file-upload-section',
+  templateUrl: './file-upload-section.html'
+})
+export class FileUploadSectionComponent {
+  public name:string = 'File Upload';
+  public currentHeading:string = 'Simple';
+  public doc:string = doc;
+  public tabs:any = tabDesc;
+
+  public select(e:any):void {
+    if (e.heading) {
+      this.currentHeading = e.heading;
+    }
+  }
+}

demo/src/app/components/file-upload/file-catcher.js

@@ -0,0 +1,50 @@
+/*eslint-disable*/
+var express = require('express');
+var multer = require('multer');
+var fs = require('fs');
+var app = express();
+
+var DIR = './uploads/';
+
+var upload = multer({dest: DIR});
+
+app.use(function (req, res, next) {
+  res.setHeader('Access-Control-Allow-Origin', 'http://valor-software.github.io');
+  res.setHeader('Access-Control-Allow-Methods', 'POST');
+  res.setHeader('Access-Control-Allow-Headers', 'X-Requested-With,content-type');
+  res.setHeader('Access-Control-Allow-Credentials', true);
+  next();
+});
+
+app.use(multer({
+  dest: DIR,
+  rename: function (fieldname, filename) {
+    return filename + Date.now();
+  },
+  onFileUploadStart: function (file) {
+    console.log(file.originalname + ' is starting ...');
+  },
+  onFileUploadComplete: function (file) {
+    console.log(file.fieldname + ' uploaded to  ' + file.path);
+  }
+}));
+
+app.get('/api', function (req, res) {
+  res.end('file catcher example');
+});
+
+app.post('/api', function (req, res) {
+  upload(req, res, function (err) {
+    if (err) {
+      return res.end(err.toString());
+    }
+
+    res.end('File is uploaded');
+  });
+});
+
+var PORT = process.env.PORT || 3000;
+
+app.listen(PORT, function () {
+  console.log('Working on port ' + PORT);
+});

demo/src/app/components/file-upload/simple-demo.ts

@@ -1,17 +1,12 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
-import {CORE_DIRECTIVES, FORM_DIRECTIVES, NgClass, NgStyle} from '@angular/common';
+import { FileUploader } from 'ng2-file-upload';
-import {FILE_UPLOAD_DIRECTIVES, FileUploader} from '../../../ng2-file-upload';
-
-// webpack html imports
-let template = require('./simple-demo.html');
 
 // const URL = '/api/';
 const URL = 'https://evening-anchorage-3159.herokuapp.com/api/';
 
 @Component({
   selector: 'simple-demo',
-  template: template,
+  templateUrl: './simple-demo.html'
-  directives: [FILE_UPLOAD_DIRECTIVES, NgClass, NgStyle, CORE_DIRECTIVES, FORM_DIRECTIVES]
 })
 export class SimpleDemoComponent {
   public uploader:FileUploader = new FileUploader({url: URL});

demo/src/app/index.ts

@@ -0,0 +1,2 @@
+export * from './app.component';
+export * from './app.module';

demo/src/assets/css/prettify-angulario.css

@@ -0,0 +1,217 @@
+.prettyprint {
+  white-space: pre-wrap;
+  background: #F5F6F7;
+  font-family: Monaco,"Lucida Console",monospace;
+  color: #5C707A;
+  width: auto;
+  overflow: auto;
+  position: relative;
+  padding: 0;
+  font-size: 13px;
+  line-height: 24px;
+  margin-bottom: 24px;
+  border-radius: 4px;
+  padding: 16px 32px
+}
+
+.prettyprint.linenums,.prettyprint[class^="linenums:"],.prettyprint[class*=" linenums:"] {
+  padding: 0
+}
+
+.prettyprint.is-showcase {
+  border: 4px solid #0273D4
+}
+
+.prettyprint code {
+  background: none;
+  font-size: 13px;
+  padding: 0
+}
+
+.prettyprint ol {
+  background: #F5F6F7;
+  padding: 16px 32px 16px 56px;
+  margin: 0;
+  overflow: auto;
+  font-size: 13px
+}
+
+.prettyprint ol li,.prettyprint .tag {
+  color: #7a8b94;
+  background: none;
+  margin-bottom: 5px;
+  line-height: normal;
+  list-style-type: decimal;
+  font-size: 12px
+}
+
+.prettyprint ol li:last-child {
+  margin-bottom: 0
+}
+
+.prettyprint ol li code {
+  background: none;
+  font-size: 13px
+}
+
+.prettyprint .pnk,.prettyprint .blk {
+  border-radius: 4px;
+  padding: 2px 4px
+}
+
+.prettyprint .pnk {
+  background: #CFD8DC;
+  color: #5C707A
+}
+
+.prettyprint .blk {
+  background: #E0E0E0
+}
+
+.prettyprint .otl {
+  outline: 1px solid rgba(169,169,169,0.56)
+}
+
+.prettyprint .kwd {
+  color: #D43669
+}
+
+.prettyprint .typ,.prettyprint .tag {
+  color: #D43669
+}
+
+.prettyprint .str,.prettyprint .atv {
+  color: #647f11
+}
+
+.prettyprint .atn {
+  /*color: #647f11*/
+  color: #31708f
+}
+
+.prettyprint .com {
+  color: #647f11
+}
+
+.prettyprint .lit {
+  color: #647f11
+}
+
+.prettyprint .pun {
+  color: #7a8b94
+}
+
+.prettyprint .pln {
+  color: #5C707A
+  /*color: #8a6d3b*/
+}
+
+.prettyprint .dec {
+  color: #647f11
+}
+
+@media print {
+  .prettyprint {
+    background: #F5F6F7;
+    border: none;
+    box-shadow: none
+  }
+
+  .prettyprint ol {
+    background: #F5F6F7
+  }
+
+  .prettyprint .kwd {
+    color: #D43669
+  }
+
+  .prettyprint .typ,.prettyprint .tag {
+    color: #D43669
+  }
+
+  .prettyprint .str,.prettyprint .atv {
+    color: #647f11
+  }
+
+  .prettyprint .atn {
+    /*color: #647f11*/
+    color: #31708f
+  }
+
+  .prettyprint .com {
+    color: #647f11
+  }
+
+  .prettyprint .lit {
+    color: #647f11
+  }
+
+  .prettyprint .pun {
+    color: #7a8b94
+  }
+
+  .prettyprint .pln {
+    color: #5C707A
+  }
+
+  .prettyprint .dec {
+    color: #647f11
+  }
+}
+
+h1 .prettyprint,h2 .prettyprint,h3 .prettyprint,h4 .prettyprint {
+  background: none;
+  font-family: Monaco,"Lucida Console",monospace;
+  color: #253238;
+  overflow: hidden;
+  position: relative;
+  font-size: 15px;
+  font-weight: 600;
+  line-height: 24px;
+  margin: 0;
+  border: none;
+  box-shadow: none;
+  padding: 0
+}
+
+h1 .prettyprint code,h2 .prettyprint code,h3 .prettyprint code,h4 .prettyprint code {
+  background: none;
+  font-size: 15px;
+  padding: 0
+}
+
+h1 .prettyprint .kwd,h2 .prettyprint .kwd,h3 .prettyprint .kwd,h4 .prettyprint .kwd {
+  color: #253238
+}
+
+h1 .prettyprint .typ,h1 .prettyprint .tag,h2 .prettyprint .typ,h2 .prettyprint .tag,h3 .prettyprint .typ,h3 .prettyprint .tag,h4 .prettyprint .typ,h4 .prettyprint .tag {
+  color: #B52E31
+}
+
+h1 .prettyprint .str,h1 .prettyprint .atv,h2 .prettyprint .str,h2 .prettyprint .atv,h3 .prettyprint .str,h3 .prettyprint .atv,h4 .prettyprint .str,h4 .prettyprint .atv {
+  color: #9d8d00
+}
+
+h1 .prettyprint .atn,h2 .prettyprint .atn,h3 .prettyprint .atn,h4 .prettyprint .atn {
+  color: #71a436
+}
+
+h1 .prettyprint .com,h2 .prettyprint .com,h3 .prettyprint .com,h4 .prettyprint .com {
+  color: #AFBEC5
+}
+
+h1 .prettyprint .lit,h2 .prettyprint .lit,h3 .prettyprint .lit,h4 .prettyprint .lit {
+  color: #9d8d00
+}
+
+h1 .prettyprint .pun,h2 .prettyprint .pun,h3 .prettyprint .pun,h4 .prettyprint .pun {
+  color: #000
+}
+
+h1 .prettyprint .pln,h2 .prettyprint .pln,h3 .prettyprint .pln,h4 .prettyprint .pln {
+  color: #000
+}
+
+h1 .prettyprint .dec,h2 .prettyprint .dec,h3 .prettyprint .dec,h4 .prettyprint .dec {
+  color: #8762c6
+}

demo/src/assets/js/prettify.min.js

@@ -0,0 +1,36 @@
+!function () { var q = null; window.PR_SHOULD_USE_CONTINUATION = !0;
+  (function () { function S(a) { function d(e) { var b = e.charCodeAt(0); if (b !== 92) return b; var a = e.charAt(1); return (b = r[a]) ? b : '0' <= a && a <= '7' ? parseInt(e.substring(1), 8) : a === 'u' || a === 'x' ? parseInt(e.substring(2), 16) : e.charCodeAt(1); } function g(e) { if (e < 32) return (e < 16 ? '\\x0' : '\\x') + e.toString(16); e = String.fromCharCode(e); return e === '\\' || e === '-' || e === ']' || e === '^' ? '\\' + e : e; } function b(e) { var b = e.substring(1, e.length - 1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g), e = [], a =
+b[0] === '^', c = ['[']; a && c.push('^'); for (var a = a ? 1 : 0, f = b.length; a < f; ++a) { var h = b[a]; if (/\\[bdsw]/i.test(h))c.push(h); else { var h = d(h), l; a + 2 < f && '-' === b[a + 1] ? (l = d(b[a + 2]), a += 2) : l = h; e.push([h, l]); l < 65 || h > 122 || (l < 65 || h > 90 || e.push([Math.max(65, h) | 32, Math.min(l, 90) | 32]), l < 97 || h > 122 || e.push([Math.max(97, h) & -33, Math.min(l, 122) & -33])); } }e.sort(function (e, a) { return e[0] - a[0] || a[1] - e[1]; }); b = []; f = []; for (a = 0; a < e.length; ++a)h = e[a], h[0] <= f[1] + 1 ? f[1] = Math.max(f[1], h[1]) : b.push(f = h); for (a = 0; a < b.length; ++a)h = b[a], c.push(g(h[0])),
+h[1] > h[0] && (h[1] + 1 > h[0] && c.push('-'), c.push(g(h[1]))); c.push(']'); return c.join(''); } function s(e) { for (var a = e.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g), c = a.length, d = [], f = 0, h = 0; f < c; ++f) { var l = a[f]; l === '(' ? ++h : '\\' === l.charAt(0) && (l = +l.substring(1)) && (l <= h ? d[l] = -1 : a[f] = g(l)); } for (f = 1; f < d.length; ++f)-1 === d[f] && (d[f] = ++x); for (h = f = 0; f < c; ++f)l = a[f], l === '(' ? (++h, d[h] || (a[f] = '(?:')) : '\\' === l.charAt(0) && (l = +l.substring(1)) && l <= h &&
+(a[f] = '\\' + d[l]); for (f = 0; f < c; ++f)'^' === a[f] && '^' !== a[f + 1] && (a[f] = ''); if (e.ignoreCase && m) for (f = 0; f < c; ++f)l = a[f], e = l.charAt(0), l.length >= 2 && e === '[' ? a[f] = b(l) : e !== '\\' && (a[f] = l.replace(/[A-Za-z]/g, function (a) { a = a.charCodeAt(0); return '[' + String.fromCharCode(a & -33, a | 32) + ']'; })); return a.join(''); } for (var x = 0, m = !1, j = !1, k = 0, c = a.length; k < c; ++k) { var i = a[k]; if (i.ignoreCase)j = !0; else if (/[a-z]/i.test(i.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi, ''))) { m = !0; j = !1; break; } } for (var r = {
+    b: 8, t: 9, n: 10, v: 11,
+    f: 12, r: 13
+  }, n = [], k = 0, c = a.length; k < c; ++k) { i = a[k]; if (i.global || i.multiline) throw Error('' + i); n.push('(?:' + s(i) + ')'); } return RegExp(n.join('|'), j ? 'gi' : 'g'); } function T(a, d) { function g(a) { var c = a.nodeType; if (c == 1) { if (!b.test(a.className)) { for (c = a.firstChild; c; c = c.nextSibling)g(c); c = a.nodeName.toLowerCase(); if ('br' === c || 'li' === c)s[j] = '\n', m[j << 1] = x++, m[j++ << 1 | 1] = a; } } else if (c == 3 || c == 4)c = a.nodeValue, c.length && (c = d ? c.replace(/\r\n?/g, '\n') : c.replace(/[\t\n\r ]+/g, ' '), s[j] = c, m[j << 1] = x, x += c.length, m[j++ << 1 | 1] =
+a); } var b = /(?:^|\s)nocode(?:\s|$)/, s = [], x = 0, m = [], j = 0; g(a); return {a: s.join('').replace(/\n$/, ''), d: m}; } function H(a, d, g, b) { d && (a = {a: d, e: a}, g(a), b.push.apply(b, a.g)); } function U(a) { for (var d = void 0, g = a.firstChild; g; g = g.nextSibling) var b = g.nodeType, d = b === 1 ? d ? a : g : b === 3 ? V.test(g.nodeValue) ? a : d : d; return d === a ? void 0 : d; } function C(a, d) { function g(a) { for (var j = a.e, k = [j, 'pln'], c = 0, i = a.a.match(s) || [], r = {}, n = 0, e = i.length; n < e; ++n) { var z = i[n], w = r[z], t = void 0, f; if (typeof w === 'string')f = !1; else { var h = b[z.charAt(0)];
+  if (h)t = z.match(h[1]), w = h[0]; else { for (f = 0; f < x; ++f) if (h = d[f], t = z.match(h[1])) { w = h[0]; break; }t || (w = 'pln'); } if ((f = w.length >= 5 && 'lang-' === w.substring(0, 5)) && !(t && typeof t[1] === 'string'))f = !1, w = 'src'; f || (r[z] = w); }h = c; c += z.length; if (f) { f = t[1]; var l = z.indexOf(f), B = l + f.length; t[2] && (B = z.length - t[2].length, l = B - f.length); w = w.substring(5); H(j + h, z.substring(0, l), g, k); H(j + h + l, f, I(w, f), k); H(j + h + B, z.substring(B), g, k); } else k.push(j + h, w); }a.g = k; } var b = {}, s; (function () { for (var g = a.concat(d), j = [], k = {}, c = 0, i = g.length; c < i; ++c) { var r =
+g[c], n = r[3]; if (n) for (var e = n.length; --e >= 0;)b[n.charAt(e)] = r; r = r[1]; n = '' + r; k.hasOwnProperty(n) || (j.push(r), k[n] = q); }j.push(/[\S\s]/); s = S(j); })(); var x = d.length; return g; } function v(a) { var d = [], g = []; a.tripleQuotedStrings ? d.push(['str', /^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/, q, '\'"']) : a.multiLineStrings ? d.push(['str', /^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/,
+q, '\'"`']) : d.push(['str', /^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/, q, '"\'']); a.verbatimStrings && g.push(['str', /^@"(?:[^"]|"")*(?:"|$)/, q]); var b = a.hashComments; b && (a.cStyleComments ? (b > 1 ? d.push(['com', /^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/, q, '#']) : d.push(['com', /^#(?:(?:define|e(?:l|nd)if|else|error|ifn?def|include|line|pragma|undef|warning)\b|[^\n\r]*)/, q, '#']), g.push(['str', /^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h(?:h|pp|\+\+)?|[a-z]\w*)>/, q])) : d.push(['com',
+/^#[^\n\r]*/, q, '#'])); a.cStyleComments && (g.push(['com', /^\/\/[^\n\r]*/, q]), g.push(['com', /^\/\*[\S\s]*?(?:\*\/|$)/, q])); if (b = a.regexLiterals) { var s = (b = b > 1 ? '' : '\n\r') ? '.' : '[\\S\\s]'; g.push(['lang-regex', RegExp('^(?:^^\\.?|[+-]|[!=]=?=?|\\#|%=?|&&?=?|\\(|\\*=?|[+\\-]=|->|\\/=?|::?|<<?=?|>>?>?=?|,|;|\\?|@|\\[|~|{|\\^\\^?=?|\\|\\|?=?|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\\s*(' + ('/(?=[^/*' + b + '])(?:[^/\\x5B\\x5C' + b + ']|\\x5C' + s + '|\\x5B(?:[^\\x5C\\x5D' + b + ']|\\x5C' +
+s + ')*(?:\\x5D|$))+/') + ')')]); }(b = a.types) && g.push(['typ', b]); b = ('' + a.keywords).replace(/^ | $/g, ''); b.length && g.push(['kwd', RegExp('^(?:' + b.replace(/[\s,]+/g, '|') + ')\\b'), q]); d.push(['pln', /^\s+/, q, ' \r\n\t\u00a0']); b = '^.[^\\s\\w.$@\'"`/\\\\]*'; a.regexLiterals && (b += '(?!s*/)'); g.push(['lit', /^@[$_a-z][\w$@]*/i, q], ['typ', /^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/, q], ['pln', /^[$_a-z][\w$@]*/i, q], ['lit', /^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i, q, '0123456789'], ['pln', /^\\[\S\s]?/,
+q], ['pun', RegExp(b), q]); return C(d, g); } function J(a, d, g) { function b(a) { var c = a.nodeType; if (c == 1 && !x.test(a.className)) if ('br' === a.nodeName)s(a), a.parentNode && a.parentNode.removeChild(a); else for (a = a.firstChild; a; a = a.nextSibling)b(a); else if ((c == 3 || c == 4) && g) { var d = a.nodeValue, i = d.match(m); if (i)c = d.substring(0, i.index), a.nodeValue = c, (d = d.substring(i.index + i[0].length)) && a.parentNode.insertBefore(j.createTextNode(d), a.nextSibling), s(a), c || a.parentNode.removeChild(a); } } function s(a) { function b(a, c) { var d =
+c ? a.cloneNode(!1) : a, e = a.parentNode; if (e) { var e = b(e, 1), g = a.nextSibling; e.appendChild(d); for (var i = g; i; i = g)g = i.nextSibling, e.appendChild(i); } return d; } for (;!a.nextSibling;) if (a = a.parentNode, !a) return; for (var a = b(a.nextSibling, 0), d; (d = a.parentNode) && d.nodeType === 1;)a = d; c.push(a); } for (var x = /(?:^|\s)nocode(?:\s|$)/, m = /\r\n?|\n/, j = a.ownerDocument, k = j.createElement('li'); a.firstChild;)k.appendChild(a.firstChild); for (var c = [k], i = 0; i < c.length; ++i)b(c[i]); d === (d | 0) && c[0].setAttribute('value', d); var r = j.createElement('ol');
+  r.className = 'linenums'; for (var d = Math.max(0, d - 1 | 0) || 0, i = 0, n = c.length; i < n; ++i)k = c[i], k.className = 'L' + (i + d) % 10, k.firstChild || k.appendChild(j.createTextNode('\u00a0')), r.appendChild(k); a.appendChild(r); } function p(a, d) { for (var g = d.length; --g >= 0;) { var b = d[g]; F.hasOwnProperty(b) ? D.console && console.warn('cannot override language handler %s', b) : F[b] = a; } } function I(a, d) { if (!a || !F.hasOwnProperty(a))a = /^\s*</.test(d) ? 'default-markup' : 'default-code'; return F[a]; } function K(a) { var d = a.h; try { var g = T(a.c, a.i), b = g.a;
+    a.a = b; a.d = g.d; a.e = 0; I(d, b)(a); var s = /\bMSIE\s(\d+)/.exec(navigator.userAgent), s = s && +s[1] <= 8, d = /\n/g, x = a.a, m = x.length, g = 0, j = a.d, k = j.length, b = 0, c = a.g, i = c.length, r = 0; c[i] = m; var n, e; for (e = n = 0; e < i;)c[e] !== c[e + 2] ? (c[n++] = c[e++], c[n++] = c[e++]) : e += 2; i = n; for (e = n = 0; e < i;) { for (var p = c[e], w = c[e + 1], t = e + 2; t + 2 <= i && c[t + 1] === w;)t += 2; c[n++] = p; c[n++] = w; e = t; }c.length = n; var f = a.c, h; if (f)h = f.style.display, f.style.display = 'none'; try { for (;b < k;) { var l = j[b + 2] || m, B = c[r + 2] || m, t = Math.min(l, B), A = j[b + 1], G; if (A.nodeType !== 1 && (G = x.substring(g,
+t))) { s && (G = G.replace(d, '\r')); A.nodeValue = G; var L = A.ownerDocument, o = L.createElement('span'); o.className = c[r + 1]; var v = A.parentNode; v.replaceChild(o, A); o.appendChild(A); g < l && (j[b + 1] = A = L.createTextNode(x.substring(t, l)), v.insertBefore(A, o.nextSibling)); }g = t; g >= l && (b += 2); g >= B && (r += 2); } } finally { if (f)f.style.display = h; } } catch (u) { D.console && console.log(u && u.stack || u); } } var D = window, y = ['break,continue,do,else,for,if,return,while'], E = [[y, 'auto,case,char,const,default,double,enum,extern,float,goto,inline,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile'],
+'catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof'], M = [E, 'alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,delegate,dynamic_cast,explicit,export,friend,generic,late_check,mutable,namespace,nullptr,property,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where'], N = [E, 'abstract,assert,boolean,byte,extends,final,finally,implements,import,instanceof,interface,null,native,package,strictfp,super,synchronized,throws,transient'],
+  O = [N, 'as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,internal,into,is,let,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var,virtual,where'], E = [E, 'debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN'], P = [y, 'and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None'],
+  Q = [y, 'alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END'], W = [y, 'as,assert,const,copy,drop,enum,extern,fail,false,fn,impl,let,log,loop,match,mod,move,mut,priv,pub,pure,ref,self,static,struct,true,trait,type,unsafe,use'], y = [y, 'case,done,elif,esac,eval,fi,function,in,local,set,then,until'], R = /^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)\b/,
+  V = /\S/, X = v({keywords: [M, O, E, 'caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END', P, Q, y], hashComments: !0, cStyleComments: !0, multiLineStrings: !0, regexLiterals: !0}), F = {}; p(X, ['default-code']); p(C([], [['pln', /^[^<?]+/], ['dec', /^<!\w[^>]*(?:>|$)/], ['com', /^<\!--[\S\s]*?(?:--\>|$)/], ['lang-', /^<\?([\S\s]+?)(?:\?>|$)/], ['lang-', /^<%([\S\s]+?)(?:%>|$)/], ['pun', /^(?:<[%?]|[%?]>)/], ['lang-',
+/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i], ['lang-js', /^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i], ['lang-css', /^<style\b[^>]*>([\S\s]*?)(<\/style\b[^>]*>)/i], ['lang-in.tag', /^(<\/?[a-z][^<>]*>)/i]]), ['default-markup', 'htm', 'html', 'mxml', 'xhtml', 'xml', 'xsl']); p(C([['pln', /^\s+/, q, ' \t\r\n'], ['atv', /^(?:"[^"]*"?|'[^']*'?)/, q, '"\'']], [['tag', /^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i], ['atn', /^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i], ['lang-uq.val', /^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/], ['pun', /^[/<->]+/],
+['lang-js', /^on\w+\s*=\s*"([^"]+)"/i], ['lang-js', /^on\w+\s*=\s*'([^']+)'/i], ['lang-js', /^on\w+\s*=\s*([^\s"'>]+)/i], ['lang-css', /^style\s*=\s*"([^"]+)"/i], ['lang-css', /^style\s*=\s*'([^']+)'/i], ['lang-css', /^style\s*=\s*([^\s"'>]+)/i]]), ['in.tag']); p(C([], [['atv', /^[\S\s]+/]]), ['uq.val']); p(v({keywords: M, hashComments: !0, cStyleComments: !0, types: R}), ['c', 'cc', 'cpp', 'cxx', 'cyc', 'm']); p(v({keywords: 'null,true,false'}), ['json']); p(v({keywords: O, hashComments: !0, cStyleComments: !0, verbatimStrings: !0, types: R}),
+['cs']); p(v({keywords: N, cStyleComments: !0}), ['java']); p(v({keywords: y, hashComments: !0, multiLineStrings: !0}), ['bash', 'bsh', 'csh', 'sh']); p(v({keywords: P, hashComments: !0, multiLineStrings: !0, tripleQuotedStrings: !0}), ['cv', 'py', 'python']); p(v({keywords: 'caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END', hashComments: !0, multiLineStrings: !0, regexLiterals: 2}), ['perl', 'pl', 'pm']); p(v({
+  keywords: Q,
+  hashComments: !0, multiLineStrings: !0, regexLiterals: !0
+}), ['rb', 'ruby']); p(v({keywords: E, cStyleComments: !0, regexLiterals: !0}), ['javascript', 'js']); p(v({keywords: 'all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,throw,true,try,unless,until,when,while,yes', hashComments: 3, cStyleComments: !0, multilineStrings: !0, tripleQuotedStrings: !0, regexLiterals: !0}), ['coffee']); p(v({keywords: W, cStyleComments: !0, multilineStrings: !0}), ['rc', 'rs', 'rust']);
+    p(C([], [['str', /^[\S\s]+/]]), ['regex']); var Y = D.PR = {
+      createSimpleLexer: C, registerLangHandler: p, sourceDecorator: v, PR_ATTRIB_NAME: 'atn', PR_ATTRIB_VALUE: 'atv', PR_COMMENT: 'com', PR_DECLARATION: 'dec', PR_KEYWORD: 'kwd', PR_LITERAL: 'lit', PR_NOCODE: 'nocode', PR_PLAIN: 'pln', PR_PUNCTUATION: 'pun', PR_SOURCE: 'src', PR_STRING: 'str', PR_TAG: 'tag', PR_TYPE: 'typ', prettyPrintOne: D.prettyPrintOne = function (a, d, g) { var b = document.createElement('div'); b.innerHTML = '<pre>' + a + '</pre>'; b = b.firstChild; g && J(b, g, !0); K({h: d, j: g, c: b, i: 1});
+        return b.innerHTML; }, prettyPrint: D.prettyPrint = function (a, d) { function g() { for (var b = D.PR_SHOULD_USE_CONTINUATION ? c.now() + 250 : Infinity; i < p.length && c.now() < b; i++) { for (var d = p[i], j = h, k = d; k = k.previousSibling;) { var m = k.nodeType, o = (m === 7 || m === 8) && k.nodeValue; if (o ? !/^\??prettify\b/.test(o) : m !== 3 || /\S/.test(k.nodeValue)) break; if (o) { j = {}; o.replace(/\b(\w+)=([\w%+\-.:]+)/g, function (a, b, c) { j[b] = c; }); break; } }k = d.className; if ((j !== h || e.test(k)) && !v.test(k)) { m = !1; for (o = d.parentNode; o; o = o.parentNode) if (f.test(o.tagName) &&
+o.className && e.test(o.className)) { m = !0; break; } if (!m) { d.className += ' prettyprinted'; m = j.lang; if (!m) { var m = k.match(n), y; if (!m && (y = U(d)) && t.test(y.tagName))m = y.className.match(n); m && (m = m[1]); } if (w.test(d.tagName))o = 1; else var o = d.currentStyle, u = s.defaultView, o = (o = o ? o.whiteSpace : u && u.getComputedStyle ? u.getComputedStyle(d, q).getPropertyValue('white-space') : 0) && 'pre' === o.substring(0, 3); u = j.linenums; if (!(u = u === 'true' || +u))u = (u = k.match(/\blinenums\b(?::(\d+))?/)) ? u[1] && u[1].length ? +u[1] : !0 : !1; u && J(d, u, o); r =
+{h: m, c: d, j: u, i: o}; K(r); } } }i < p.length ? setTimeout(g, 250) : 'function' === typeof a && a(); } for (var b = d || document.body, s = b.ownerDocument || document, b = [b.getElementsByTagName('pre'), b.getElementsByTagName('code'), b.getElementsByTagName('xmp')], p = [], m = 0; m < b.length; ++m) for (var j = 0, k = b[m].length; j < k; ++j)p.push(b[m][j]); var b = q, c = Date; c.now || (c = {now() { return +new Date; }}); var i = 0, r, n = /\blang(?:uage)?-([\w.]+)(?!\S)/, e = /\bprettyprint\b/, v = /\bprettyprinted\b/, w = /pre|xmp/i, t = /^code$/i, f = /^(?:pre|code|xmp)$/i,
+  h = {}; g(); }
+    }; typeof define === 'function' && define.amd && define('google-code-prettify', [], function () { return Y; }); })(); }();

demo/src/doc.md

@@ -1,6 +1,6 @@
 ### Usage
 ```typescript
-import {FileSelectDirective, FileDropDirective, FileUploader} from 'ng2-file-upload/ng2-file-upload';
+import { FileSelectDirective, FileDropDirective, FileUploader } from 'ng2-file-upload/ng2-file-upload';
 ```
 
 ### Annotations
@@ -20,10 +20,11 @@ import {FileSelectDirective, FileDropDirective, FileUploader} from 'ng2-file-upl
 
   - `uploader` - (`FileUploader`) - uploader object. See using in [demo](https://github.com/valor-software/ng2-file-upload/blob/master/demo/components/file-upload/simple-demo.ts)
 
-  Parameters that supported by this object:
+  Parameters supported by this object:
 
   1. `url` - URL of File Uploader's route
   2. `authToken` - auth token that will be applied as 'Authorization' header during file send.
+  3. `disableMultipart` - If 'true', disable using a multipart form for file upload and instead stream the file. Some APIs (e.g. Amazon S3) may expect the file to be streamed rather than sent via a form. Defaults to false.
 
 ## FileDrop API
 

demo/src/environments/environment.prod.ts

@@ -0,0 +1,3 @@
+export const environment = {
+  production: true
+};

demo/src/environments/environment.ts

@@ -0,0 +1,8 @@
+// The file contents for the current environment will overwrite these during build.
+// The build system defaults to the dev environment which uses `environment.ts`, but if you do
+// `ng build --env=prod` then `environment.prod.ts` will be used instead.
+// The list of which env maps to which file can be found in `angular-cli.json`.
+
+export const environment = {
+  production: false
+};

demo/src/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>Angular2 File Upload</title>
+  <title>Angular File Upload</title>
 
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,10 +12,9 @@
   <link rel="author" href="https://github.com/valor-software/ng2-file-upload/graphs/contributors">
 
   <!--link to bootstrap.css-->
-  <link rel="stylesheet" href="assets/css/prism-okaidia.css">
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css">
   <link rel="stylesheet" href="assets/css/style.css">
-
+  <link rel="stylesheet" href="assets/css/prettify-angulario.css">
   <style media="screen">
     .header {
       background-color: #0143A3;
@@ -33,6 +32,7 @@
   <app>
     Loading...
   </app>
-
+  <script src="assets/js/prettify.min.js"></script>
+  <!-- script files will be inserted by html-webpack-plugin -->
 </body>
 </html>

demo/src/main.ts

@@ -0,0 +1,12 @@
+import './polyfills.ts';
+
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { enableProdMode } from '@angular/core';
+import { environment } from './environments/environment';
+import { AppModule } from './app/';
+
+if (environment.production) {
+  enableProdMode();
+}
+
+platformBrowserDynamic().bootstrapModule(AppModule);

demo/src/polyfills.ts

@@ -0,0 +1,21 @@
+// This file includes polyfills needed by Angular 2 and is loaded before
+// the app. You can add your own extra polyfills to this file.
+import 'ts-helpers';
+import 'core-js/es6/symbol';
+import 'core-js/es6/object';
+import 'core-js/es6/function';
+import 'core-js/es6/parse-int';
+import 'core-js/es6/parse-float';
+import 'core-js/es6/number';
+import 'core-js/es6/math';
+import 'core-js/es6/string';
+import 'core-js/es6/date';
+import 'core-js/es6/array';
+import 'core-js/es6/regexp';
+import 'core-js/es6/map';
+import 'core-js/es6/set';
+import 'core-js/es6/reflect';
+
+import 'core-js/es7/reflect';
+import 'zone.js/dist/zone';
+import 'classlist-polyfill';

demo/src/tsconfig.json

@@ -0,0 +1,22 @@
+{
+  "compilerOptions": {
+    "declaration": false,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "noEmitHelpers" :true,
+    "lib": ["es6", "dom"],
+    "types": [
+      "jasmine",
+      "webpack"
+    ],
+    "mapRoot": "./",
+    "module": "es6",
+    "moduleResolution": "node",
+    "outDir": "../temp/out-tsc",
+    "sourceMap": true,
+    "target": "es5",
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
+  }
+}

demo/src/typings.d.ts

@@ -0,0 +1,16 @@
+// Typings reference file, you can add your own global typings here
+// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
+// tslint:disable
+declare const System: any;
+declare const ENV:string;
+// google code-prettify
+declare const PR:any;
+
+declare const require:any;
+declare const global:any;
+
+declare module jasmine {
+  interface Matchers {
+    toHaveCssClass(expected: any): boolean;
+  }
+}

gulp-tasks/lint.js

@@ -1,18 +0,0 @@
-'use strict';
-
-const gulp = require('gulp');
-const tslint = require('gulp-tslint');
-const paths = gulp.paths;
-
-gulp.task('tslint', () =>
-gulp
-  .src(paths.tssrc)
-  .pipe(tslint())
-  .pipe(tslint.report('prose', {
-    emitError: true,
-    summarizeFailureOutput: true,
-    reportLimit: 50
-  }))
-);
-
-gulp.task('lint', ['tslint']);

gulpfile.js

@@ -1,18 +0,0 @@
-'use strict';
-
-const gulp = require('gulp');
-
-gulp.paths = {
-  tssrc: [
-    '**/*.ts',
-    '!**/*.d.ts',
-    '!node_modules/**/*',
-    '!bundles/**/*',
-    '!typings/**/*']
-};
-
-require('require-dir')('./gulp-tasks');
-
-gulp.task('default', () => {
-  gulp.start('lint');
-});

karma.conf.js

@@ -1,101 +1,85 @@
-'use strict';
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/0.13/config/configuration-file.html
 
-const path = require('path');
+const customLaunchers = require('./scripts/sauce-browsers').customLaunchers;
-const cwd = process.cwd();
 
-module.exports = config => {
+module.exports = function (config) {
-  config.set({
+  const configuration = {
-    // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: '',
-
+    frameworks: ['jasmine', 'angular-cli'],
-    // frameworks to use
+    plugins: [
-    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+      require('karma-jasmine'),
-    frameworks: ['jasmine'],
+      require('karma-chrome-launcher'),
-
+      require('karma-remap-istanbul'),
-    // list of files / patterns to load in the browser
+      require('angular-cli/plugins/karma')
-    files: [
+    ],
-      {pattern: 'test.bundle.js', watched: false}
+    files: [
+      {pattern: './scripts/test.ts', watched: false}
     ],
-
-    // list of files to exclude
-    exclude: [],
-
-    // preprocess matching files before serving them to the browser
-    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'test.bundle.js': ['coverage', 'webpack', 'sourcemap']
+      './scripts/test.ts': ['angular-cli']
     },
-
+    remapIstanbulReporter: {
-    webpack: {
+      reports: {
-      resolve: {
+        html: 'coverage',
-        root: [path.resolve(cwd)],
+        lcovonly: './coverage/coverage.lcov'
-        modulesDirectories: ['node_modules', 'demo', 'components', 'test', '.'],
+      }
-        extensions: ['', '.ts', '.js', '.css']
-      },
-      module: {
-        loaders: [
-          {test: /\.ts$/, loader: 'ts-loader', exclude: [/node_modules/]}
-        ],
-        postLoaders: [
-          // instrument only testing sources with Istanbul
-          {
-            test: /\.(js|ts)$/,
-            include: root('components'),
-            loader: 'istanbul-instrumenter-loader',
-            exclude: [
-              /\.e2e\.ts$/,
-              /node_modules/
-            ]
-          }
-        ]
-      },
-      stats: {
-        colors: true,
-        reasons: true
-      },
-      watch: true,
-      debug: true
     },
-
+    angularCli: {
-    coverageReporter: {
+      config: './angular-cli.json',
-      dir: 'coverage/',
+      environment: 'dev'
-      reporters: [
-        {type: 'text'},
-        {type: 'json'},
-        {type: 'html'}
-      ]
     },
-    webpackServer: {noInfo: true},
+    reporters: config.angularCli && config.angularCli.codeCoverage
-
+      ? ['dots', 'karma-remap-istanbul']
-    // test results reporter to use
+      : ['dots'],
-    // possible values: 'dots', 'progress'
-    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
-    reporters: ['spec', 'coverage'],
-
-    // web server port
     port: 9876,
-
-    // enable / disable colors in the output (reporters and logs)
     colors: true,
-
-    // level of logging
-    // possible values: config.LOG_DISABLE || config.LOG_ERROR ||
-    // config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
     logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    customLaunchers: {
+      Chrome_travis_ci: {
+        base: 'Chrome',
+        flags: ['--no-sandbox']
+      }
+    },
+    mime: { 'text/x-typescript': ['ts','tsx'] },
+    client: { captureConsole: true }
+  };
 
-    // enable / disable watching file and executing tests whenever any file changes
+  if (process.env.TRAVIS) {
-    autoWatch: false,
+    configuration.browsers = ['Chrome_travis_ci'];
+  }
 
-    // start these browsers
+  if (process.env.SAUCE) {
-    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    if (!process.env.SAUCE_USERNAME || !process.env.SAUCE_ACCESS_KEY) {
-    browsers: ['PhantomJS'],
+      console.log('Make sure the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables are set.');
+      process.exit(1);
+    }
 
-    // Continuous Integration mode
+    configuration.plugins.push(require('karma-sauce-launcher'));
-    // if true, Karma captures browsers, runs the tests and exits
+    configuration.reporters.push('saucelabs');
-    singleRun: true
+    configuration.sauceLabs = {
-  });
+      verbose: true,
+      testName: 'ng2-bootstrap unit tests',
+      recordScreenshots: false,
+      username: process.env.SAUCE_USERNAME,
+      accessKey: process.env.SAUCE_ACCESS_KEY,
+      connectOptions: {
+        port: 5757,
+        logfile: 'sauce_connect.log'
+      },
+      public: 'public'
+    };
+    configuration.captureTimeout = 0;
+    configuration.customLaunchers = customLaunchers();
+    configuration.browsers = Object.keys(configuration.customLaunchers);
+    configuration.concurrency = 3;
+    configuration.browserDisconnectTolerance = 2;
+    configuration.browserNoActivityTimeout = 20000;
+    configuration.browserDisconnectTimeout = 5000;
+  }
+
+  config.set(configuration);
 };
-
-function root(partialPath) {
-  return path.join(__dirname, partialPath);
-}

ng2-file-upload.ts

@@ -1,14 +0,0 @@
-export * from  './components/file-upload/file-select.directive';
-export * from  './components/file-upload/file-drop.directive';
-export * from  './components/file-upload/file-uploader.class';
-
-import {FileSelectDirective} from './components/file-upload/file-select.directive';
-import {FileDropDirective} from './components/file-upload/file-drop.directive';
-
-export const FILE_UPLOAD_DIRECTIVES:[any] = [FileSelectDirective, FileDropDirective];
-
-export default {
-  directives: [
-    FILE_UPLOAD_DIRECTIVES
-  ]
-};

package.json

@@ -1,40 +1,37 @@
 {
-  "name": "ng2-file-upload",
+  "name": "ng2-file-upload-base",
-  "version": "1.0.3",
+  "version": "1.2.0",
-  "description": "angular2 file upload directives",
+  "private": true,
+  "description": "Angular file upload directives",
   "scripts": {
-    "flow.install:typings": "./node_modules/.bin/typings install",
+    "lite-server": "lite-server -c demo/bs-config.json",
-    "flow.compile": "npm run flow.install:typings && npm run flow.compile:common && npm run flow.compile:system ",
+    "demo.serve": "run-s build link demo.build lite-server",
-    "flow.compile:common": "./node_modules/.bin/tsc",
+    "demo.gh-pages": "run-s build demo.build demo.deploy",
-    "flow.compile:system": "./.config/bundle-system.js",
+    "demo.build": "ng build -prod --aot",
-    "flow.copy:src": "./node_modules/.bin/cpy ng2-file-upload.ts \"components/*.ts\" ts --parents",
+    "demo.deploy": "gh-pages -d demo/dist",
-    "flow.clean": "./node_modules/.bin/del bundles coverage demo-build typings \"components/**/*.+(js|d.ts|js.map)\" dist \"ng2-file-upload.+(js|d.ts|js.map)\"",
+    "link": "ngm link -p src --here",
-    "flow.deploy:gh-pages": "npm run flow.build:prod && ./node_modules/.bin/gh-pages -d demo-build",
+    "lint": "exit 0",
-    "flow.eslint": "./node_modules/.bin/eslint --ignore-path .gitignore  --ext js --fix . .config",
+    "disable-lint": "tslint \"**/*.ts\" -c tslint.json --fix --type-check -t prose -e \"node_modules/**\" -e \"dist/**\" -e \"temp/**\" -e \"scripts/docs/**\"",
-    "flow.tslint": "./node_modules/.bin/gulp lint",
+    "flow.changelog": "conventional-changelog -i CHANGELOG.md -s -p angular",
-    "flow.lint": "npm run flow.eslint && npm run flow.tslint",
+    "flow.github-release": "conventional-github-releaser -p angular",
-    "flow.changelog": "./node_modules/.bin/conventional-changelog -i CHANGELOG.md -s -p angular -v",
+    "build": "ngm build -p src --clean",
-    "flow.github-release": "./node_modules/.bin/conventional-github-releaser -p angular",
+    "build.watch": "ngm build -p src --watch --skip-bundles",
-    "flow.build:prod": "NODE_ENV=production ./node_modules/.bin/webpack --progress --color",
+    "start": "ng serve --aot",
-    "flow.build:dev": "./node_modules/.bin/webpack --progress --color",
+    "pretest": "run-s lint build link",
-    "flow.serve:dev": "./node_modules/.bin/webpack-dev-server --hot --inline --colors --display-error-details --display-cached",
+    "test": "ng test -sr",
-    "flow.serve:prod": "NODE_ENV=production ./node_modules/.bin/webpack-dev-server --hot --inline --colors --display-error-details --display-cached",
+    "test-coverage": "ng test -sr -cc",
-    "prepublish": "npm run flow.clean && npm run flow.compile",
+    "version": "npm run flow.changelog && git add -A"
-    "postpublish": "npm run flow.deploy:gh-pages",
-    "start": "npm run flow.serve:dev",
-    "pretest": "npm run flow.lint",
-    "test": "NODE_ENV=test ./node_modules/.bin/karma start",
-    "preversion": "npm test",
-    "version": "npm run flow.changelog && git add -A",
-    "postversion": "git push origin master && git push --tags"
   },
-  "main": "ng2-file-upload.js",
+  "main": "bundles/ng2-file-upload.umd.js",
-  "typings": "ng2-file-upload.d.ts",
+  "module": "index.js",
+  "typings": "index.d.ts",
   "keywords": [
     "angular2",
     "bootstrap",
     "angularjs",
-    "twitter-bootstrap"
+    "twitter-bootstrap",
+    "file-upload",
+    "angular-file-upload"
   ],
   "author": "Vyacheslav Chub <vyacheslav.chub@valor-software.com>",
   "license": "MIT",
@@ -48,68 +45,75 @@
   "homepage": "https://github.com/valor-software/ng2-file-upload#readme",
   "dependencies": {},
   "peerDependencies": {
-    "@angular/common": "^2.0.0-rc.1",
+    "@angular/common": "^2.3.0",
-    "@angular/core": "^2.0.0-rc.1"
+    "@angular/core": "^2.3.0"
   },
   "devDependencies": {
-    "@angular/common": "^2.0.0-rc.1",
+    "@angular/common": "2.4.3",
-    "@angular/compiler": "^2.0.0-rc.1",
+    "@angular/compiler": "2.4.3",
-    "@angular/core": "^2.0.0-rc.1",
+    "@angular/compiler-cli": "2.4.3",
-    "@angular/platform-browser": "^2.0.0-rc.1",
+    "@angular/core": "2.4.3",
-    "@angular/platform-browser-dynamic": "^2.0.0-rc.1",
+    "@angular/forms": "2.4.3",
-    "async": "1.5.2",
+    "@angular/http": "2.4.3",
-    "bootstrap": "3.3.6",
+    "@angular/language-service": "2.4.3",
+    "@angular/platform-browser": "2.4.3",
+    "@angular/platform-browser-dynamic": "2.4.3",
+    "@angular/router": "3.4.3",
+    "@angular/tsc-wrapped": "0.5.1",
+    "@ngtools/webpack": "1.2.3",
+    "@types/jasmine": "2.5.40",
+    "@types/marked": "0.0.28",
+    "@types/node": "7.0.0",
+    "@types/webpack": "^2.2.1",
+    "angular-cli": "1.0.0-beta.25.5",
+    "bootstrap": "3.3.7",
+    "chokidar-cli": "1.2.0",
+    "classlist-polyfill": "1.0.3",
     "codecov": "1.0.1",
-    "compression-webpack-plugin": "0.3.1",
+    "codelyzer": "~2.0.0-beta.4",
     "conventional-changelog-cli": "1.2.0",
-    "conventional-github-releaser": "1.1.2",
+    "conventional-github-releaser": "1.1.3",
-    "copy-webpack-plugin": "2.1.3",
+    "core-js": "^2.4.1",
-    "cpy-cli": "1.0.0",
+    "cpy": "5.0.0",
-    "del-cli": "0.2.0",
+    "cpy-cli": "1.0.1",
-    "es6-promise": "3.1.2",
+    "del-cli": "0.2.1",
-    "es6-shim": "0.35.0",
+    "gh-pages": "0.12.0",
-    "es7-reflect-metadata": "1.6.0",
+    "gitignore-to-glob": "0.3.0",
-    "eslint-config-valorsoft": "0.0.11",
+    "google-code-prettify": "1.0.5",
-    "exports-loader": "0.6.3",
+    "html-loader": "0.4.4",
-    "file-loader": "0.8.5",
+    "jasmine": "2.5.3",
-    "gh-pages": "0.11.0",
+    "jasmine-core": "2.5.2",
-    "gulp": "3.9.1",
+    "jasmine-data-provider": "2.2.0",
-    "gulp-size": "2.1.0",
+    "jasmine-spec-reporter": "3.2.0",
-    "gulp-tslint": "5.0.0",
+    "karma": "1.4.0",
-    "html-loader": "0.4.3",
+    "karma-chrome-launcher": "^2.0.0",
-    "html-webpack-plugin": "2.16.1",
+    "karma-cli": "^1.0.1",
-    "istanbul-instrumenter-loader": "0.2.0",
+    "karma-jasmine": "^1.0.2",
-    "jasmine": "2.4.1",
+    "karma-remap-istanbul": "0.4.0",
-    "karma": "0.13.22",
+    "karma-sauce-launcher": "1.1.0",
-    "karma-chrome-launcher": "1.0.1",
+    "lite-server": "2.2.2",
-    "karma-coverage": "1.0.0",
+    "lodash": "4.17.4",
-    "karma-jasmine": "1.0.2",
+    "markdown-loader": "^0.1.7",
-    "karma-phantomjs-launcher": "1.0.0",
+    "marked": "0.3.6",
-    "karma-sourcemap-loader": "0.3.7",
+    "ng2-bootstrap": "1.2.2",
-    "karma-spec-reporter": "0.0.26",
+    "ng2-page-scroll": "4.0.0-beta.2",
-    "karma-webpack": "1.7.0",
+    "ngm-cli": "0.4.0",
-    "lite-server": "2.2.0",
+    "npm-run-all": "^4.0.1",
-    "markdown-loader": "0.1.7",
+    "pre-commit": "1.2.2",
-    "marked": "0.3.5",
+    "protractor": "5.0.0",
-    "ng2-bootstrap": "1.0.16",
+    "reflect-metadata": "0.1.9",
-    "phantomjs-polyfill": "0.0.2",
+    "require-dir": "0.3.1",
-    "phantomjs-prebuilt": "2.1.7",
+    "rxjs": "5.0.3",
-    "pre-commit": "1.1.3",
+    "systemjs-builder": "0.15.34",
-    "prismjs": "1.4.1",
+    "ts-helpers": "^1.1.1",
-    "prismjs-loader": "0.0.3",
+    "ts-node": "2.0.0",
-    "raw-loader": "0.5.1",
+    "tslint": "4.3.1",
-    "reflect-metadata": "0.1.2",
+    "tslint-config-valorsoft": "1.2.0",
-    "require-dir": "0.3.0",
+    "typedoc": "0.5.5",
-    "rxjs": "5.0.0-beta.6",
+    "typescript": "2.1.5",
-    "source-map-loader": "0.1.5",
+    "wallaby-webpack": "0.0.30",
-    "systemjs-builder": "0.15.16",
+    "webdriver-manager": "11.1.1",
-    "ts-loader": "0.8.2",
+    "zone.js": "0.7.5"
-    "tslint-config-valorsoft": "1.0.3",
-    "typescript": "1.8.10",
-    "typings": "0.8.1",
-    "webpack": "1.13.0",
-    "webpack-dev-server": "1.14.1",
-    "zone.js": "0.6.12"
   },
   "contributors": [
     {
@@ -121,6 +125,16 @@
       "name": "Dmitriy Shekhovtsov",
       "email": "valorkin@gmail.com",
       "url": "https://github.com/valorkin"
+    },
+    {
+      "name": "Adrian Faciu",
+      "email": "adrian.faciu@gmail.com",
+      "url": "https://github.com/adrianfaciu"
+    },
+    {
+      "name": "Oleksandr Telnov",
+      "email": "otelnov@gmail.com",
+      "url": "https://github.com/otelnov"
     }
   ]
 }

scripts/.gitignore

@@ -0,0 +1 @@
+!**/*.js

scripts/matchers.ts

@@ -0,0 +1,21 @@
+// tslint:disable
+/**
+ * @copyright Angular ng-bootstrap team
+ */
+beforeEach(() => {
+  jasmine.addMatchers({
+    toHaveCssClass(/*util, customEqualityTests*/) {
+      return {compare: buildError(false), negativeCompare: buildError(true)};
+
+      function buildError(isNot) {
+        return function (actual, className) {
+          const orNot = isNot ? 'not ' : '';
+          return {
+            pass: actual.classList.contains(className) === !isNot,
+            message: `Expected ${actual.outerHTML} ${orNot} to contain the CSS class "${className}"`
+          };
+        };
+      }
+    }
+  });
+});

scripts/sauce-browsers.js

@@ -0,0 +1,18 @@
+module.exports.customLaunchers = function customLaunchers() {
+  return {
+    sl_chrome: {base: 'SauceLabs', browserName: 'chrome'},
+    sl_chrome_1: {base: 'SauceLabs', browserName: 'chrome', version: 'latest-1'},
+    sl_firefox: {base: 'SauceLabs', browserName: 'firefox'},
+    sl_firefox_1: {base: 'SauceLabs', browserName: 'firefox', version: 'latest-1'},
+    sl_ie9: {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'},
+    'SL_IE10': {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2012', version: '10'},
+    'SL_IE11': {base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 8.1', version: '11'},
+    'SL_EDGE': {base: 'SauceLabs', browserName: 'MicrosoftEdge', platform: 'Windows 10', version: '13.10586'},
+    'SL_IOS9': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '9.3'},
+    'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.0'},
+    'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'},
+    'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'},
+    'SL_SAFARI9': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.11', version: '9.0'}
+  };
+};
+

scripts/test.ts

@@ -0,0 +1,37 @@
+import '../demo/src/polyfills.ts';
+
+import 'zone.js/dist/long-stack-trace-zone';
+import 'zone.js/dist/proxy.js';
+import 'zone.js/dist/sync-test';
+import 'zone.js/dist/jasmine-patch';
+import 'zone.js/dist/async-test';
+import 'zone.js/dist/fake-async-test';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+import './matchers';
+
+// Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
+declare var __karma__: any;
+declare var require: any;
+
+// Prevent Karma from running prematurely.
+__karma__.loaded = Function.prototype;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+let context = require.context('../demo/src', true, /\.spec\.ts/);
+// And load the modules.
+context.keys().map(context);
+
+let context2 = require.context('../src/spec', true, /\.spec\.ts/);
+context2.keys().map(context2);
+// Finally, start Karma to run the tests.
+__karma__.start();

scripts/typings.d.ts

@@ -0,0 +1,17 @@
+// Typings reference file, you can add your own global typings here
+// https://www.typescriptlang.org/docs/handbook/writing-declaration-files.html
+
+// tslint:disable
+
+declare const System: any;
+declare const ENV:string;
+// google code-prettify
+declare const PR:any;
+
+declare const global:any;
+
+declare module jasmine {
+  interface Matchers {
+    toHaveCssClass(expected: any): boolean;
+  }
+}

src/file-upload/file-drop.directive.ts

@@ -6,9 +6,10 @@ import { FileUploader } from './file-uploader.class';
 export class FileDropDirective {
   @Input() public uploader:FileUploader;
   @Output() public fileOver:EventEmitter<any> = new EventEmitter();
-  @Output() public onFileDrop:EventEmitter<File[]> = new EventEmitter();
+  @Output() public onFileDrop:EventEmitter<File[]> = new EventEmitter<File[]>();
+
+  protected element:ElementRef;
 
-  private element:ElementRef;
   public constructor(element:ElementRef) {
     this.element = element;
   }
@@ -50,24 +51,26 @@ export class FileDropDirective {
 
   @HostListener('dragleave', ['$event'])
   public onDragLeave(event:any):any {
-    if (event.currentTarget === (this as any).element[0]) {
+    if ((this as any).element) {
-      return;
+      if (event.currentTarget === (this as any).element[0]) {
+        return;
+      }
     }
 
     this._preventAndStop(event);
     this.fileOver.emit(false);
   }
 
-  private _getTransfer(event:any):any {
+  protected _getTransfer(event:any):any {
     return event.dataTransfer ? event.dataTransfer : event.originalEvent.dataTransfer; // jQuery fix;
   }
 
-  private _preventAndStop(event:any):any {
+  protected _preventAndStop(event:any):any {
     event.preventDefault();
     event.stopPropagation();
   }
 
-  private _haveFiles(types:any):any {
+  protected _haveFiles(types:any):any {
     if (!types) {
       return false;
     }
@@ -80,12 +83,13 @@ export class FileDropDirective {
       return false;
     }
   }
-/*
-  _addOverClass(item:any):any {
-    item.addOverClass();
-  }
 
-  _removeOverClass(item:any):any {
+  /*
-    item.removeOverClass();
+   _addOverClass(item:any):any {
-  }*/
+   item.addOverClass();
+   }
+
+   _removeOverClass(item:any):any {
+   item.removeOverClass();
+   }*/
 }

src/file-upload/file-item.class.ts

@@ -1,14 +1,12 @@
-import {NgZone} from '@angular/core';
+import { FileLikeObject } from './file-like-object.class';
-
+import { FileUploader, ParsedResponseHeaders, FileUploaderOptions } from './file-uploader.class';
-import {FileLikeObject} from './file-like-object.class';
-import {FileUploader} from './file-uploader.class';
 
 export class FileItem {
   public file:FileLikeObject;
   public _file:File;
-  public alias:string = 'file';
+  public alias:string;
   public url:string = '/';
-  public method:string = 'POST';
+  public method:string;
   public headers:any = [];
   public withCredentials:boolean = true;
   public formData:any = [];
@@ -20,28 +18,32 @@ export class FileItem {
   public isError:boolean = false;
   public progress:number = 0;
   public index:number = void 0;
-  private _zone:NgZone;
+  public _xhr:XMLHttpRequest;
+  public _form:any;
 
-  private uploader:FileUploader;
+  protected uploader:FileUploader;
-  private some:any;
+  protected some:File;
-  private options:any;
+  protected options:FileUploaderOptions;
 
-  public constructor(uploader:FileUploader, some:any, options:any) {
+  public constructor(uploader:FileUploader, some:File, options:FileUploaderOptions) {
     this.uploader = uploader;
     this.some = some;
     this.options = options;
     this.file = new FileLikeObject(some);
     this._file = some;
+    if (uploader.options) {
+      this.method = uploader.options.method || 'POST';
+      this.alias = uploader.options.itemAlias || 'file';
+    }
     this.url = uploader.options.url;
-    this._zone = new NgZone({ enableLongStackTrace: false });
   }
 
   public upload():void {
     try {
       this.uploader.uploadItem(this);
     } catch (e) {
-      this.uploader._onCompleteItem(this, '', 0, []);
+      this.uploader._onCompleteItem(this, '', 0, {});
-      this.uploader._onErrorItem(this, '', 0, []);
+      this.uploader._onErrorItem(this, '', 0, {});
     }
   }
 
@@ -65,20 +67,20 @@ export class FileItem {
     return {progress};
   }
 
-  public onSuccess(response:any, status:any, headers:any):any {
+  public onSuccess(response:string, status:number, headers:ParsedResponseHeaders):any {
-    return {response,status,headers};
+    return {response, status, headers};
   }
 
-  public onError(response:any, status:any, headers:any):any {
+  public onError(response:string, status:number, headers:ParsedResponseHeaders):any {
-    return {response,status,headers};
+    return {response, status, headers};
   }
 
-  public onCancel(response:any, status:any, headers:any):any {
+  public onCancel(response:string, status:number, headers:ParsedResponseHeaders):any {
-    return {response,status,headers};
+    return {response, status, headers};
   }
 
-  public onComplete(response:any, status:any, headers:any):any {
+  public onComplete(response:string, status:number, headers:ParsedResponseHeaders):any {
-    return {response,status,headers};
+    return {response, status, headers};
   }
 
   public _onBeforeUpload():void {
@@ -97,13 +99,11 @@ export class FileItem {
   }
 
   public _onProgress(progress:number):void {
-    this._zone.run(() => {
+    this.progress = progress;
-      this.progress = progress;
-    });
     this.onProgress(progress);
   }
 
-  public _onSuccess(response:any, status:any, headers:any):void {
+  public _onSuccess(response:string, status:number, headers:ParsedResponseHeaders):void {
     this.isReady = false;
     this.isUploading = false;
     this.isUploaded = true;
@@ -115,7 +115,7 @@ export class FileItem {
     this.onSuccess(response, status, headers);
   }
 
-  public _onError(response:any, status:any, headers:any):void {
+  public _onError(response:string, status:number, headers:ParsedResponseHeaders):void {
     this.isReady = false;
     this.isUploading = false;
     this.isUploaded = true;
@@ -127,7 +127,7 @@ export class FileItem {
     this.onError(response, status, headers);
   }
 
-  public _onCancel(response:any, status:any, headers:any):void {
+  public _onCancel(response:string, status:number, headers:ParsedResponseHeaders):void {
     this.isReady = false;
     this.isUploading = false;
     this.isUploaded = false;
@@ -139,7 +139,7 @@ export class FileItem {
     this.onCancel(response, status, headers);
   }
 
-  public _onComplete(response:any, status:any, headers:any):void {
+  public _onComplete(response:string, status:number, headers:ParsedResponseHeaders):void {
     this.onComplete(response, status, headers);
 
     if (this.uploader.options.removeAfterUpload) {

src/file-upload/file-like-object.class.ts

@@ -23,7 +23,7 @@ export class FileLikeObject {
     this.name = path.slice(path.lastIndexOf('/') + path.lastIndexOf('\\') + 2);
   }
 
-  public _createFromObject(object:{size: number, type: string, name: string}):void {
+  public _createFromObject(object:{size:number, type:string, name:string}):void {
     // this.lastModifiedDate = copy(object.lastModifiedDate);
     this.size = object.size;
     this.type = object.type;

src/file-upload/file-select.directive.ts

@@ -1,6 +1,6 @@
 import { Directive, ElementRef, Input, HostListener } from '@angular/core';
 
-import {FileUploader} from './file-uploader.class';
+import { FileUploader } from './file-uploader.class';
 
 // todo: filters
 
@@ -8,7 +8,8 @@ import {FileUploader} from './file-uploader.class';
 export class FileSelectDirective {
   @Input() public uploader:FileUploader;
 
-  private element:ElementRef;
+  protected element:ElementRef;
+
   public constructor(element:ElementRef) {
     this.element = element;
   }
@@ -37,7 +38,7 @@ export class FileSelectDirective {
     this.uploader.addToQueue(files, options, filters);
     if (this.isEmptyAfterSelection()) {
       // todo
-      // this.element.nativeElement.properties.value = '';
+      this.element.nativeElement.value = '';
       /*this.element.nativeElement
        .replaceWith(this.element = this.element.nativeElement.clone(true)); // IE fix*/
     }

src/file-upload/file-upload.module.ts

@@ -0,0 +1,13 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { FileDropDirective } from './file-drop.directive';
+import { FileSelectDirective } from './file-select.directive';
+
+@NgModule({
+  imports: [CommonModule],
+  declarations: [FileDropDirective, FileSelectDirective],
+  exports: [FileDropDirective, FileSelectDirective]
+})
+export class FileUploadModule {
+}

src/file-upload/file-uploader.class.ts

@@ -1,6 +1,6 @@
-import {FileLikeObject} from './file-like-object.class';
+import { FileLikeObject } from './file-like-object.class';
-import {FileItem} from './file-item.class';
+import { FileItem } from './file-item.class';
-import {FileType} from './file-type.class';
+import { FileType } from './file-type.class';
 
 function isFile(value:any):boolean {
   return (File && value instanceof File);
@@ -11,45 +11,58 @@ export interface Headers {
   value:string;
 }
 
+export type ParsedResponseHeaders = {[headerFieldName:string]:string};
+
+export type FilterFunction = {name:string, fn:(item?:FileLikeObject, options?:FileUploaderOptions)=>boolean};
+
 export interface FileUploaderOptions {
   allowedMimeType?:Array<string>;
   allowedFileType?:Array<string>;
   autoUpload?:boolean;
   isHTML5?:boolean;
-  filters?:Array<any>;
+  filters?:Array<FilterFunction>;
   headers?:Array<Headers>;
+  method?:string;
+  authToken?:string;
   maxFileSize?:number;
   queueLimit?:number;
   removeAfterUpload?:boolean;
   url?:string;
+  disableMultipart?:boolean;
+  itemAlias?: string;
+  authTokenHeader?: string;
+  additionalParameter?:{[key: string]: any};
 }
 
 export class FileUploader {
 
   public authToken:string;
   public isUploading:boolean = false;
-  public queue:Array<any> = [];
+  public queue:Array<FileItem> = [];
   public progress:number = 0;
   public _nextIndex:number = 0;
   public autoUpload:any;
+  public authTokenHeader: string;
 
   public options:FileUploaderOptions = {
     autoUpload: false,
     isHTML5: true,
     filters: [],
-    removeAfterUpload: false
+    removeAfterUpload: false,
+    disableMultipart: false
   };
 
-  private _failFilterIndex:number;
+  protected _failFilterIndex:number;
 
-  public constructor(options:any) {
+  public constructor(options:FileUploaderOptions) {
     this.setOptions(options);
   }
 
-  public setOptions(options:any):void {
+  public setOptions(options:FileUploaderOptions):void {
     this.options = Object.assign(this.options, options);
 
     this.authToken = options.authToken;
+    this.authTokenHeader = options.authTokenHeader || 'Authorization';
     this.autoUpload = options.autoUpload;
     this.options.filters.unshift({name: 'queueLimit', fn: this._queueLimitFilter});
 
@@ -65,18 +78,21 @@ export class FileUploader {
       this.options.filters.unshift({name: 'mimeType', fn: this._mimeTypeFilter});
     }
 
+    for(let i = 0; i < this.queue.length; i++) {
+      this.queue[i].url = this.options.url;
+    }
     // this.options.filters.unshift({name: 'folder', fn: this._folderFilter});
   }
 
-  public addToQueue(files:any[], options?:any, filters?:any):void {
+  public addToQueue(files:File[], options?:FileUploaderOptions, filters?:FilterFunction[]|string):void {
-    let list:any[] = [];
+    let list:File[] = [];
     for (let file of files) {
       list.push(file);
     }
     let arrayOfFilters = this._getFilters(filters);
     let count = this.queue.length;
-    let addedFileItems:any[] = [];
+    let addedFileItems:FileItem[] = [];
-    list.map((some:any) => {
+    list.map((some:File) => {
       if (!options) {
         options = this.options;
       }
@@ -102,7 +118,7 @@ export class FileUploader {
     }
   }
 
-  public removeFromQueue(value:any):void {
+  public removeFromQueue(value:FileItem):void {
     let index = this.getIndexOfItem(value);
     let item = this.queue[index];
     if (item.isUploading) {
@@ -131,27 +147,27 @@ export class FileUploader {
     (this as any)[transport](item);
   }
 
-  public cancelItem(value:any):void {
+  public cancelItem(value:FileItem):void {
     let index = this.getIndexOfItem(value);
     let item = this.queue[index];
-    let prop = this.options.isHTML5 ? '_xhr' : '_form';
+    let prop = this.options.isHTML5 ? item._xhr : item._form;
     if (item && item.isUploading) {
-      item[prop].abort();
+      prop.abort();
     }
   }
 
   public uploadAll():void {
-    let items = this.getNotUploadedItems().filter((item:any) => !item.isUploading);
+    let items = this.getNotUploadedItems().filter((item:FileItem) => !item.isUploading);
     if (!items.length) {
       return;
     }
-    items.map((item:any) => item._prepareToUploading());
+    items.map((item:FileItem) => item._prepareToUploading());
     items[0].upload();
   }
 
   public cancelAll():void {
     let items = this.getNotUploadedItems();
-    items.map((item:any) => item.cancel());
+    items.map((item:FileItem) => item.cancel());
   }
 
   public isFile(value:any):boolean {
@@ -167,12 +183,12 @@ export class FileUploader {
   }
 
   public getNotUploadedItems():Array<any> {
-    return this.queue.filter((item:any) => !item.isUploaded);
+    return this.queue.filter((item:FileItem) => !item.isUploaded);
   }
 
   public getReadyItems():Array<any> {
     return this.queue
-      .filter((item:any) => (item.isReady && !item.isUploading))
+      .filter((item:FileItem) => (item.isReady && !item.isUploading))
       .sort((item1:any, item2:any) => item1.index - item2.index);
   }
 
@@ -189,23 +205,23 @@ export class FileUploader {
     return {fileItems};
   }
 
-  public onBuildItemForm(fileItem:any, form:any):any {
+  public onBuildItemForm(fileItem:FileItem, form:any):any {
     return {fileItem, form};
   }
 
-  public onAfterAddingFile(fileItem:any):any {
+  public onAfterAddingFile(fileItem:FileItem):any {
     return {fileItem};
   }
 
-  public onWhenAddingFileFailed(item:any, filter:any, options:any):any {
+  public onWhenAddingFileFailed(item:FileLikeObject, filter:any, options:any):any {
     return {item, filter, options};
   }
 
-  public onBeforeUploadItem(fileItem:any):any {
+  public onBeforeUploadItem(fileItem:FileItem):any {
     return {fileItem};
   }
 
-  public onProgressItem(fileItem:any, progress:any):any {
+  public onProgressItem(fileItem:FileItem, progress:any):any {
     return {fileItem, progress};
   }
 
@@ -213,19 +229,19 @@ export class FileUploader {
     return {progress};
   }
 
-  public onSuccessItem(item:any, response:any, status:any, headers:any):any {
+  public onSuccessItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):any {
     return {item, response, status, headers};
   }
 
-  public onErrorItem(item:any, response:any, status:any, headers:any):any {
+  public onErrorItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):any {
     return {item, response, status, headers};
   }
 
-  public onCancelItem(item:any, response:any, status:any, headers:any):any {
+  public onCancelItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):any {
     return {item, response, status, headers};
   }
 
-  public onCompleteItem(item:any, response:any, status:any, headers:any):any {
+  public onCompleteItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):any {
     return {item, response, status, headers};
   }
 
@@ -233,25 +249,25 @@ export class FileUploader {
     return void 0;
   }
 
-  public _mimeTypeFilter(item:any):boolean {
+  public _mimeTypeFilter(item:FileLikeObject):boolean {
     return !(this.options.allowedMimeType && this.options.allowedMimeType.indexOf(item.type) === -1);
   }
 
-  public _fileSizeFilter(item:any):boolean {
+  public _fileSizeFilter(item:FileLikeObject):boolean {
     return !(this.options.maxFileSize && item.size > this.options.maxFileSize);
   }
 
-  public _fileTypeFilter(item:any):boolean {
+  public _fileTypeFilter(item:FileLikeObject):boolean {
     return !(this.options.allowedFileType &&
     this.options.allowedFileType.indexOf(FileType.getMimeClass(item)) === -1);
   }
 
-  public _onErrorItem(item:any, response:any, status:any, headers:any):void {
+  public _onErrorItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):void {
     item._onError(response, status, headers);
     this.onErrorItem(item, response, status, headers);
   }
 
-  public _onCompleteItem(item:any, response:any, status:any, headers:any):void {
+  public _onCompleteItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):void {
     item._onComplete(response, status, headers);
     this.onCompleteItem(item, response, status, headers);
     let nextItem = this.getReadyItems()[0];
@@ -265,8 +281,8 @@ export class FileUploader {
     this._render();
   }
 
-  protected _headersGetter(parsedHeaders:any):any {
+  protected _headersGetter(parsedHeaders:ParsedResponseHeaders):any {
-    return (name:any) => {
+    return (name:any):any => {
       if (name) {
         return parsedHeaders[name.toLowerCase()] || void 0;
       }
@@ -274,9 +290,9 @@ export class FileUploader {
     };
   }
 
-  protected _xhrTransport(item:any):any {
+  protected _xhrTransport(item:FileItem):any {
     let xhr = item._xhr = new XMLHttpRequest();
-    let form = new FormData();
+    let sendable:any;
     this._onBeforeUploadItem(item);
     // todo
     /*item.formData.map(obj => {
@@ -287,9 +303,21 @@ export class FileUploader {
     if (typeof item._file.size !== 'number') {
       throw new TypeError('The file specified is no longer valid');
     }
-    this._onBuildItemForm(item, form);
+    if (!this.options.disableMultipart) {
+      sendable = new FormData();
+      this._onBuildItemForm(item, sendable);
+
+      sendable.append(item.alias, item._file, item.file.name);
+
+      if (this.options.additionalParameter !== undefined) {
+        Object.keys(this.options.additionalParameter).forEach((key:string) => {
+          sendable.append(key, this.options.additionalParameter[key]);
+        });
+      }
+    } else {
+      sendable = item._file;
+    }
 
-    form.append(item.alias, item._file, item.file.name);
     xhr.upload.onprogress = (event:any) => {
       let progress = Math.round(event.lengthComputable ? event.loaded * 100 / event.total : 0);
       this._onProgressItem(item, progress);
@@ -316,23 +344,24 @@ export class FileUploader {
     };
     xhr.open(item.method, item.url, true);
     xhr.withCredentials = item.withCredentials;
-    // todo
-    /*item.headers.map((value, name) => {
-     xhr.setRequestHeader(name, value);
-     });*/
     if (this.options.headers) {
       for (let header of this.options.headers) {
         xhr.setRequestHeader(header.name, header.value);
       }
     }
-    if (this.authToken) {
+    if (item.headers.length) {
-      xhr.setRequestHeader('Authorization', this.authToken);
+      for (let header of item.headers) {
+        xhr.setRequestHeader(header.name, header.value);
+      }
     }
-    xhr.send(form);
+    if (this.authToken) {
+      xhr.setRequestHeader(this.authTokenHeader, this.authToken);
+    }
+    xhr.send(sendable);
     this._render();
   }
 
-  private _getTotalProgress(value:number = 0):number {
+  protected _getTotalProgress(value:number = 0):number {
     if (this.options.removeAfterUpload) {
       return value;
     }
@@ -343,7 +372,7 @@ export class FileUploader {
     return Math.round(uploaded * ratio + current);
   }
 
-  private _getFilters(filters:any):any {
+  protected _getFilters(filters:FilterFunction[]|string):FilterFunction[] {
     if (!filters) {
       return this.options.filters;
     }
@@ -358,33 +387,33 @@ export class FileUploader {
     return this.options.filters;
   }
 
-  private _render():any {
+  protected _render():any {
     return void 0;
     // todo: ?
   }
 
-  // private _folderFilter(item:any):boolean {
+  // protected _folderFilter(item:FileItem):boolean {
   //   return !!(item.size || item.type);
   // }
 
-  private _queueLimitFilter():boolean {
+  protected _queueLimitFilter():boolean {
     return this.options.queueLimit === undefined || this.queue.length < this.options.queueLimit;
   }
 
-  private _isValidFile(file:any, filters:any, options:any):boolean {
+  protected _isValidFile(file:FileLikeObject, filters:FilterFunction[], options:FileUploaderOptions):boolean {
     this._failFilterIndex = -1;
-    return !filters.length ? true : filters.every((filter:any) => {
+    return !filters.length ? true : filters.every((filter:FilterFunction) => {
       this._failFilterIndex++;
       return filter.fn.call(this, file, options);
     });
   }
 
-  private _isSuccessCode(status:any):boolean {
+  protected _isSuccessCode(status:number):boolean {
     return (status >= 200 && status < 300) || status === 304;
   }
 
   /* tslint:disable */
-  private _transformResponse(response:any, headers:any):any {
+  protected _transformResponse(response:string, headers:ParsedResponseHeaders):string {
     // todo: ?
     /*var headersGetter = this._headersGetter(headers);
      forEach($http.defaults.transformResponse, (transformFn) => {
@@ -394,7 +423,7 @@ export class FileUploader {
   }
 
   /* tslint:enable */
-  private _parseHeaders(headers:any):any {
+  protected _parseHeaders(headers:string):ParsedResponseHeaders {
     let parsed:any = {};
     let key:any;
     let val:any;
@@ -413,33 +442,33 @@ export class FileUploader {
     return parsed;
   }
 
-  /*private _iframeTransport(item:any) {
+  /*protected _iframeTransport(item:FileItem) {
    // todo: implement it later
    }*/
 
-  private _onWhenAddingFileFailed(item:any, filter:any, options:any):void {
+  protected _onWhenAddingFileFailed(item:FileLikeObject, filter:any, options:any):void {
     this.onWhenAddingFileFailed(item, filter, options);
   }
 
-  private _onAfterAddingFile(item:any):void {
+  protected _onAfterAddingFile(item:FileItem):void {
     this.onAfterAddingFile(item);
   }
 
-  private _onAfterAddingAll(items:any):void {
+  protected _onAfterAddingAll(items:any):void {
     this.onAfterAddingAll(items);
   }
 
-  private _onBeforeUploadItem(item:any):void {
+  protected _onBeforeUploadItem(item:FileItem):void {
     item._onBeforeUpload();
     this.onBeforeUploadItem(item);
   }
 
-  private _onBuildItemForm(item:any, form:any):void {
+  protected _onBuildItemForm(item:FileItem, form:any):void {
     item._onBuildForm(form);
     this.onBuildItemForm(item, form);
   }
 
-  private _onProgressItem(item:any, progress:any):void {
+  protected _onProgressItem(item:FileItem, progress:any):void {
     let total = this._getTotalProgress(progress);
     this.progress = total;
     item._onProgress(progress);
@@ -449,13 +478,13 @@ export class FileUploader {
   }
 
   /* tslint:disable */
-  private _onSuccessItem(item:any, response:any, status:any, headers:any):void {
+  protected _onSuccessItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):void {
     item._onSuccess(response, status, headers);
     this.onSuccessItem(item, response, status, headers);
   }
 
   /* tslint:enable */
-  private _onCancelItem(item:any, response:any, status:any, headers:any):void {
+  protected _onCancelItem(item:FileItem, response:string, status:number, headers:ParsedResponseHeaders):void {
     item._onCancel(response, status, headers);
     this.onCancelItem(item, response, status, headers);
   }

src/index.ts

@@ -0,0 +1,6 @@
+export * from  './file-upload/file-select.directive';
+export * from  './file-upload/file-drop.directive';
+export * from  './file-upload/file-uploader.class';
+export * from './file-upload/file-item.class';
+
+export { FileUploadModule } from './file-upload/file-upload.module';

src/ng2-file-upload.ts

@@ -0,0 +1 @@
+export * from './index';

src/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "ng2-file-upload",
+  "version": "1.2.0",
+  "peerDependencies": {
+    "@angular/common": "*",
+    "@angular/core": "*"
+  }
+}

src/spec/file-drop.directive.spec.ts

@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+import { inject, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { FileUploader } from '../file-upload/file-uploader.class';
+import { FileUploadModule } from '../file-upload/file-upload.module';
+
+@Component({
+  selector: 'container',
+  template: `<input type="file" ng2FileSelect [uploader]="uploader" />`
+})
+export class ContainerComponent {
+  public uploader:FileUploader = new FileUploader({url: 'localhost:3000'});
+}
+
+describe('Directive: FileSelectDirective', () => {
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [FileUploadModule],
+      declarations: [ContainerComponent],
+      providers: [ContainerComponent]
+    });
+  });
+
+  it('should be fine', inject([ContainerComponent], (fixture:ComponentFixture<ContainerComponent>) => {
+    expect(fixture).not.toBeNull();
+  }));
+});

src/tsconfig.json

@@ -0,0 +1,37 @@
+{
+  "compilerOptions": {
+    "outDir": "../dist",
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "sourceMap": false,
+    "noEmitHelpers": false,
+    "noImplicitAny": true,
+    "declaration": true,
+    "skipLibCheck": true,
+    "stripInternal": true,
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    "lib": ["dom", "es6"],
+    "types": [
+      "jasmine",
+      "webpack"
+    ],
+    "typeRoots": [
+      "../node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "node_modules"
+  ],
+  "files": [
+    "../scripts/typings.d.ts",
+    "./ng2-file-upload.ts",
+    "./index.ts"
+  ],
+  "angularCompilerOptions": {
+    "genDir": "../temp/factories"
+  }
+}

test.bundle.js

@@ -1,47 +0,0 @@
-'use strict';
-
-/* eslint vars-on-top:0 no-var:0 */
-// @AngularClass
-/*
- * When testing with webpack and ES6, we have to do some extra
- * things get testing to work right. Because we are gonna write test
- * in ES6 to, we have to compile those as well. That's handled in
- * karma.conf.js with the karma-webpack plugin. This is the entry
- * file for webpack test. Just like webpack will create a bundle.js
- * file for our client, when we run test, it well compile and bundle them
- * all here! Crazy huh. So we need to do some setup
- */
-Error.stackTraceLimit = Infinity;
-require('phantomjs-polyfill');
-require('es6-promise');
-require('es6-shim');
-require('es7-reflect-metadata/dist/browser');
-
-// require('zone.js');
-require('zone.js/dist/zone.js');
-require('zone.js/dist/long-stack-trace-zone.js');
-require('zone.js/dist/jasmine-patch.js');
-require('zone.js/dist/async-test.js');
-
-var testing = require('@angular/core/testing');
-var browser = require('@angular/platform-browser-dynamic/testing');
-
-testing.setBaseTestProviders(
-  browser.TEST_BROWSER_DYNAMIC_PLATFORM_PROVIDERS,
-  browser.TEST_BROWSER_DYNAMIC_APPLICATION_PROVIDERS);
-
-/*
- Ok, this is kinda crazy. We can use the the context method on
- require that webpack created in order to tell webpack
- what files we actually want to require or import.
- Below, context will be an function/object with file names as keys.
- using that regex we are saying look in ./src/app and ./test then find
- any file that ends with spec.js and get its path. By passing in true
- we say do this recursively
- */
-var testContext = require.context('./components', true, /\.spec\.ts/);
-
-// get all the files, for each file, call the context function
-// that will require the file and load it up here. Context will
-// loop and require those spec files here
-testContext.keys().forEach(testContext);

tsconfig.json

@@ -1,22 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "sourceMap": false,
-    "declaration": true,
-    "removeComments": false,
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "noImplicitAny": true,
-    "listFiles": false,
-    "noLib": false
-  },
-  "exclude": [
-    "node_modules"
-  ],
-  "files": [
-    "./typings/browser.d.ts",
-    "./ng2-file-upload.ts"
-  ]
-}

tslint.json

@@ -1,4 +1,12 @@
 {
   "extends": "tslint-config-valorsoft",
-  "rulesDirectory": "./node_modules/codelyzer"
+  "rulesDirectory": "./node_modules/codelyzer",
+  "rules": {
+    "no-forward-ref": false,
+    "no-null-keyword": false,
+    "only-arrow-functions": false,
+    "no-access-missing-member": false,
+    "directive-selector": false,
+    "component-selector": false
+  }
 }

typings.json

@@ -1,12 +0,0 @@
-{
-  "dependencies": {
-    "moment": "registry:npm/moment#2.10.5+20160211003958",
-    "webpack": "registry:npm/webpack#1.12.9+20160219013405"
-  },
-  "devDependencies": {},
-  "ambientDependencies": {
-    "es6-shim": "registry:dt/es6-shim#0.31.2+20160317120654",
-    "jasmine": "registry:dt/jasmine#2.2.0+20160317120654",
-    "require": "registry:dt/require#2.1.20+20160316155526"
-  }
-}

webpack.config.js

@@ -1,178 +0,0 @@
-/* eslint global-require: 0 */
-'use strict';
-
-const path = require('path');
-const marked = require('marked');
-const webpack = require('webpack');
-const reqPrism = require('prismjs');
-const CompressionPlugin = require('compression-webpack-plugin');
-const CopyWebpackPlugin = require('copy-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-
-// marked renderer hack
-marked.Renderer.prototype.code = function renderCode(code, lang) {
-  const out = this.options.highlight(code, lang);
-  const classMap = this.options.langPrefix + lang;
-
-  if (!lang) {
-    return `<pre><code>${out}\n</code></pre>`;
-  }
-  return `<pre class="${classMap}"><code class="${classMap}">${out}\n</code></pre>\n`;
-};
-
-/*eslint no-process-env:0, camelcase:0*/
-const isProduction = (process.env.NODE_ENV || 'development') === 'production';
-const devtool = process.env.NODE_ENV === 'test' ? 'inline-source-map' : 'source-map';
-const dest = 'demo-build';
-const absDest = root(dest);
-
-const config = {
-  // isProduction ? 'source-map' : 'evale',
-  devtool,
-  debug: false,
-
-  verbose: true,
-  displayErrorDetails: true,
-  context: __dirname,
-  stats: {
-    colors: true,
-    reasons: true
-  },
-
-  resolve: {
-    cache: false,
-    root: __dirname,
-    extensions: ['', '.ts', '.js', '.json']
-  },
-
-  entry: {
-    angular2: [
-      // Angular 2 Deps
-      'es6-shim',
-      'es6-promise',
-      'zone.js',
-      'reflect-metadata',
-      '@angular/common',
-      '@angular/core'
-    ],
-    'angular2-bootstrap': ['ng2-file-upload'],
-    'angular2-bootstrap-demo': 'demo'
-  },
-
-  output: {
-    path: absDest,
-    filename: '[name].js',
-    sourceMapFilename: '[name].js.map',
-    chunkFilename: '[id].chunk.js'
-  },
-
-  // our Development Server configs
-  devServer: {
-    inline: true,
-    colors: true,
-    historyApiFallback: true,
-    contentBase: dest,
-    //publicPath: dest,
-    outputPath: dest,
-    watchOptions: {aggregateTimeout: 300, poll: 1000}
-  },
-
-  markdownLoader: {
-    langPrefix: 'language-',
-    highlight(code, lang) {
-      const language = !lang || lang === 'html' ? 'markup' : lang;
-      const Prism = global.Prism || reqPrism;
-
-      if (!Prism.languages[language]) {
-        require(`prismjs/components/prism-${language}.js`);
-      }
-      return Prism.highlight(code, Prism.languages[language]);
-    }
-  },
-  module: {
-    loaders: [
-      // support markdown
-      {test: /\.md$/, loader: 'html?minimize=false!markdown'},
-      // Support for *.json files.
-      {test: /\.json$/, loader: 'json'},
-      // Support for CSS as raw text
-      {test: /\.css$/, loader: 'raw'},
-      // support for .html as raw text
-      {test: /\.html$/, loader: 'raw'},
-      // Support for .ts files.
-      {
-        test: /\.ts$/,
-        loader: 'ts',
-        query: {
-          compilerOptions: {
-            removeComments: true,
-            noEmitHelpers: false
-          }
-        },
-        exclude: [/\.(spec|e2e)\.ts$/]
-      }
-    ],
-    noParse: [
-      /rtts_assert\/src\/rtts_assert/,
-      /reflect-metadata/,
-      /zone\.js\/dist\/zone-microtask/
-    ]
-  },
-
-  plugins: [
-    //new Clean([dest]),
-    new webpack.optimize.DedupePlugin(),
-    new webpack.optimize.OccurenceOrderPlugin(true),
-    new webpack.optimize.CommonsChunkPlugin({
-      name: 'angular2',
-      minChunks: Infinity,
-      filename: 'angular2.js'
-    }),
-    // static assets
-    new CopyWebpackPlugin([{from: 'demo/favicon.ico', to: 'favicon.ico'}]),
-    new CopyWebpackPlugin([{from: 'demo/assets', to: 'assets'}]),
-    // generating html
-    new HtmlWebpackPlugin({template: 'demo/index.html'})
-  ],
-  pushPlugins() {
-    if (!isProduction) {
-      return;
-    }
-    const plugins = [
-      //production only
-      new webpack.optimize.UglifyJsPlugin({
-        beautify: false,
-        mangle: false,
-        comments: false,
-        compress: {
-          screw_ie8: true
-          //warnings: false,
-          //drop_debugger: false
-        }
-        //verbose: true,
-        //beautify: false,
-        //quote_style: 3
-      }),
-      new CompressionPlugin({
-        asset: '{file}.gz',
-        algorithm: 'gzip',
-        regExp: /\.js$|\.html|\.css|.map$/,
-        threshold: 10240,
-        minRatio: 0.8
-      })
-    ];
-
-    this
-      .plugins
-      .push
-      .apply(plugins);
-  }
-};
-
-config.pushPlugins();
-
-module.exports = config;
-
-function root(partialPath) {
-  return path.join(__dirname, partialPath);
-}