Scenery patches for maintenance releases primarily for #515, with add…

…itional patches. Includes: 47143cd 838086b 92e341f 8a58e6f
phetsims · Feb 23, 2016 · ad95698 · ad95698
1 parent 98ea2ee
commit ad95698
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 1 deletion.
diff --git a/js/display/CanvasBlock.js b/js/display/CanvasBlock.js
@@ -78,6 +78,8 @@ define( function( require ) {
       this.canvas.style.width = size.width + 'px';
       this.canvas.style.height = size.height + 'px';
       this.wrapper.resetStyles();
+      this.canvasDrawOffset.setXY( 0, 0 );
+      Util.unsetTransform( this.canvas );
     },
 
     setSizeFitBounds: function() {

diff --git a/js/display/DOMSelfDrawable.js b/js/display/DOMSelfDrawable.js
@@ -67,6 +67,8 @@ define( function( require ) {
 
           this.domElement.style.visibility = this.visible ? '' : 'hidden';
         }
+
+        this.cleanPaintableState && this.cleanPaintableState();
       }
     },
 

diff --git a/js/display/SVGSelfDrawable.js b/js/display/SVGSelfDrawable.js
@@ -129,6 +129,8 @@ define( function( require ) {
       if ( this.dirtyFill || this.dirtyStroke || strokeDetailDirty ) {
         element.setAttribute( 'style', this.paintState.baseStyle + this.paintState.strokeDetailStyle );
       }
+
+      this.cleanPaintableState();
     },
 
     updateSVGBlock: function( svgBlock ) {

diff --git a/js/nodes/Circle.js b/js/nodes/Circle.js
@@ -358,6 +358,8 @@ define( function( require ) {
     setToClean: function() {
       this.setToCleanState();
 
+      this.cleanPaintableState();
+
       this.transformDirty = false;
     },
 

diff --git a/js/nodes/Line.js b/js/nodes/Line.js
@@ -519,7 +519,6 @@ define( function( require ) {
       context.beginPath();
       context.moveTo( node._x1, node._y1 );
       context.lineTo( node._x2, node._y2 );
-      context.closePath();
 
       if ( node._stroke ) {
         node.beforeCanvasStroke( wrapper ); // defined in Paintable

diff --git a/js/nodes/Rectangle.js b/js/nodes/Rectangle.js
@@ -738,6 +738,8 @@ define( function( require ) {
     setToClean: function() {
       this.setToCleanState();
 
+      this.cleanPaintableState();
+
       this.transformDirty = false;
     },
 

diff --git a/js/nodes/Text.js b/js/nodes/Text.js
@@ -710,6 +710,8 @@ define( function( require ) {
     setToClean: function() {
       this.setToCleanState();
 
+      this.cleanPaintableState();
+
       this.transformDirty = false;
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,6 +67,8 @@ define( function( require ) { @@
               this.domElement.style.visibility = this.visible ? '' : 'hidden';
             }
+            this.cleanPaintableState && this.cleanPaintableState();
           }
         },
@@ Expand Down @@