Merge branch 'master' into 2.20

tellform · Nov 21, 2017 · 9ff247f · 9ff247f
2 parents 49141e6 + ff24843
commit 9ff247f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug
@@ -84,7 +84,6 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
       script(type='text/javascript', src=bowerJSFile)
     // end Bower JS dependencies
 
-
     //Application JavaScript Files
     each jsFile in formJSFiles
       script(type='text/javascript', src=jsFile)

diff --git a/config/config.js b/config/config.js
@@ -64,7 +64,7 @@ module.exports.removeRootDir = function(files, removeRoot, addRoot) {
  */
 module.exports.getBowerFormJSAssets = function() {
 	if(process.env.NODE_ENV === 'production'){
-		return '/static/dist/vendor.min.js'
+		return ['/static/lib/angular/angular.min.js', '/static/dist/vendor.min.js', '/static/lib/angular-ui-date/src/date.js']
 	}
 	return this.removeRootDir(minBowerFiles('**/**.js'), 'public/', 'static/');
 };

diff --git a/gruntfile.js b/gruntfile.js
@@ -292,10 +292,7 @@ module.exports = function(grunt) {
 
 	// Debug task.
 	grunt.registerTask('debug', ['lint', 'html2js:main', 'html2js:forms', 'concurrent:debug']);
-
-	// Secure task(s).
-	grunt.registerTask('secure', ['env:secure', 'lint', 'html2js:main', 'html2js:forms', 'concurrent:default']);
-
+
 	// Lint task(s).
 	grunt.registerTask('lint', ['jshint', 'csslint']);
 	grunt.registerTask('lint:tests', ['jshint:allTests']);