[Pkg-javascript-commits] [leaflet] 152/301: Merge branch 'master' of https://github.com/Leaflet/Leaflet

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet.

commit b1d5f0c8007bfca81b41a0938541fa66e0b2f9c0
Merge: be5774a 1aba51b
Author: Vladimir Agafonkin <agafonkin at gmail.com>
Date:   Sat Oct 26 20:41:41 2013 +0300

    Merge branch 'master' of https://github.com/Leaflet/Leaflet
    
    * 'master' of https://github.com/Leaflet/Leaflet:
      Fixing long line
      Adding bounceAtZoomLimits option
      The drag click avoid hack is needed for touch zooms on ie10 also, when releasing your fingers after a touch zoom click events are generated. Fixes #2094
      Remove leftover code from the draggable/tap cleanup. Fixes #2103
      Changed main module file to use un-minified version.
      adding alt tag to marker icons
      Fixing line too long error
      Do not scale above minzoom and maxzoom in touch zoom action

 package.json                     |  2 +-
 src/dom/Draggable.js             | 15 ++++++---------
 src/layer/marker/Marker.js       |  5 +++++
 src/map/handler/Map.TouchZoom.js |  8 +++++++-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --cc package.json
index dccbf62,94c3ed0..92174a1
--- a/package.json
+++ b/package.json
@@@ -3,15 -3,15 +3,15 @@@
    "version": "0.6.3",
    "description": "JavaScript library for mobile-friendly interactive maps",
    "devDependencies": {
 -    "jshint": "~2.1.11",
 +    "jshint": "~2.3.0",
      "mocha": "~1.13.0",
      "happen": "~0.1.3",
 -    "karma": "~0.10.2",
 -    "uglify-js": "~2.4.0",
 -    "jake": "~0.7.2",
 +    "karma": "~0.10.4",
 +    "uglify-js": "~2.4.1",
 +    "jake": "~0.7.3",
      "karma-mocha": "~0.1.0"
    },
-   "main": "dist/leaflet.js",
+   "main": "dist/leaflet-src.js",
    "scripts": {
      "test": "jake test",
      "prepublish": "jake"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet.git