[Pkg-javascript-commits] [leaflet] 246/301: Merge branch 'invalidateSize'

[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 3618f404f5b4e70b65f94895cb0e5f71003af701
Merge: ba0fb35 33263e5
Author: Vladimir Agafonkin <agafonkin at gmail.com>
Date:   Wed Nov 13 21:50:02 2013 +0200

    Merge branch 'invalidateSize'

 spec/suites/map/MapSpec.js | 48 +++++++++++++++++++++++++++++++++++++++++++++-
 src/map/Map.js             | 11 +++++++----
 2 files changed, 54 insertions(+), 5 deletions(-)

diff --cc spec/suites/map/MapSpec.js
index 80177a8,0bb2a27..7a2118d
--- a/spec/suites/map/MapSpec.js
+++ b/spec/suites/map/MapSpec.js
@@@ -396,7 -396,8 +396,8 @@@ describe("Map", function () 
  
  	describe("#invalidateSize", function () {
  		var container,
- 		    origWidth = 100;
 -			orig_width = 100,
++		    origWidth = 100,
+ 			clock;
  
  		beforeEach(function () {
  			container = map.getContainer();

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