RubyGems - leaflet-js - Versions diffs - 0.7.9 → 0.8.dev2 - Mend

leaflet-js 0.7.9 → 0.8.dev2

Files changed (341) hide show

@@ -0,0 +1,62 @@
+### Done
+ * ~~Tidy up css: include leaflet-control-toolbar for common styles~~
+ * ~~Rename _shapes variable in Control.Draw to make better sense.~~
+ * ~~Should the ext classes be renamed to Polyline.Intersect or similar?~~
+ * ~~Make Control.Draw inherit from Control.Toolbar.~~
+ * ~~Rename Handler.Draw -> Vector.Draw. What about markers? they aren't vectors, is there a better name? Maybe Feature?~~
+ * ~~Add enbled/disabled states for the delete & edit buttons.~~
+ * ~~Move control/handler files out of draw folder.~~
+ * ~~Rename the draw events from draw:feature t0 feature-created.~~
+ * ~~Revert to the correct colour for the feature that was just deselected.~~
+ * ~~Rename the Handler activated/deactivated events to enabled/disabled.~~
+ * ~~Add option for setting the selected color.~~
+ * ~~Check and calls to L.Feature.Draw.prototype, are they correct? In Draw.Circle it hink it should be referencing L.Draw.SimpleShape~~
+ * ~~Add in cancel buttons for selected button.~~
+ * ~~Have special behavior for selected markers. Do we just set the background color?~~
+ * ~~Turn the cancel button UI into a button container for things like undo.~~
+ * ~~Add Save to edit mode. Same as cancel but does not revert any shapes.~~
+ * ~~rename selectableLayers = layerGroup~~
+ * ~~refactor the repositioning of the actions toolbar for Control.Draw.~~
+ * ~~If more than 1 button in actions toolbar but not first is showing then margin is wrong.~~
+ * ~~Support cancelling delete?~~
+ * ~~Rename the _showCancel/_hideCancel methods in Control.Toolbar~~
+ * ~~See if any common code can move to Control.Toolbar from Control.Draw.~~
+ * ~~Fix the bottom border radius when the actions buttons are at the bottom~~
+ * ~~Fix up the toolbar rounded corners when only 1 item in the toolbar.~~
+ * ~~Handle layers being added/removed to the layergroup. i.e. need to be placed in edit mode or have a delete handler added~~
+ * ~Add support for tooltips for the edit mode.~
+ * ~Add handlers for Circle and Rectangle editing. (Needs a way to hook into L.Cicle and L.Rectangle)~
+ * ~Fix styles to look more like new Leaflet zoom in/out.~
+ * ~Polyline is styled as filled for edit mode.~
+ * ~Add visual style change to toolbar buttons on mouse over.~
+ * ~Add handlers to earch corner of the rectangle for resizing.~
+ * ~Bug: if you go edit mode, then go to draw mode.~
+ * ~Handle controls from being removed from map.~
+ * ~Add link to http://glyphicons.com/~
+ * ~Redo the select/delete icons.~
+ * ~Merge the event change pull and add edit/delete versions.~
+ * ~When switching from edit to delete and having edit a feature it should reset/cancel instead of saving.~
+ * ~Move clone methods from Edit.Feature~
+ * ~Renamed Edit.Feature -> Edit and Delete.Feature -> Delete, is confusing since Edit.feature is not the same as Edit.Circle etc~
+ * ~Get Leaflet control-design branch merged to master.~
+ * ~Fix action toolbar styles to match new toolbar height.~
+ * ~Make Tooltip sexy!~
+ * ~IE actions bar position.~
+ * ~IE editable marker background and border.~
+ * ~Search for TODO~
+ * ~Update Deps. Maybe should make it more advanced to allow people to custom build without parts? Like edit only or draw only? Also file names ahve changed.~
+ * ~Add some proper documentation. I.e. for the events & methods.~
+ * ~Add a thanks section to README. Shramov, BrunboB, tnightingale & Glyphicons. Others?~
+ * ~Write up a breaking changes for when 0.2 goes live. (See below)~
+ * ~Add events to docs~
+ * ~Fix the draw:enabled event. This is not used for the edit toolbar. It is simply used to state that drawing has started then ended.~
+ * ~Custom build tool.~
+ * ~Move Poly.Edit.js~
+ * ~Add ability to update the options after control is initialized.~
+ * ~Make a git tag of Leaflet.draw 0.1~
+ * ~Document changing the options of a draw handler.~
+### TODO
+ * Fix all the Show Code links in the ReadMe.

