Skip to content

Commit

Permalink
refactor(animations): inline css animations
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed Feb 9, 2016
1 parent de76cef commit da18868
Show file tree
Hide file tree
Showing 94 changed files with 1,047 additions and 6,881 deletions.
14 changes: 4 additions & 10 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var connect = require('gulp-connect');
var docsConfig = require('./scripts/config.json');

var flagConfig = {
string: ['port', 'animations'],
string: ['port'],
boolean: ['debug', 'typecheck'],
alias: {'p': 'port'},
default: { 'port': 8000, 'debug': true, 'typecheck': false }
Expand Down Expand Up @@ -148,11 +148,6 @@ gulp.task('bundle', ['bundle.cjs', 'bundle.system']);
* Creates CommonJS bundle from Ionic source files.
*/
gulp.task('bundle.cjs', ['transpile'], function(done){
//TODO
// if (flags.animations == 'polyfill') {
// prepend.push('window.Element.prototype.animate=undefined;');
// }

var config = require('./scripts/npm/ionic.webpack.config.js');
bundle({ config: config, stats: true });

Expand Down Expand Up @@ -334,8 +329,7 @@ gulp.task('copy.scss', function() {
*/
gulp.task('copy.libs', function() {
var merge = require('merge2');
var webAnimations = gulp.src([
'scripts/resources/web-animations-js/web-animations.min.js',
var extModules = gulp.src([
'node_modules/es6-shim/es6-shim.min.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js',
'node_modules/systemjs/dist/system.src.js',
Expand All @@ -354,7 +348,7 @@ gulp.task('copy.libs', function() {
])
.pipe(gulp.dest('dist'));

return merge([webAnimations, libs]);
return merge([extModules, libs]);
});


Expand Down Expand Up @@ -573,7 +567,7 @@ gulp.task('build.demos', function() {
} else {
buildDemoSass(false);
}

var tsResult = gulp.src(['demos/**/*.ts'])
.pipe(cache('demos.ts'))
.pipe(tsc(getTscOptions(), undefined, tscReporter))
Expand Down
Loading

0 comments on commit da18868

Please sign in to comment.