Commit 0e42841e authored by Calvin Metcalf's avatar Calvin Metcalf
Browse files

Merge remote branch 'upstream/master'

parents 818816f2 5b3220b0

Gruntfile.js

+32 −14
Original line number Diff line number Diff line
@@ -3,21 +3,21 @@ module.exports = function(grunt) { 
		pkg: grunt.file.readJSON('package.json'),

		concat:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js','./src/util/MGRS.js'],

				src:[ './src/Proj4.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js','./src/util/MGRS.js'],

				dest:'./dist/proj4.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				src:[ './src/Proj4.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.js'

			}

		},

		uglify:{

			full:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./srcgrunt/defs/*.js','./src/util/MGRS.js'],

				src:[ './src/Proj4.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js','./src/util/MGRS.js'],

				dest:'./dist/proj4.min.js'

			},

			noDefs:{

				src:[ './src/Proj4js.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				src:[ './src/Proj4.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/GOOGLE.js'],

				dest:'./dist/proj4-noDefs.min.js'

			}

		},
@@ -28,7 +28,8 @@ module.exports = function(grunt) { 
					base: '.'

				}

			}

		},mocha_phantomjs: {

		},

		mocha_phantomjs: {

			all: {

				options: {

					urls: [//my ide requries process.env.IP and PORT
@@ -37,8 +38,25 @@ module.exports = function(grunt) { 
					]

				}

			}

		},

		jshint: {

			options:{

				curly: true,

				eqeqeq: true,

				latedef: true,

				undef: true,

				unused: true,

				trailing:true,

				indent:2,

        globals: {

          proj4: true

        }

			},

			before: [ './src/Proj4.js','./src/Proj.js','./src/defs.js','./src/common.js','./src/datum.js','./src/Point.js','./src/constants.js','./src/projCode/*.js','./src/defs/*.js','./src/util/MGRS.js'],

      after: [ './dist/proj4.js']

		}

	});

	grunt.loadNpmTasks('grunt-contrib-jshint');

	grunt.loadNpmTasks('grunt-contrib-concat');

	grunt.loadNpmTasks('grunt-contrib-uglify');

	grunt.loadNpmTasks('grunt-contrib-connect');
@@ -46,5 +64,5 @@ module.exports = function(grunt) { 
	grunt.registerTask('full', ['concat:full','uglify:full']);

	grunt.registerTask('noDefs', ['concat:noDefs','uglify:noDefs']);

	grunt.registerTask('test', ['connect', 'mocha_phantomjs']);

	grunt.registerTask('default', ['full','noDefs','test']);

	grunt.registerTask('default', ['jshint:before','full','noDefs','jshint:after','test']);

}

dist/proj4-noDefs.js

+4981 −4592

File changed.

Preview size limit exceeded, changes collapsed.

dist/proj4-noDefs.min.js

+3 −3

File changed.

Preview size limit exceeded, changes collapsed.

dist/proj4.js

+5726 −5356

File changed.

Preview size limit exceeded, changes collapsed.

dist/proj4.min.js

+4 −3

File changed.

Preview size limit exceeded, changes collapsed.