data/lib/leaflet.draw/build/build.html ADDED

@@ -0,0 +1,243 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Leaflet Build Helper</title>
+	<script type="text/javascript" src="deps.js"></script>
+	<style type="text/css">
+		body {
+			font: 12px/1.4 Verdana, sans-serif;
+			text-align: center;
+			padding: 2em 0;
+		}
+		#container {
+			text-align: left;
+			margin: 0 auto;
+			width: 780px;
+		}
+		#deplist {
+			list-style: none;
+			padding: 0;
+		}
+		#deplist li {
+			padding-top: 7px;
+			padding-bottom: 7px;
+			border-bottom: 1px solid #ddd;
+		}
+		#deplist li.heading {
+			border: none;
+			background: #ddd;
+			padding: 5px 10px;
+			margin-top: 25px;
+			border-radius: 5px;
+		}
+		#deplist input {
+			float: left;
+			margin-right: 5px;
+			display: inline;
+		}
+		#deplist label {
+			float: left;
+			width: 160px;
+			font-weight: bold;
+		}
+		#deplist div {
+			display: table-cell;
+			height: 1%;
+		}
+		#deplist .desc {
+		}
+		#deplist .deps {
+			color: #777;
+		}
+		#command {
+			width: 100%;
+		}
+		#command2 {
+			width: 200px;
+		}
+		#toolbar {
+			padding-bottom: 10px;
+			border-bottom: 1px solid #ddd;
+		}
+		h2 {
+			margin-top: 2em;
+		}
+	</style>
+</head>
+<body>
+	<div id="container">
+		<h1>Leaflet Build Helper</h1>
+		<p id="toolbar">
+			<a id="select-all" href="#all">Select All</a> |
+			<a id="deselect-all" href="#none">Deselect All</a>
+		</p>
+		<ul id="deplist"></ul>
+		<h2>Building using Node and UglifyJS</h2>
+		<ol>
+			<li><a href="http://nodejs.org/#download">Download and install Node</a></li>
+			<li>Run this in the command line:<br />
+			<pre><code>npm install -g jake
+npm install jshint
+npm install uglify-js</code></pre></li>
+			<li>Run this command inside the Leaflet directory: <br /><input type="text" id="command2" />
+		</ol>
+		<h2>Building using Closure Compiler</h2>
+		<ol>
+			<li><a href="http://closure-compiler.googlecode.com/files/compiler-latest.zip">Download Closure Compiler</a>, extract it into <code>closure-compiler</code> directory</li>
+			<li>Run this command in the root Leaflet directory: <br /><input type="text" id="command" /></li>
+		</ol>
+	</div>
+	<script type="text/javascript">
+		var deplist = document.getElementById('deplist'),
+			commandInput = document.getElementById('command'),
+			commandInput2 = document.getElementById('command2');
+		document.getElementById('select-all').onclick = function() {
+			var checks = deplist.getElementsByTagName('input');
+			for (var i = 0; i < checks.length; i++) {
+				checks[i].checked = true;
+			}
+			updateCommand();
+			return false;
+		};
+		document.getElementById('deselect-all').onclick = function() {
+			var checks = deplist.getElementsByTagName('input');
+			for (var i = 0; i < checks.length; i++) {
+				if (!checks[i].disabled) {
+					checks[i].checked = false;
+				}
+			}
+			updateCommand();
+			return false;
+		};
+		function updateCommand() {
+			var files = {};
+			var checks = deplist.getElementsByTagName('input');
+			var compsStr = '';
+			for (var i = 0, len = checks.length; i < len; i++) {
+				if (checks[i].checked) {
+					var srcs = deps[checks[i].id].src;
+					for (var j = 0, len2 = srcs.length; j < len2; j++) {
+						files[srcs[j]] = true;
+					}
+					compsStr = '1' + compsStr;
+				} else {
+					compsStr = '0' + compsStr;
+				}
+			}
+			var command = 'java -jar closure-compiler/compiler.jar ';
+			for (var src in files) {
+				command += '--js src/' + src + ' ';
+			}
+			command += '--js_output_file dist/leaflet-custom.js';
+			commandInput.value = command;
+			commandInput2.value = 'jake build[' + parseInt(compsStr, 2).toString(32) + ',custom]';
+		}
+		function inputSelect() {
+			this.focus();
+			this.select();
+		};
+		commandInput.onclick = inputSelect;
+		commandInput2.onclick = inputSelect;
+		function onCheckboxChange() {
+			if (this.checked) {
+				var depDeps = deps[this.id].deps;
+				if (depDeps) {
+					for (var i = 0; i < depDeps.length; i++) {
+						var check = document.getElementById(depDeps[i]);
+						if (!check.checked) {
+							check.checked = true;
+							check.onchange();
+						}
+					}
+				}
+			} else {
+				var checks = deplist.getElementsByTagName('input');
+				for (var i = 0; i < checks.length; i++) {
+					var dep = deps[checks[i].id];
+					if (!dep.deps) { continue; }
+					for (var j = 0; j < dep.deps.length; j++) {
+						if (dep.deps[j] === this.id) {
+							if (checks[i].checked) {
+								checks[i].checked = false;
+								checks[i].onchange();
+							}
+						}
+					}
+				}
+			}
+			updateCommand();
+		}
+		for (var name in deps) {
+			var li = document.createElement('li');
+			if (deps[name].heading) {
+				var heading = document.createElement('li');
+				heading.className = 'heading';
+				heading.appendChild(document.createTextNode(deps[name].heading));
+				deplist.appendChild(heading);
+			}
+			var div = document.createElement('div');
+			var label = document.createElement('label');
+			var check = document.createElement('input');
+			check.type = 'checkbox';
+			check.id = name;
+			label.appendChild(check);
+			check.onchange = onCheckboxChange;
+			if (name == 'Core') {
+				check.checked = true;
+				check.disabled = true;
+			}
+			label.appendChild(document.createTextNode(name));
+			label.htmlFor = name;
+			li.appendChild(label);
+			var desc = document.createElement('span');
+			desc.className = 'desc';
+			desc.appendChild(document.createTextNode(deps[name].desc));
+			var depText = deps[name].deps && deps[name].deps.join(', ');
+			if (depText) {
+				var depspan = document.createElement('span');
+				depspan.className = 'deps';
+				depspan.appendChild(document.createTextNode('Deps: ' + depText));
+			}
+			div.appendChild(desc);
+			div.appendChild(document.createElement('br'));
+			if (depText) { div.appendChild(depspan); }
+			li.appendChild(div);
+			deplist.appendChild(li);
+		}
+		updateCommand();
+	</script>
+</body>
+</html>

