From cf28c1a276ed85b66ac2f5126f472bbffb3021fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matias=20Niemel=C3=A4?= Date: Tue, 11 Aug 2015 17:20:04 -0700 Subject: [PATCH] chore: rename angular.bind to angular.bind.js Some internal tests were failing since `.bind` is a JS file which is expected to have a `.js` file name suffix. --- Gruntfile.js | 8 ++++++-- angularFiles.js | 6 +++--- docs/config/index.js | 2 +- docs/gulpfile.js | 5 +++-- src/{angular.bind => angular.bind.js} | 0 5 files changed, 13 insertions(+), 8 deletions(-) rename src/{angular.bind => angular.bind.js} (100%) diff --git a/Gruntfile.js b/Gruntfile.js index 410ca100825b..53aaf59a9ad6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -115,7 +115,7 @@ module.exports = function(grunt) { files: { src: 'test/**/*.js' }, }, ng: { - files: { src: files['angularSrc'].concat('!src/angular.bind') }, + files: { src: files['angularSrc'].concat('!src/angular.bind.js') }, }, ngAnimate: { files: { src: 'src/ngAnimate/**/*.js' }, @@ -156,7 +156,11 @@ module.exports = function(grunt) { }, jscs: { - src: ['src/**/*.js', 'test/**/*.js'], + src: [ + 'src/**/*.js', + 'test/**/*.js', + '!src/angular.bind.js' // we ignore this file since contains an early return statement + ], options: { config: ".jscsrc" } diff --git a/angularFiles.js b/angularFiles.js index 006111c00b3c..d5cd891c9240 100755 --- a/angularFiles.js +++ b/angularFiles.js @@ -77,7 +77,7 @@ var angularFiles = { 'src/ng/directive/select.js', 'src/ng/directive/style.js', 'src/ng/directive/validators.js', - 'src/angular.bind', + 'src/angular.bind.js', 'src/publishExternalApis.js', 'src/ngLocale/angular-locale_en-us.js' ], @@ -191,7 +191,7 @@ var angularFiles = { 'test/jquery_alias.js', 'src/angular-bootstrap.js', 'src/ngScenario/angular-bootstrap.js', - 'src/angular.bind' + 'src/angular.bind.js' ], 'karmaScenario': [ @@ -227,7 +227,7 @@ var angularFiles = { 'src/angular-bootstrap.js', 'src/ngScenario/angular-bootstrap.js', 'test/jquery_remove.js', - 'src/angular.bind' + 'src/angular.bind.js' ] }; diff --git a/docs/config/index.js b/docs/config/index.js index 8a1833600790..3bba1f92a5e5 100644 --- a/docs/config/index.js +++ b/docs/config/index.js @@ -42,7 +42,7 @@ module.exports = new Package('angularjs', [ readFilesProcessor.basePath = path.resolve(__dirname,'../..'); readFilesProcessor.sourceFiles = [ - { include: 'src/**/*.js', basePath: 'src' }, + { include: 'src/**/*.js', exclude: 'src/angular.bind.js', basePath: 'src' }, { include: 'docs/content/**/*.ngdoc', basePath: 'docs/content' } ]; diff --git a/docs/gulpfile.js b/docs/gulpfile.js index 4df668a6680b..2aa8d2649338 100644 --- a/docs/gulpfile.js +++ b/docs/gulpfile.js @@ -21,6 +21,7 @@ var outputFolder = '../build/docs'; var bowerFolder = 'bower_components'; var src = 'app/src/**/*.js'; +var ignoredFiles = '!src/angular.bind.js'; var assets = 'app/assets/**/*'; @@ -50,7 +51,7 @@ gulp.task('build-app', function() { var minFile = 'docs.min.js'; var folder = outputFolder + '/js/'; - return gulp.src(src) + return gulp.src([src, ignoredFiles]) .pipe(sourcemaps.init()) .pipe(concat(file)) .pipe(gulp.dest(folder)) @@ -107,5 +108,5 @@ gulp.task('jshint', ['doc-gen'], function() { gulp.task('default', ['assets', 'doc-gen', 'build-app', 'jshint']); gulp.task('watch', function() { - gulp.watch([src, assets], ['assets', 'build-app']); + gulp.watch([src, ignoredFiles, assets], ['assets', 'build-app']); }); diff --git a/src/angular.bind b/src/angular.bind.js similarity index 100% rename from src/angular.bind rename to src/angular.bind.js