fixed merge conflicts

.gitignore

@@ -163,5 +163,8 @@ pip-log.txt
 #Mr Developer
 .mr.developer.cfg
 
+#Intellij
+.idea
+
 # Mac crap
 .DS_Store

.travis.yml

@@ -0,0 +1,15 @@
+language: node_js
+node_js:
+  - "0.12"
+  - "0.11"
+  - "0.10"
+  - "0.8"
+  - "0.6"
+  - "iojs"
+  - "iojs-v1.0.4"
+matrix:
+  allow_failures:
+    - node_js: "0.8"
+    - node_js: "0.6"
+before_script:
+  - npm install -g jake

BREAKINGCHANGES.md

@@ -4,7 +4,7 @@ There are a number of changes to the plugin in 0.2 that may break peoples implem
 
 ## Event consolidation
 
-Leaflet.draw 0.1 had a created event for each different shape that was created. 0.2 now consolitates these into a single created shape.
+Leaflet.draw 0.1 had a created event for each different shape that was created. 0.2 now consolidates these into a single created shape.
 
 The vector or marker is accessed by the `layer` property of the event arguments, the type of layer by the `layerType`.
 
@@ -51,4 +51,4 @@ The event argument has also changed from `drawingType` -> `layerType`.
 
 ## CSS changes
 
