diff --git a/gulpfile.js b/gulpfile.js index f4a1f232..65fe8292 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -58,4 +58,8 @@ gulp.task('replace-core-relative-imports', function(){ gulp.src(['./dist/build/demo/**/*.js']) .pipe(transform( { visitCallExpression: visitCallExpression } )) .pipe(gulp.dest('./dist/build/demo')); + + gulp.src(['./dist/build/components/angular2-modal/plugins/**/*.js']) + .pipe(transform( { visitCallExpression: visitCallExpression } )) + .pipe(gulp.dest('./dist/build/components/angular2-modal/plugins')); }); diff --git a/install_angular.js b/install_angular.js deleted file mode 100644 index 1480102a..00000000 --- a/install_angular.js +++ /dev/null @@ -1,85 +0,0 @@ -const exec = require('child_process').exec; -const ANGULAR_VERSION = '2.0.0-rc.4'; - -const ANGULAR_PACKAGES = [ - "core", - "compiler", - "common", - "platform-browser", - "platform-browser-dynamic" -]; - -const POST_PACKAGES = [ - "@angular/router@3.0.0-beta.2" -]; - - -function completerFactory() { - const completer = { - promise: undefined, - resolve: undefined, - reject: undefined - }; - - completer.promise = new Promise((res, rej) => { - completer.resolve = res; - completer.reject = rej; - }); - - return completer; -} - -function getAngularPackages() { - return ANGULAR_PACKAGES.map( p => `@angular/${p}@${ANGULAR_VERSION}`); -} - -function exeCmd(cmd) { - var completer = completerFactory(); - - exec(cmd, (error, stdout, stderr) => { - if (error) { - completer.reject(error); - } else { - completer.resolve({ - stdout: stdout, - stderr: stderr - }); - } - }); - - return completer.promise; -} - -function deleteAngularModules() { - return exeCmd(`rm -rf ./node_modules/@angular`); -} - -function installAngular() { - return exeCmd(`npm install ${getAngularPackages().join(' ')}`); -} - -function installPost() { - return exeCmd(`npm install ${POST_PACKAGES.join(' ')}`); -} - -function print(msg) { - msg && console.log(msg); -} - -function printStd(std) { - print(std.stdout); - print(std.stderr); -} - -if (process.argv.indexOf('--preinstall') > -1) { - print('INSTALL ANGULAR SCRIPT: Installing angular packages.'); - deleteAngularModules() - .then(printStd) - .then(installAngular) - .then(printStd); -} else if (process.argv.indexOf('--postinstall') > -1) { - print('INSTALL ANGULAR SCRIPT: Installing post angular packages.'); - installPost().then(printStd); -} else { - print('INSTALL ANGULAR SCRIPT: Invalid arguments.'); -} \ No newline at end of file diff --git a/package.json b/package.json index c1315829..24180368 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "angular2-modal", "description": "Angular2 Modal (dialog) window.", - "version": "1.1.0", + "version": "1.1.1", "repository": { "type": "git", "url": "https://github.com/shlomiassaf/angular2-modal.git" diff --git a/scripts/build_release.sh b/scripts/build_release.sh index 78f1c4e5..2205e897 100755 --- a/scripts/build_release.sh +++ b/scripts/build_release.sh @@ -42,24 +42,12 @@ mv ./dist/build/index.SystemJS.html ./dist/build/index.html # Inline the css and html into the component ts files. ./node_modules/gulp/bin/gulp.js inline-resources +./node_modules/gulp/bin/gulp.js replace-core-relative-imports + # ./dist/commonjs will hold ES5 compiled artifacts from the TypeScript compilation. mkdir ./dist/commonjs # Copy all components/ to ./dist/commonjs/ cp -R ./dist/build/components/angular2-modal/* ./dist/commonjs/ -./node_modules/gulp/bin/gulp.js replace-core-relative-imports - -# Create a SystemJS bundle for all components and core. -mkdir ./dist/commonjs_all -cp -R ./dist/commonjs/* ./dist/commonjs_all/ -rm ./dist/commonjs_all/angular2-modal.js -rm ./dist/commonjs_all/angular2-modal.js.map -rm ./dist/commonjs_all/angular2-modal.d.ts -mv ./dist/commonjs_all/angular2-modal.all.js ./dist/commonjs_all/angular2-modal.js -mv ./dist/commonjs_all/angular2-modal.all.js.map ./dist/commonjs_all/angular2-modal.js.map -mv ./dist/commonjs_all/angular2-modal.all.d.ts ./dist/commonjs_all/angular2-modal.d.ts -node make.js -rm -rf ./dist/commonjs_all - cp ./README.md ./dist/commonjs \ No newline at end of file diff --git a/src/components/angular2-modal/angular2-modal.module.ts b/src/components/angular2-modal/angular2-modal.module.ts index 37fc60b1..357f3262 100644 --- a/src/components/angular2-modal/angular2-modal.module.ts +++ b/src/components/angular2-modal/angular2-modal.module.ts @@ -1,8 +1,10 @@ import { NgModule, ModuleWithProviders } from '@angular/core'; import { EVENT_MANAGER_PLUGINS } from '@angular/platform-browser'; + import { DOMOutsideEventPlugin } from './providers'; -import { ModalRenderer, DOMModalRenderer } from '../angular2-modal'; +import { ModalRenderer } from './models/tokens'; +import { DOMModalRenderer } from './providers/dom-modal-renderer'; @NgModule({ }) diff --git a/src/components/angular2-modal/angular2-modal.ts b/src/components/angular2-modal/angular2-modal.ts index be619071..cfd5e987 100644 --- a/src/components/angular2-modal/angular2-modal.ts +++ b/src/components/angular2-modal/angular2-modal.ts @@ -1,29 +1,2 @@ -import { Modal } from './providers'; - -export * from './framework/fluent-assign'; -export { createComponent } from './framework/createComponent'; - -export { DialogRef } from './models/dialog-ref'; - -export { - DROP_IN_TYPE, - ModalDropInFactory, - ModalBackdropComponent, - ModalComponent, - ModalCompileConfig, - ModalRenderer -} from './models/tokens'; - -export { Modal, DOMModalRenderer } from './providers'; - -export { - DEFAULT_VALUES, - ModalContext, - ModalContextBuilder, - ModalControllingContextBuilder -} from './models/modal-context'; - -export { ModalOpenContext, ModalOpenContextBuilder } from './models/modal-open-context'; - - -export { ModalModule } from './angular2-modal.module'; +// WEBPACK development runtime helper. +export * from './angular2-modal'; diff --git a/src/components/angular2-modal/index.ts b/src/components/angular2-modal/index.ts index cfd5e987..53e7e243 100644 --- a/src/components/angular2-modal/index.ts +++ b/src/components/angular2-modal/index.ts @@ -1,2 +1,30 @@ -// WEBPACK development runtime helper. -export * from './angular2-modal'; + +import { Modal } from './providers'; + +export * from './framework/fluent-assign'; +export { createComponent } from './framework/createComponent'; + +export { DialogRef } from './models/dialog-ref'; + +export { + DROP_IN_TYPE, + ModalDropInFactory, + ModalBackdropComponent, + ModalComponent, + ModalCompileConfig, + ModalRenderer +} from './models/tokens'; + +export { Modal, DOMModalRenderer } from './providers'; + +export { + DEFAULT_VALUES, + ModalContext, + ModalContextBuilder, + ModalControllingContextBuilder +} from './models/modal-context'; + +export { ModalOpenContext, ModalOpenContextBuilder } from './models/modal-open-context'; + + +export { ModalModule } from './angular2-modal.module'; diff --git a/src/components/angular2-modal/package.json b/src/components/angular2-modal/package.json index 2e8bc728..fd7cf9c5 100644 --- a/src/components/angular2-modal/package.json +++ b/src/components/angular2-modal/package.json @@ -1,7 +1,7 @@ { "name": "angular2-modal", "description": "Angular2 Modal (dialog) window.", - "version": "1.1.0", + "version": "1.1.1", "repository": { "type": "git", "url": "https://github.com/shlomiassaf/angular2-modal.git" diff --git a/src/components/angular2-modal/plugins/blank/index.ts b/src/components/angular2-modal/plugins/blank/index.ts deleted file mode 100644 index ead1867b..00000000 --- a/src/components/angular2-modal/plugins/blank/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { Provider } from '@angular/core'; -import { - ModalBackdropComponent, - ModalDropInFactory -} from '../../../../components/angular2-modal'; - -import { Modal } from './modal'; -import { BlankModalBackdrop } from './modal-backdrop'; -import { BlankModalContextBuilder } from './modal-context'; -const dropInFactory: ModalDropInFactory = { - alert: modal => new BlankModalContextBuilder(modal), - prompt: modal => new BlankModalContextBuilder(modal), - confirm: modal => new BlankModalContextBuilder(modal) -}; - -export { Modal } from './modal'; -export { BlankModalContext, BlankModalContextBuilder } from './modal-context'; -export const BLANK_MODAL_PROVIDERS: any[] = [ - new Provider(Modal, {useClass: Modal}), - new Provider(ModalBackdropComponent, {useValue: BlankModalBackdrop}), - new Provider(ModalDropInFactory, {useValue: dropInFactory}) -]; \ No newline at end of file diff --git a/src/components/angular2-modal/plugins/blank/modal-backdrop.ts b/src/components/angular2-modal/plugins/blank/modal-backdrop.ts deleted file mode 100644 index bce45263..00000000 --- a/src/components/angular2-modal/plugins/blank/modal-backdrop.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { - Component, - ComponentResolver, - ViewContainerRef, - ReflectiveInjector, - ViewChild, - AfterViewInit -} from '@angular/core'; - -import { NgTemplateOutlet } from '@angular/common'; - -import { ModalCompileConfig } from '../../models/tokens'; -import { DialogRef } from '../../angular2-modal'; -import { Modal } from './modal'; -import { BlankModalContext } from './modal-context'; - - -@Component({ - selector: 'modal-backdrop', - directives: [ NgTemplateOutlet ], - template: -`