Skip to content

Commit 7cec496

Browse files
committed
Material Angular version with close to feature parity to the angular strap version.
Need to reenable the modal windows
1 parent c3d74fd commit 7cec496

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1036
-9631
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -281,3 +281,4 @@ $RECYCLE.BIN/
281281
*.lnk
282282
bower_components
283283
www
284+
/medCalc/temp

medCalc/Gulpfile.js

+10-20
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <binding />
1+
/// <binding ProjectOpened='serve' />
22
require('es6-promise').polyfill();
33
var gulp = require('gulp');
44
var minifyHtml = require('gulp-minify-html');
@@ -13,10 +13,8 @@ var del = require('del');
1313
var autoprefixer = require('gulp-autoprefixer');
1414
var sourcemap = require('gulp-sourcemaps');
1515
var browserSync = require('browser-sync').create();
16-
var browserSyncDebug = require('browser-sync').create();
1716
var tsc = require('gulp-typescript');
1817
var manifest = require('gulp-manifest');
19-
var htmlReplace = require('gulp-html-replace');
2018

2119
gulp.task('clean', function () {
2220
del('www/**');
@@ -32,17 +30,15 @@ gulp.task('copyLibs', ['bower'], function () {
3230
'bower_components/underscore/underscore-min.js',
3331
'bower_components/mathjs/dist/math.min.js',
3432
'bower_components/underscore/underscore-min.js',
35-
'bower_components/jquery/dist/jquery.min.js',
3633
'bower_components/angular/angular.min.js',
3734
'bower_components/angular-route/angular-route.min.js',
3835
'bower_components/angular-sanitize/angular-sanitize.min.js',
3936
'bower_components/angular-animate/angular-animate.min.js',
40-
'bower_components/angular-touch/angular-touch.min.js',
37+
'bower_components/angular-aria/angular-aria.js',
4138
'bower_components/angular-i18n/angular-locale_el.js',
42-
'bower_components/angular-strap/dist/angular-strap.min.js',
43-
'bower_components/angular-strap/dist/angular-strap.tpl.min.js',
44-
'app/lib/mobile-angular-ui.js',
45-
'bower_components/moment/min/moment.min.js'
39+
'bower_components/moment/min/moment.min.js',
40+
'bower_components/angular-material/angular-material.js',
41+
'bower_components/angular-scroll/angular-scroll.min.js'
4642
])
4743
.pipe(gulpIf('!*.min.js', uglify()))
4844
.pipe(concat('index.min.js'))
@@ -65,7 +61,10 @@ gulp.task('copyRoot', function () {
6561
});
6662

6763
gulp.task('copyCss', function () {
68-
return gulp.src(['app/css/*.css'])
64+
return gulp.src([
65+
'bower_components/angular-material/angular-material.css',
66+
'app/css/*.css'
67+
])
6968
.pipe(gulp.dest('debug/css/'))
7069
.pipe(autoprefixer('last 2 versions'))
7170
.pipe(concat('index.css'))
@@ -109,7 +108,7 @@ gulp.task('copyTypescript', function () {
109108
target: 'ES5'
110109
}))
111110
.pipe(concat("index.min.js"))
112-
.pipe(uglify())
111+
//.pipe(uglify())
113112
.pipe(sourcemap.write())
114113
.pipe(gulp.dest('www/scripts'));
115114
});
@@ -124,15 +123,6 @@ gulp.task('serve', ['watch'], function () {
124123
gulp.watch("www/**/*.*", browserSync.reload);
125124
});
126125

127-
gulp.task('debug', ['watch'], function () {
128-
browserSyncDebug.init({
129-
server: {
130-
baseDir: "debug"
131-
}
132-
});
133-
gulp.watch("debug/**/*.*", browserSyncDebug.reload);
134-
});
135-
136126
gulp.task('watch', ['copyRoot', 'copyLibs', 'copyCss', 'copyFonts', 'copyImages', 'copyHtml', 'copyTypescript'], function () {
137127
gulp.watch("scripts/**/*.ts", ['copyTypescript']);
138128
gulp.watch("app/**/*.css", ['copyCss']);

0 commit comments

Comments
 (0)