Merge pull request #67 from proj4js/browserify (94dcf56f) · Commits · REDMIC Project / Third party / Proj4js

.jshintrc

0 → 100644

+11 −0

Original line number	Diff line number	Diff line
		{
		"curly": true,
		"eqeqeq": true,
		"latedef": "nofunc",
		"undef": true,
		"unused": true,
		"trailing": true,
		"indent": 2,
		"browser": true,
		"node": true
		}
		No newline at end of file

Gruntfile.js

+51 −89

Original line number	Diff line number	Diff line
		@@ -10,89 +10,51 @@ module.exports = function(grunt) {
		}
		},
		mocha_phantomjs: {
		before: {
		options: {
		urls: [//my ide requries process.env.IP and PORT
		"http://"+(process.env.IP\|\|"127.0.0.1")+":"+(process.env.PORT\|\|"8080")+"/test/index.html"
		]
		}
		},
		after:{
		all: {
		options: {
		urls: [ //my ide requries process.env.IP and PORT
		"http://" + (process.env.IP \|\| "127.0.0.1") + ":" + (process.env.PORT \|\| "8080") + "/test/amd.html",
		"http://" + (process.env.IP \|\| "127.0.0.1") + ":" + (process.env.PORT \|\| "8080") + "/test/opt.html"
		]
		}
		},
		amd:{
		options: {
		urls: [//my ide requries process.env.IP and PORT
		"http://"+(process.env.IP\|\|"127.0.0.1")+":"+(process.env.PORT\|\|"8080")+"/test/amd.html"
		]
		}
		}
		},
		jshint: {
		options: {
		curly: true,
		eqeqeq: true,
		latedef: true,
		undef: true,
		unused: true,
		trailing:true,
		indent:2,
		//camelcase:true,
		globals: {
		define: true,
		console:true
		}
		jshintrc: "./.jshintrc"
		},
		all: [ './proj4/.js','./proj4/projCode/.js']
		all: ['./lib/.js', './lib//*.js']
		},
		requirejs: {
		reg:{
		options:{
		out: "./dist/proj4.js",
		baseUrl: ".",
		//name: "proj4",
		wrap: {
		startFile: 'almond/top.frag',
		endFile: 'almond/end.frag'
		browserify: {
		all: {
		files: {
		'dist/proj4-src.js': ['lib/index.js'],
		},
		name: 'node_modules/almond/almond',
		include: ['proj4'],
		optimize:'uglify2',
		//optimize:'none',
		uglify2:{
		mangle: true
		},
		preserveLicenseComments: false
		options: {
		standalone: 'proj4'
		}
		}
		},
		amd:{
		uglify: {
		options: {
		out: "./dist/amd/proj4.js",
		baseUrl: ".",
		name: "proj4",
		//include: ['proj4'],
		optimize:'none',
		uglify2:{
		mangle: true
		report: 'gzip',
		mangle:{
		except: ['proj4','Projection','Point']
		},
		preserveLicenseComments: false
		}
		},
		all: {
		src: 'dist/proj4-src.js',
		dest: 'dist/proj4.js'
		}
		}
		});
		grunt.loadNpmTasks('grunt-contrib-requirejs');
		grunt.loadNpmTasks('grunt-browserify');
		grunt.loadNpmTasks('grunt-contrib-uglify');
		grunt.loadNpmTasks('grunt-contrib-jshint');
		grunt.loadNpmTasks('grunt-contrib-connect');
		grunt.loadNpmTasks('grunt-mocha-phantomjs');
		grunt.registerTask('version', function() {
		grunt.file.write('./proj4/version.js',"define(function(){return '"+grunt.file.readJSON('package.json').version+"';});");
		grunt.file.write('./lib/version.js', "module.exports = '" + grunt.file.readJSON('package.json').version + "';");
		});
		grunt.registerTask('test', ['connect', 'mocha_phantomjs:before']);
		grunt.registerTask('amd',['jshint','requirejs:amd','connect','mocha_phantomjs:amd']);
		grunt.registerTask('build',['jshint','requirejs:custom']);
		grunt.registerTask('default', ['version','jshint','test','requirejs:reg','requirejs:amd','mocha_phantomjs:after','mocha_phantomjs:amd']);
		}
		grunt.registerTask('default', ['version', 'jshint', 'browserify', 'uglify', 'connect','mocha_phantomjs']);
		};

almond/end.frag

deleted100644 → 0

+0 −2

Original line number	Diff line number	Diff line
		return require('proj4');
		}));
		No newline at end of file

almond/top.frag

deleted100644 → 0

+0 −11

Original line number	Diff line number	Diff line
		(function (root, factory) {
		/* global module: false */
		if (typeof define === 'function' && define.amd) {
		define(factory);
		} else if(typeof module !== 'undefined'){
		module.exports = factory();
		}else {
		root.proj4 = factory();
		}
		}(this, function () {

bower.json

+3 −3

Original line number	Diff line number	Diff line
		{
		"name": "proj4",
		"version": "1.4.1",
		"homepage": "https://github.com/proj4js/proj4js",
		"version": "2.0.0",
		"description": "Proj4js is a JavaScript library to transform point coordinates from one coordinate system to another, including datum transformations.",
		"homepage": "https://github.com/proj4js/proj4js",
		"main": "dist/proj4.js",
		"keywords": [
		"gis",