Started impl of modal dialog

thinktecture · Mar 24, 2016 · d1f0a24 · d1f0a24
1 parent 8faccdf
commit d1f0a24
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 3 deletions.
diff --git a/gulp.config.js b/gulp.config.js
@@ -76,7 +76,11 @@ module.exports = {
                 './node_modules/angular2/bundles/angular2.dev.js',
                 './node_modules/angular2/bundles/http.dev.js',
                 './node_modules/angular2/bundles/router.dev.js'
-            ]
+            ],
+            angular2Modal: { 
+                base: './node_modules/angular2-modal/dist/',
+                entryPoint: 'angular2-modal.js'
+            }
         }
     },
     ts: {

diff --git a/gulpTasks/web.js b/gulpTasks/web.js
@@ -49,10 +49,26 @@
         gulp.task('[private-web]:copy-angular2-scripts', function () {
             return gulp.src(config.source.files.angular2)
                 .pipe(concat(config.targets.angular2MinJs))
-                //.pipe(uglify())
                 .pipe(gulp.dest(path.join(config.targets.buildFolder, 'scripts/')));
         });
 
+        gulp.task('[private-web]:copy-angular2-modal-scripts', function () {
+            var builder = new Builder({
+                baseURL: config.source.files.angular2Modal.base,
+                paths: {
+                    '*': '*.js'
+                },
+                meta: {
+                    'angular2/*': {
+                        build: false
+                    }
+                }
+            });
+
+            return builder.bundle(path.basename(config.source.files.angular2Modal.entryPoint, '.js'),
+                path.join(config.targets.buildFolder, 'scripts/', config.source.files.angular2Modal.entryPoint));
+        });
+
         gulp.task('[private-web]:copy-system-setup-script', function () {
             return gulp.src(config.source.files.systemSetupScript)
                 .pipe(uglify())
@@ -125,6 +141,7 @@
                 [
                     '[private-web]:bundle-vendor-scripts',
                     '[private-web]:copy-angular2-scripts',
+                    '[private-web]:copy-angular2-modal-scripts',
                     '[private-web]:copy-system-setup-script',
                     '[private-web]:copy-cordova-script',
                     '[private-web]:copy-shim',

diff --git a/package.json b/package.json
@@ -63,5 +63,8 @@
     "typescript": "^1.8.9",
     "typings": "^0.6.8",
     "zone.js": "0.6.6"
+  },
+  "dependencies": {
+    "angular2-modal": "0.0.4"
   }
 }
diff --git a/src/BoardZ/app/components/games/details.ts b/src/BoardZ/app/components/games/details.ts
@@ -15,12 +15,14 @@ import {GeoLocation} from '../../models/geoLocation';
 import {LoginService} from '../../services/loginService';
 import {Notification} from '../../models/notification';
 import {NotificationType} from '../../models/notificationType';
+import {Modal} from 'angular2-modal';
 
 @Component({
     selector: 'gameDetail',
     directives: [LocateItComponent, PictureItComponent],
     templateUrl: 'app/components/games/details.html',
-    inputs: ['game']
+    inputs: ['game'],
+    providers: [Modal]
 })
 @NeedsAuthentication()
 export class GameDetailsComponent implements OnInit {

diff --git a/src/BoardZ/system.setup.js b/src/BoardZ/system.setup.js
@@ -3,6 +3,10 @@ System.config({
         app: {
             format: 'register',
             defaultExtension: 'js'
+        },
+        'angular2-modal': {
+            defaultExtension: 'js',
+            main: '../scripts/angular2-modal.js'
         }
     },
     map: {