data/lib/leaflet.draw/build/build.js ADDED

@@ -0,0 +1,187 @@
+var fs = require('fs'),
+	jshint = require('jshint'),
+	UglifyJS = require('uglify-js'),
+	zlib = require('zlib'),
+	deps = require('./deps.js').deps;
+function getFiles(compsBase32) {
+	var memo = {},
+		comps;
+	if (compsBase32) {
+		comps = parseInt(compsBase32, 32).toString(2).split('');
+		console.log('Managing dependencies...');
+	}
+	function addFiles(srcs) {
+		for (var j = 0, len = srcs.length; j < len; j++) {
+			memo[srcs[j]] = true;
+		}
+	}
+	for (var i in deps) {
+		if (comps) {
+			if (parseInt(comps.pop(), 2) === 1) {
+				console.log(' * ' + i);
+				addFiles(deps[i].src);
+			} else {
+				console.log('   ' + i);
+			}
+		} else {
+			addFiles(deps[i].src);
+		}
+	}
+	console.log('');
+	var files = [];
+	for (var src in memo) {
+		files.push('src/' + src);
+	}
+	return files;
+}
+exports.getFiles = getFiles;
+function getSizeDelta(newContent, oldContent, fixCRLF) {
+		if (!oldContent) {
+				return ' (new)';
+		}
+		if (newContent === oldContent) {
+				return ' (unchanged)';
+		}
+		if (fixCRLF) {
+				newContent = newContent.replace(/\r\n?/g, '\n');
+				oldContent = oldContent.replace(/\r\n?/g, '\n');
+		}
+		var delta = newContent.length - oldContent.length;
+		return delta === 0 ? '' : ' (' + (delta > 0 ? '+' : '') + delta + ' bytes)';
+}
+function loadSilently(path) {
+		try {
+				return fs.readFileSync(path, 'utf8');
+		} catch (e) {
+				return null;
+		}
+}
+function combineFiles(files) {
+		var content = '';
+		for (var i = 0, len = files.length; i < len; i++) {
+				content += fs.readFileSync(files[i], 'utf8') + '\n\n';
+		}
+		return content;
+}
+function bytesToKB(bytes) {
+	return (bytes / 1024).toFixed(2) + ' KB';
+}
+exports.build = function (callback, compsBase32, buildName) {
+	var files = getFiles(compsBase32);
+	console.log('Concatenating and compressing ' + files.length + ' files...');
+	var copy = fs.readFileSync('src/copyright.js', 'utf8'),
+		intro = '(function (window, document, undefined) {',
+		outro = '}(window, document));',
+		newSrc = copy + intro + combineFiles(files) + outro,
+		pathPart = 'dist/leaflet.draw' + (buildName ? '-' + buildName : ''),
+		srcPath = pathPart + '-src.js',
+		oldSrc = loadSilently(srcPath),
+		srcDelta = getSizeDelta(newSrc, oldSrc, true);
+	console.log('\tUncompressed: ' + bytesToKB(newSrc.length) + srcDelta);
+	if (newSrc !== oldSrc) {
+		fs.writeFileSync(srcPath, newSrc);
+		console.log('\tSaved to ' + srcPath);
+	}
+	var path = pathPart + '.js',
+		oldCompressed = loadSilently(path),
+		newCompressed = copy + UglifyJS.minify(newSrc, {
+			warnings: true,
+			fromString: true
+		}).code,
+		delta = getSizeDelta(newCompressed, oldCompressed);
+	console.log('\tCompressed: ' + bytesToKB(newCompressed.length) + delta);
+	var newGzipped,
+		gzippedDelta = '';
+	function done() {
+		if (newCompressed !== oldCompressed) {
+			fs.writeFileSync(path, newCompressed);
+			console.log('\tSaved to ' + path);
+		}
+		console.log('\tGzipped: ' + bytesToKB(newGzipped.length) + gzippedDelta);
+		callback();
+	}
+	zlib.gzip(newCompressed, function (err, gzipped) {
+		if (err) { return; }
+		newGzipped = gzipped;
+		if (oldCompressed && (oldCompressed !== newCompressed)) {
+			zlib.gzip(oldCompressed, function (err, oldGzipped) {
+				if (err) { return; }
+				gzippedDelta = getSizeDelta(gzipped, oldGzipped);
+				done();
+			});
+		} else {
+			done();
+		}
+	});
+};
+exports.test = function(callback) {
+		var karma = require('karma'),
+		testConfig = {configFile : __dirname + '/../spec/karma.conf.js'};
+	testConfig.browsers = ['PhantomJS'];
+	function isArgv(optName) {
+		return process.argv.indexOf(optName) !== -1;
+	}
+	if (isArgv('--chrome')) {
+		testConfig.browsers.push('Chrome');
+	}
+	if (isArgv('--safari')) {
+		testConfig.browsers.push('Safari');
+	}
+	if (isArgv('--ff')) {
+		testConfig.browsers.push('Firefox');
+	}
+	if (isArgv('--ie')) {
+		testConfig.browsers.push('IE');
+	}
+	if (isArgv('--cov')) {
+		testConfig.preprocessors = {
+			'src/**/*.js': 'coverage'
+		};
+		testConfig.coverageReporter = {
+			type : 'html',
+			dir : 'coverage/'
+		};
+		testConfig.reporters = ['coverage'];
+	}
+	console.log('Running tests...');
+	karma.server.start(testConfig, function(exitCode) {
+		if (!exitCode) {
+			console.log('\tTests ran successfully.\n');
+		}
+		callback();
+	});
+};