Merge pull request #213 from ryanttb/master

rc1.1 release
jQueryGeo · Jun 4, 2016 · 8adea29 · 8adea29
2 parents b64e1eb + dd2c077
commit 8adea29
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 36 deletions.
diff --git a/dist/jquery.geo-1.0.0-rc1.js b/dist/jquery.geo-1.0.0-rc1.js
@@ -1,4 +1,4 @@
-/*! jQuery Geo - v1.0.0-rc1 - 2016-05-29
+/*! jQuery Geo - v1.0.0-rc1 - 2016-06-04
 * http://jquerygeo.com
 * Copyright (c) 2016 Ryan Morrison-Westphal; Licensed MIT */
 // Copyright 2006 Google Inc.
@@ -4391,36 +4391,16 @@ $.Widget.prototype = {
         this._timeoutEnd = null;
       }
 
-      if ( this._trueCanvas ) {
-        if ( this._options.doubleBuffer && this._trueDoubleBuffer ) {
-
-          var geographics = this;
-
-          if ( this._requireFlip ) {
-            geographics._requireFlip = false;
-
-            var oldCanvasScene = geographics._$canvasSceneFront;
-
-            geographics._$canvasSceneFront = geographics._$canvasSceneBack.css( {
-              left: 0,
-              top: 0,
-              width: geographics._width,
-              height: geographics._height
-            } ).prop( "src", geographics._$canvas[ 0 ].toDataURL( ) ).prependTo( geographics._$elem );
-
-            geographics._$canvasSceneBack = oldCanvasScene.prop( "src", ""  ).detach();
-          }
+      if ( this._trueCanvas && this._options.doubleBuffer && this._trueDoubleBuffer ) {
+        this._canvasSceneLoad( );
 
-          // transform a finished scene, can assume no drawing during these calls
-          this._$canvasSceneFront.css( {
-            left: Math.round( origin[ 0 ] ),
-            top: Math.round( origin[ 1 ] ),
-            width: this._width * scale,
-            height: this._height * scale
-          } );
-        } else {
-          this._context.clearRect(0, 0, this._width, this._height);
-        }
+        // transform a finished scene, can assume no drawing during these calls
+        this._$canvasSceneFront.css( {
+          left: Math.round( origin[ 0 ] ),
+          top: Math.round( origin[ 1 ] ),
+          width: this._width * scale,
+          height: this._height * scale
+        } );
       } else {
         this._context.clearRect(0, 0, this._width, this._height);
       }
@@ -4468,7 +4448,6 @@ $.Widget.prototype = {
         this._canvasSceneLoad( );
       }
 
-
       geographics._$labelsContainerBack.html( window.toStaticHTML( geographics._labelsHtml ) ).find("a").css({
         position: "relative",
         zIndex: 1,
@@ -6433,7 +6412,7 @@ $.Widget.prototype = {
 
           current = $.geo.center( this._multiTouchCurrentBbox, true );
 
-        } else if ( this._mouseDown ) {
+        } else {
           this._multiTouchAnchor[ 0 ] = e.originalEvent;
 
           this._multiTouchCurrentBbox = [