-There has been a whole bunch of CSS changes, if you have customized any of these plese see [leaflet.draw.css](https://github.com/Leaflet/Leaflet.draw/blob/master/dist/leaflet.draw.css).
+There has been a whole bunch of CSS changes, if you have customized any of these please see [leaflet.draw.css](https://github.com/Leaflet/Leaflet.draw/blob/master/dist/leaflet.draw.css).

CHANGELOG.md

@@ -5,6 +5,20 @@ Leaflet.draw Changelog
 
 An in-progress version being developed on the master branch.
 
+## 0.3.0 (March 09, 2016)
+
+### Improvements
+
+ * Add support for touch devices
+ * Corrected license
+ * Linter
+
+### Bugfixes
+
+ * Added mouse handlers
+ * Fixed event listener leaks in Polyline
+ * Edit vertex event
+
 ## 0.2.4 (February 04, 2014)
 
 ### Improvements
@@ -120,7 +134,7 @@ Major new version. Added Edit toolbar which allows editing and deleting shapes.
  * Added 'drawing' event fired on the map when a draw handler is actived. (by [@ajbeaven](https://github.com/thegreat)). [#30](https://github.com/jacobtoye/Leaflet.draw/pull/30)
 
 ### Bugfixes
- 
+
  * Stopped L.Control.Draw from storing handlers in it's prototype. (by [@thegreat](https://github.com/thegreat)). [#37](https://github.com/jacobtoye/Leaflet.draw/pull/37)
 
 ## 0.1.4 (October 8, 2012)

MIT-LICENCE.txt → MIT-LICENSE.md

@@ -1,4 +1,4 @@
-Copyright 2012 Jacob Toye
+Copyright 2012-2016 Jacob Toye and Leaflet
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

README.md

@@ -1,3 +1,9 @@
+
+[![Build Status](https://travis-ci.org/Leaflet/Leaflet.draw.svg?branch=master)](https://travis-ci.org/Leaflet/Leaflet.draw)
+
+ * Leaflet.draw: [![Join the chat at https://gitter.im/Leaflet/Leaflet.draw](https://badges.gitter.im/Leaflet/Leaflet.draw.svg)](https://gitter.im/Leaflet/Leaflet.draw?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+ * Leaflet: [![Gitter](https://badges.gitter.im/Leaflet/Leaflet.svg)](https://gitter.im/Leaflet/Leaflet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+
 # Important
 Leaflet.draw 0.2.3+ requires [Leaflet 0.7.x](https://github.com/Leaflet/Leaflet/releases).
 
@@ -11,11 +17,17 @@ Adds support for drawing and editing vectors and markers on [Leaflet maps](https
 Leaflet.draw 0.2.0 changes a LOT of things from 0.1. Please see [BREAKING CHANGES](https://github.com/Leaflet/Leaflet.draw/blob/master/BREAKINGCHANGES.md) for how to upgrade.
 
 ## Table of Contents
+[Install](#install)  
 [Using the plugin](#using)  
 [Advanced Options](#options)  
 [Common tasks](#commontasks)  
 [Thanks](#thanks)
 
+<a name="install" />
+## Install
+
+To install the plugin run `npm install leaflet-draw` via command line in your project. You must also require this in your project like so: `var leaflet-draw = require('leaflet-draw');`
+
 <a name="using" />
 ## Using the plugin
 
@@ -130,6 +142,14 @@ Triggered when the user has finished a particular vector or marker.
 | --- | --- | ---
 | layerType | String | The type of layer this is. One of: `polyline`, `polygon`, `rectangle`, `circle`, `marker`
 
+#### draw:drawvertex
+
+Triggered when a vertex is created on a polyline or polygon.
+
+| Property | Type | Description
+| --- | --- | ---
+| layers | [LayerGroup](http://leafletjs.com/reference.html#layergroup) | List of all layers just being added from the map.
+
 #### draw:editstart
 
 Triggered when the user starts edit mode by clicking the edit tool button.
@@ -138,6 +158,14 @@ Triggered when the user starts edit mode by clicking the edit tool button.
 | --- | --- | ---
 | handler | String | The type of edit this is. One of: `edit`
 
+#### draw:editvertex
+
+Triggered when a vertex is edited on a polyline or polygon.
+
+| Property | Type | Description
+| --- | --- | ---
+| layers | [LayerGroup](http://leafletjs.com/reference.html#layergroup) | List of all layers just being edited from the map.
+
 #### draw:editstop
 
 Triggered when the user has finshed editing (edit mode) and saves edits.
@@ -454,6 +482,10 @@ and then use:
 
 ## Thanks
 
+Touch friendly version of Leaflet.draw was created and maintained by Michael Guild (https://github.com/michaelguild13).
+
+The touch support was initiated due to a demand for it at National Geographic for their Map Maker Projected (http://mapmaker.education.nationalgeographic.com/) that was created by Michael Guild and Daniel Schep (https://github.com/dschep)
+
 Thanks so much to [@brunob](https://github.com/brunob), [@tnightingale](https://github.com/tnightingale), and [@shramov](https://github.com/shramov). I got a lot of ideas from their Leaflet plugins.
 
 All the [contributors](https://github.com/Leaflet/Leaflet.draw/graphs/contributors) and issue reporters of this plugin rock. Thanks for tidying up my mess and keeping the plugin on track.

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "leaflet-draw",
   "description": "Vector drawing plugin for Leaflet",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "main": [
     "dist/leaflet.draw-src.js",
     "dist/leaflet.draw.css",
@@ -33,15 +33,21 @@
     "draw"
   ],
   "authors": [
-    {"name":"Jacob Toye"}
+    {
+      "name": "Jon West",
+      "email": "ddproxy@gmail.com"
+    },
+    {
+      "name":"Jacob Toye"
+    }
   ],
   "homepage":"",
   "repository": {
     "type": "git",
     "url": "https://github.com/Leaflet/Leaflet.draw.git"
   },
   "dependencies": {
-    "leaflet-dist": "0.7.x"
+    "leaflet": "^0.7.0"
   },
   "devDependencies": {
     "leaflet": "~0.7.0",

build/deps.js

@@ -34,6 +34,7 @@ var deps = {
 
 	Extensions: {
 		src: [
+			'ext/TouchEvents.js',
 			'ext/LatLngUtil.js',
 			'ext/GeometryUtil.js',
 			'ext/LineUtil.Intersect.js',
@@ -74,4 +75,4 @@ var deps = {
 
 if (typeof exports !== 'undefined') {
 	exports.deps = deps;
-}
+}