From 3cc6a9946f3c12ce9a463411938252ee3d64a78f Mon Sep 17 00:00:00 2001 From: Dmitriy Shekhovtsov Date: Tue, 17 Jan 2017 16:38:35 +0200 Subject: [PATCH] feat(package): upgrade to ng v2.3+ (#574) --- .config/bundle-system.js | 107 - .eslintrc.json | 6 - .gitignore | 54 +- .ng2-config.js | 29 - .npmignore | 27 - .travis.yml | 14 +- LICENSE | 4 +- angular-cli.json | 57 + demo/.gitignore | 2 + demo/assets/css/prism-okaidia.css | 119 - demo/bs-config.json | 4 + demo/components/file-upload-section.ts | 69 - .../file-upload/zs-file-demo/demo.html | 3 - .../file-upload/zs-file-demo/demo.ts | 122 - demo/custom-typings.d.ts | 1 - demo/index.ts | 4 - demo/ng2-file-upload-demo.module.ts | 18 - demo/polyfills.ts | 28 - .../file-upload => server}/file-catcher.js | 0 demo/{ => src/app}/app.component.ts | 15 +- demo/src/app/app.module.ts | 19 + .../app/components/file-upload-section.html | 40 + .../src/app/components/file-upload-section.ts | 29 + .../components/file-upload/file-catcher.js | 50 + .../components/file-upload/simple-demo.html | 0 .../components/file-upload/simple-demo.ts | 7 +- demo/src/app/index.ts | 2 + demo/{ => src}/assets/css/glyphicons.css | 0 demo/src/assets/css/prettify-angulario.css | 217 + demo/{ => src}/assets/css/style.css | 0 .../fonts/glyphicons-halflings-regular.eot | Bin .../fonts/glyphicons-halflings-regular.svg | 0 .../fonts/glyphicons-halflings-regular.ttf | Bin .../fonts/glyphicons-halflings-regular.woff | Bin .../fonts/glyphicons-halflings-regular.woff2 | Bin demo/src/assets/js/prettify.min.js | 36 + .../file-upload/readme.md => demo/src/doc.md | 0 demo/src/environments/environment.prod.ts | 3 + demo/src/environments/environment.ts | 8 + demo/src/favicon.ico | Bin 0 -> 5430 bytes demo/{ => src}/getting-started.md | 0 demo/{ => src}/index.html | 10 +- demo/src/main.ts | 12 + demo/src/polyfills.ts | 21 + demo/src/tsconfig.json | 22 + demo/src/typings.d.ts | 16 + demo/vendor.ts | 23 - gulp-tasks/lint.js | 21 - gulpfile.js | 9 - karma.conf.js | 86 +- ng2-file-upload.ts | 6 - package.json | 147 +- protractor.conf.js | 5 - scripts/.gitignore | 1 + scripts/matchers.ts | 21 + scripts/sauce-browsers.js | 18 + scripts/test.ts | 37 + scripts/typings.d.ts | 17 + spec-bundle.js | 65 - .../file-upload/file-drop.directive.ts | 0 .../file-upload/file-item.class.ts | 0 .../file-upload/file-like-object.class.ts | 0 .../file-upload/file-select.directive.ts | 0 .../file-upload/file-type.class.ts | 0 .../file-upload/file-upload.module.ts | 0 .../file-upload/file-uploader.class.ts | 0 src/index.ts | 6 + src/ng2-file-upload.ts | 1 + src/package.json | 8 + .../spec}/file-drop.directive.spec.ts | 4 +- tsconfig.publish.json => src/tsconfig.json | 26 +- tsconfig.json | 35 - tslint.json | 8 +- webpack.config.js | 51 - yarn.lock | 5334 +++++++++-------- 75 files changed, 3848 insertions(+), 3256 deletions(-) delete mode 100755 .config/bundle-system.js delete mode 100644 .eslintrc.json delete mode 100644 .ng2-config.js delete mode 100644 .npmignore create mode 100644 angular-cli.json create mode 100644 demo/.gitignore delete mode 100644 demo/assets/css/prism-okaidia.css create mode 100644 demo/bs-config.json delete mode 100644 demo/components/file-upload-section.ts delete mode 100644 demo/components/file-upload/zs-file-demo/demo.html delete mode 100644 demo/components/file-upload/zs-file-demo/demo.ts delete mode 100644 demo/custom-typings.d.ts delete mode 100644 demo/index.ts delete mode 100644 demo/ng2-file-upload-demo.module.ts delete mode 100644 demo/polyfills.ts rename demo/{components/file-upload => server}/file-catcher.js (100%) rename demo/{ => src/app}/app.component.ts (74%) create mode 100644 demo/src/app/app.module.ts create mode 100644 demo/src/app/components/file-upload-section.html create mode 100644 demo/src/app/components/file-upload-section.ts create mode 100644 demo/src/app/components/file-upload/file-catcher.js rename demo/{ => src/app}/components/file-upload/simple-demo.html (100%) rename demo/{ => src/app}/components/file-upload/simple-demo.ts (77%) create mode 100644 demo/src/app/index.ts rename demo/{ => src}/assets/css/glyphicons.css (100%) create mode 100644 demo/src/assets/css/prettify-angulario.css rename demo/{ => src}/assets/css/style.css (100%) rename demo/{ => src}/assets/fonts/glyphicons-halflings-regular.eot (100%) rename demo/{ => src}/assets/fonts/glyphicons-halflings-regular.svg (100%) rename demo/{ => src}/assets/fonts/glyphicons-halflings-regular.ttf (100%) rename demo/{ => src}/assets/fonts/glyphicons-halflings-regular.woff (100%) rename demo/{ => src}/assets/fonts/glyphicons-halflings-regular.woff2 (100%) create mode 100644 demo/src/assets/js/prettify.min.js rename components/file-upload/readme.md => demo/src/doc.md (100%) create mode 100644 demo/src/environments/environment.prod.ts create mode 100644 demo/src/environments/environment.ts create mode 100644 demo/src/favicon.ico rename demo/{ => src}/getting-started.md (100%) rename demo/{ => src}/index.html (77%) create mode 100644 demo/src/main.ts create mode 100644 demo/src/polyfills.ts create mode 100644 demo/src/tsconfig.json create mode 100644 demo/src/typings.d.ts delete mode 100644 demo/vendor.ts delete mode 100644 gulp-tasks/lint.js delete mode 100644 gulpfile.js delete mode 100644 ng2-file-upload.ts delete mode 100644 protractor.conf.js create mode 100644 scripts/.gitignore create mode 100644 scripts/matchers.ts create mode 100644 scripts/sauce-browsers.js create mode 100644 scripts/test.ts create mode 100644 scripts/typings.d.ts delete mode 100644 spec-bundle.js rename {components => src}/file-upload/file-drop.directive.ts (100%) rename {components => src}/file-upload/file-item.class.ts (100%) rename {components => src}/file-upload/file-like-object.class.ts (100%) rename {components => src}/file-upload/file-select.directive.ts (100%) rename {components => src}/file-upload/file-type.class.ts (100%) rename {components => src}/file-upload/file-upload.module.ts (100%) rename {components => src}/file-upload/file-uploader.class.ts (100%) create mode 100644 src/index.ts create mode 100644 src/ng2-file-upload.ts create mode 100644 src/package.json rename {components/file-upload => src/spec}/file-drop.directive.spec.ts (84%) rename tsconfig.publish.json => src/tsconfig.json (56%) delete mode 100644 tsconfig.json delete mode 100644 webpack.config.js diff --git a/.config/bundle-system.js b/.config/bundle-system.js deleted file mode 100755 index 9c8cc53c..00000000 --- a/.config/bundle-system.js +++ /dev/null @@ -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); -} diff --git a/.eslintrc.json b/.eslintrc.json deleted file mode 100644 index f8afe993..00000000 --- a/.eslintrc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "extends": "./node_modules/eslint-config-valorsoft/.eslintrc.json", - "env": { - "node": true - } -} diff --git a/.gitignore b/.gitignore index ef8186d1..0eae0155 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,38 @@ # Dependency directory # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git /node_modules -npm-debug.log +/bower_components -# type script artifacts -/typings +# IDEs and editors +/.idea +/.vscode +.project +.classpath +*.launch +.settings/ -# WebStorm -.idea -.vscode +# misc +/.sass-cache +/connect.lock +/coverage +/libpeerconnection.log +npm-debug.log # ignore build and dist for now -/bundles -/demo-build /dist -/coverage -/ts - -# ignore incline compiling -/demo/**/*.js -/demo/**/*.d.ts -!/demo/custom-typings.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 +/temp +/demo/dist +/demo/temp /logs -!/demo/components/file-upload/file-catcher.js +#System Files +.DS_Store +Thumbs.db + -# AoT generated files -factories -/**/*.metadata.json -/**/*.ngfactory.ts +/demo/e2e/*.js +/demo/e2e/*.map +src/**/*.js +src/**/*.map +scripts/**/*.js +scripts/**/*.map diff --git a/.ng2-config.js b/.ng2-config.js deleted file mode 100644 index 1229229e..00000000 --- a/.ng2-config.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; -var pkg = require('./package.json'); - -module.exports = { - // metadata - title: pkg.description, - baseUrl: '/', - // root folder name - src: 'demo', - dist: 'demo-build', - htmlIndexes: ['index.html'], - // karma bundle src - spec: './spec-bundle.js', - // webpack entry - entry: { - polyfills: './demo/polyfills.ts', - vendor: './demo/vendor.ts', - main: './demo/index.ts' - }, - commonChunks: { - name: ['polyfills', 'vendor'].reverse() - }, - // webpack alias - alias: {}, - copy: [ - {from: 'demo/favicon.ico', to: 'favicon.ico'}, - {from: 'demo/assets', to: 'assets'} - ] -}; diff --git a/.npmignore b/.npmignore deleted file mode 100644 index c869fd9d..00000000 --- a/.npmignore +++ /dev/null @@ -1,27 +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 - -# AoT generated files -factories -/**/*.ngfactory.ts \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index a56a926f..85a38507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,16 +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 test + - npm run pretest + - npm run test-coverage after_success: - - ./node_modules/.bin/codecov -f coverage/coverage-final.json + - ./node_modules/.bin/codecov addons: - # sauce labs tunel connector (read more https://docs.travis-ci.com/user/sauce-connect/ ) - sauce_connect: true - firefox: "42.0" + firefox: "latest" apt: sources: - ubuntu-toolchain-r-test diff --git a/LICENSE b/LICENSE index bf4dedb9..59f8feed 100644 --- a/LICENSE +++ b/LICENSE @@ -1,7 +1,7 @@ The MIT License (MIT) -Copyright (c) 2015 Dmitriy Shekhovtsov -Copyright (c) 2015 Valor Software +Copyright (c) 2015-2017 Dmitriy Shekhovtsov +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 diff --git a/angular-cli.json b/angular-cli.json new file mode 100644 index 00000000..85da1ff3 --- /dev/null +++ b/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 + } + } +} diff --git a/demo/.gitignore b/demo/.gitignore new file mode 100644 index 00000000..c4afc525 --- /dev/null +++ b/demo/.gitignore @@ -0,0 +1,2 @@ +# Created by .ignore support plugin (hsz.mobi) +src/api-doc.json diff --git a/demo/assets/css/prism-okaidia.css b/demo/assets/css/prism-okaidia.css deleted file mode 100644 index 0fac6828..00000000 --- a/demo/assets/css/prism-okaidia.css +++ /dev/null @@ -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; -} diff --git a/demo/bs-config.json b/demo/bs-config.json new file mode 100644 index 00000000..44c422ad --- /dev/null +++ b/demo/bs-config.json @@ -0,0 +1,4 @@ +{ + "port": 4200, + "server": { "baseDir": "./demo/dist" } +} diff --git a/demo/components/file-upload-section.ts b/demo/components/file-upload-section.ts deleted file mode 100644 index c374c100..00000000 --- a/demo/components/file-upload-section.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { Component } from '@angular/core'; - -let doc = require('../../components/file-upload/readme.md'); - -let tabDesc:Array = [ - { - 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') - } -]; - -@Component({ - selector: 'file-upload-section', - template: ` -
-
- - -
- - - -
- -
- - -
-
-
- - -
-
-
- - -
-
-
- - -
-
- - -
- -
-

API

-
-
-
- ` -}) -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; - } - } -} diff --git a/demo/components/file-upload/zs-file-demo/demo.html b/demo/components/file-upload/zs-file-demo/demo.html deleted file mode 100644 index 6984b24e..00000000 --- a/demo/components/file-upload/zs-file-demo/demo.html +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/demo/components/file-upload/zs-file-demo/demo.ts b/demo/components/file-upload/zs-file-demo/demo.ts deleted file mode 100644 index eb19adda..00000000 --- a/demo/components/file-upload/zs-file-demo/demo.ts +++ /dev/null @@ -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; - @Input() public allowedFileType:Array; - @Input() public headers:Array; - - @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; - } - } - -} diff --git a/demo/custom-typings.d.ts b/demo/custom-typings.d.ts deleted file mode 100644 index 8b7203f2..00000000 --- a/demo/custom-typings.d.ts +++ /dev/null @@ -1 +0,0 @@ -declare const ENV:string; diff --git a/demo/index.ts b/demo/index.ts deleted file mode 100644 index c732090e..00000000 --- a/demo/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; -import { NgFileUploadDemo } from './ng2-file-upload-demo.module'; - -platformBrowserDynamic().bootstrapModule(NgFileUploadDemo); diff --git a/demo/ng2-file-upload-demo.module.ts b/demo/ng2-file-upload-demo.module.ts deleted file mode 100644 index ca73c121..00000000 --- a/demo/ng2-file-upload-demo.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { BrowserModule } from '@angular/platform-browser'; - -import { Ng2BootstrapModule } from 'ng2-bootstrap/ng2-bootstrap'; -import { FileUploadModule } from '../components/file-upload/file-upload.module'; -import { DemoComponent } from './app.component.ts'; -import { FileUploadSectionComponent } from './components/file-upload-section'; -import { SimpleDemoComponent } from './components/file-upload/simple-demo'; - -@NgModule({ - imports: [BrowserModule, CommonModule, FileUploadModule, Ng2BootstrapModule, FormsModule], - declarations: [DemoComponent, FileUploadSectionComponent, SimpleDemoComponent], - bootstrap: [DemoComponent] -}) -export class NgFileUploadDemo { -} diff --git a/demo/polyfills.ts b/demo/polyfills.ts deleted file mode 100644 index d27ff360..00000000 --- a/demo/polyfills.ts +++ /dev/null @@ -1,28 +0,0 @@ -// Polyfills -// (these modules are what are in 'angular2/bundles/angular2-polyfills' so don't use that here) - -// import 'ie-shim'; // Internet Explorer -// import 'es6-shim'; -// import 'es6-promise'; -// import 'es7-reflect-metadata'; - -// Prefer CoreJS over the polyfills above -import 'core-js/es6'; -import 'core-js/es7/reflect'; -require('zone.js/dist/zone'); -require('reflect-metadata'); - -// Typescript emit helpers polyfill -import 'ts-helpers'; - -if ('production' === ENV) { - // Production - -} else { - // Development - - (Error as any).stackTraceLimit = Infinity; - - require('zone.js/dist/long-stack-trace-zone'); - -} diff --git a/demo/components/file-upload/file-catcher.js b/demo/server/file-catcher.js similarity index 100% rename from demo/components/file-upload/file-catcher.js rename to demo/server/file-catcher.js diff --git a/demo/app.component.ts b/demo/src/app/app.component.ts similarity index 74% rename from demo/app.component.ts rename to demo/src/app/app.component.ts index 2a7a3577..8326fae2 100644 --- a/demo/app.component.ts +++ b/demo/src/app/app.component.ts @@ -1,6 +1,6 @@ import { Component } from '@angular/core'; -let gettingStarted = require('./getting-started.md'); +let gettingStarted = require('html-loader!markdown-loader!../getting-started.md'); @Component({ selector: 'app', @@ -18,7 +18,7 @@ let gettingStarted = require('./getting-started.md');
-
${gettingStarted}
+
@@ -30,5 +30,14 @@ let gettingStarted = require('./getting-started.md'); ` }) -export class DemoComponent { +export class AppComponent { + public gettingStarted:string = gettingStarted; + public ngAfterContentInit(): any { + setTimeout(()=>{ + if (typeof PR !== 'undefined') { + // google code-prettify + PR.prettyPrint(); + } + }, 150); + } } diff --git a/demo/src/app/app.module.ts b/demo/src/app/app.module.ts new file mode 100644 index 00000000..c7dce7e3 --- /dev/null +++ b/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 { +} diff --git a/demo/src/app/components/file-upload-section.html b/demo/src/app/components/file-upload-section.html new file mode 100644 index 00000000..865da07b --- /dev/null +++ b/demo/src/app/components/file-upload-section.html @@ -0,0 +1,40 @@ +
+
+ + +
+ + + +
+ +
+ + +
+ 
{{desc.html}}
+
+ + +
+ 
{{desc.ts}}
+
+
+ + +
+ 
{{desc.js}}
+
+ + +
+
+ + +
+ +
+

API

+
+
+
diff --git a/demo/src/app/components/file-upload-section.ts b/demo/src/app/components/file-upload-section.ts new file mode 100644 index 00000000..6b48c534 --- /dev/null +++ b/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 = [ + { + 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; + } + } +} diff --git a/demo/src/app/components/file-upload/file-catcher.js b/demo/src/app/components/file-upload/file-catcher.js new file mode 100644 index 00000000..960ce2dd --- /dev/null +++ b/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); +}); diff --git a/demo/components/file-upload/simple-demo.html b/demo/src/app/components/file-upload/simple-demo.html similarity index 100% rename from demo/components/file-upload/simple-demo.html rename to demo/src/app/components/file-upload/simple-demo.html diff --git a/demo/components/file-upload/simple-demo.ts b/demo/src/app/components/file-upload/simple-demo.ts similarity index 77% rename from demo/components/file-upload/simple-demo.ts rename to demo/src/app/components/file-upload/simple-demo.ts index 10ce86bf..1d2f354a 100644 --- a/demo/components/file-upload/simple-demo.ts +++ b/demo/src/app/components/file-upload/simple-demo.ts @@ -1,15 +1,12 @@ import { Component } from '@angular/core'; -import { FileUploader } from '../../../ng2-file-upload'; - -// webpack html imports -let template = require('./simple-demo.html'); +import { FileUploader } from 'ng2-file-upload'; // const URL = '/api/'; const URL = 'https://evening-anchorage-3159.herokuapp.com/api/'; @Component({ selector: 'simple-demo', - template: template + templateUrl: './simple-demo.html' }) export class SimpleDemoComponent { public uploader:FileUploader = new FileUploader({url: URL}); diff --git a/demo/src/app/index.ts b/demo/src/app/index.ts new file mode 100644 index 00000000..875bdb2f --- /dev/null +++ b/demo/src/app/index.ts @@ -0,0 +1,2 @@ +export * from './app.component'; +export * from './app.module'; diff --git a/demo/assets/css/glyphicons.css b/demo/src/assets/css/glyphicons.css similarity index 100% rename from demo/assets/css/glyphicons.css rename to demo/src/assets/css/glyphicons.css diff --git a/demo/src/assets/css/prettify-angulario.css b/demo/src/assets/css/prettify-angulario.css new file mode 100644 index 00000000..77facd04 --- /dev/null +++ b/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 +} diff --git a/demo/assets/css/style.css b/demo/src/assets/css/style.css similarity index 100% rename from demo/assets/css/style.css rename to demo/src/assets/css/style.css diff --git a/demo/assets/fonts/glyphicons-halflings-regular.eot b/demo/src/assets/fonts/glyphicons-halflings-regular.eot similarity index 100% rename from demo/assets/fonts/glyphicons-halflings-regular.eot rename to demo/src/assets/fonts/glyphicons-halflings-regular.eot diff --git a/demo/assets/fonts/glyphicons-halflings-regular.svg b/demo/src/assets/fonts/glyphicons-halflings-regular.svg similarity index 100% rename from demo/assets/fonts/glyphicons-halflings-regular.svg rename to demo/src/assets/fonts/glyphicons-halflings-regular.svg diff --git a/demo/assets/fonts/glyphicons-halflings-regular.ttf b/demo/src/assets/fonts/glyphicons-halflings-regular.ttf similarity index 100% rename from demo/assets/fonts/glyphicons-halflings-regular.ttf rename to demo/src/assets/fonts/glyphicons-halflings-regular.ttf diff --git a/demo/assets/fonts/glyphicons-halflings-regular.woff b/demo/src/assets/fonts/glyphicons-halflings-regular.woff similarity index 100% rename from demo/assets/fonts/glyphicons-halflings-regular.woff rename to demo/src/assets/fonts/glyphicons-halflings-regular.woff diff --git a/demo/assets/fonts/glyphicons-halflings-regular.woff2 b/demo/src/assets/fonts/glyphicons-halflings-regular.woff2 similarity index 100% rename from demo/assets/fonts/glyphicons-halflings-regular.woff2 rename to demo/src/assets/fonts/glyphicons-halflings-regular.woff2 diff --git a/demo/src/assets/js/prettify.min.js b/demo/src/assets/js/prettify.min.js new file mode 100644 index 00000000..e83633dd --- /dev/null +++ b/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*= 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', /^[^]*(?:>|$)/], ['com', /^<\!--[\S\s]*?(?:--\>|$)/], ['lang-', /^<\?([\S\s]+?)(?:\?>|$)/], ['lang-', /^<%([\S\s]+?)(?:%>|$)/], ['pun', /^(?:<[%?]|[%?]>)/], ['lang-', +/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i], ['lang-js', /^]*>([\S\s]*?)(<\/script\b[^>]*>)/i], ['lang-css', /^]*>([\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 = '
' + a + '
'; 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; }); })(); }(); diff --git a/components/file-upload/readme.md b/demo/src/doc.md similarity index 100% rename from components/file-upload/readme.md rename to demo/src/doc.md diff --git a/demo/src/environments/environment.prod.ts b/demo/src/environments/environment.prod.ts new file mode 100644 index 00000000..3612073b --- /dev/null +++ b/demo/src/environments/environment.prod.ts @@ -0,0 +1,3 @@ +export const environment = { + production: true +}; diff --git a/demo/src/environments/environment.ts b/demo/src/environments/environment.ts new file mode 100644 index 00000000..00313f16 --- /dev/null +++ b/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 +}; diff --git a/demo/src/favicon.ico b/demo/src/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..8081c7ceaf2be08bf59010158c586170d9d2d517 GIT binary patch literal 5430 zcmc(je{54#6vvCoAI3i*G5%$U7!sA3wtMZ$fH6V9C`=eXGJb@R1%(I_{vnZtpD{6n z5Pl{DmxzBDbrB>}`90e12m8T*36WoeDLA&SD_hw{H^wM!cl_RWcVA!I+x87ee975; z@4kD^=bYPn&pmG@(+JZ`rqQEKxW<}RzhW}I!|ulN=fmjVi@x{p$cC`)5$a!)X&U+blKNvN5tg=uLvuLnuqRM;Yc*swiexsoh#XPNu{9F#c`G zQLe{yWA(Y6(;>y|-efAy11k<09(@Oo1B2@0`PtZSkqK&${ zgEY}`W@t{%?9u5rF?}Y7OL{338l*JY#P!%MVQY@oqnItpZ}?s z!r?*kwuR{A@jg2Chlf0^{q*>8n5Ir~YWf*wmsh7B5&EpHfd5@xVaj&gqsdui^spyL zB|kUoblGoO7G(MuKTfa9?pGH0@QP^b#!lM1yHWLh*2iq#`C1TdrnO-d#?Oh@XV2HK zKA{`eo{--^K&MW66Lgsktfvn#cCAc*(}qsfhrvOjMGLE?`dHVipu1J3Kgr%g?cNa8 z)pkmC8DGH~fG+dlrp(5^-QBeEvkOvv#q7MBVLtm2oD^$lJZx--_=K&Ttd=-krx(Bb zcEoKJda@S!%%@`P-##$>*u%T*mh+QjV@)Qa=Mk1?#zLk+M4tIt%}wagT{5J%!tXAE;r{@=bb%nNVxvI+C+$t?!VJ@0d@HIyMJTI{vEw0Ul ze(ha!e&qANbTL1ZneNl45t=#Ot??C0MHjjgY8%*mGisN|S6%g3;Hlx#fMNcL<87MW zZ>6moo1YD?P!fJ#Jb(4)_cc50X5n0KoDYfdPoL^iV`k&o{LPyaoqMqk92wVM#_O0l z09$(A-D+gVIlq4TA&{1T@BsUH`Bm=r#l$Z51J-U&F32+hfUP-iLo=jg7Xmy+WLq6_tWv&`wDlz#`&)Jp~iQf zZP)tu>}pIIJKuw+$&t}GQuqMd%Z>0?t%&BM&Wo^4P^Y z)c6h^f2R>X8*}q|bblAF?@;%?2>$y+cMQbN{X$)^R>vtNq_5AB|0N5U*d^T?X9{xQnJYeU{ zoZL#obI;~Pp95f1`%X3D$Mh*4^?O?IT~7HqlWguezmg?Ybq|7>qQ(@pPHbE9V?f|( z+0xo!#m@Np9PljsyxBY-UA*{U*la#8Wz2sO|48_-5t8%_!n?S$zlGe+NA%?vmxjS- zHE5O3ZarU=X}$7>;Okp(UWXJxI%G_J-@IH;%5#Rt$(WUX?6*Ux!IRd$dLP6+SmPn= z8zjm4jGjN772R{FGkXwcNv8GBcZI#@Y2m{RNF_w8(Z%^A*!bS*!}s6sh*NnURytky humW;*g7R+&|Ledvc- - Angular2 File Upload + Angular File Upload @@ -12,10 +12,9 @@ - - + - +