Merge pull request #4171 from minrk/waiting-onload

tacaswell · tacaswell · commit 7fcc1403cf2c · 2015-03-03T08:49:57.000-05:00
MNT : set `fig.waiting = false` when image data is received
diff --git a/lib/matplotlib/backends/web_backend/mpl.js b/lib/matplotlib/backends/web_backend/mpl.js
@@ -70,7 +70,6 @@ mpl.figure = function(figure_id, websocket, ondownload, parent_element) {
                 fig.context.clearRect(0, 0, fig.canvas.width, fig.canvas.height);
             }
             fig.context.drawImage(fig.imageObj, 0, 0);
-            fig.waiting = false;
         };
 
     this.imageObj.onunload = function() {
@@ -401,11 +400,13 @@ mpl.figure.prototype._make_on_message_function = function(fig) {
             fig.imageObj.src = (window.URL || window.webkitURL).createObjectURL(
                 evt.data);
             fig.updated_canvas_event();
+            fig.waiting = false;
             return;
         }
         else if (typeof evt.data === 'string' && evt.data.slice(0, 21) == "data:image/png;base64") {
             fig.imageObj.src = evt.data;
             fig.updated_canvas_event();
+            fig.waiting = false;
             return;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ mpl.figure = function(figure_id, websocket, ondownload, parent_element) {`
`70`	`70`	`fig.context.clearRect(0, 0, fig.canvas.width, fig.canvas.height);`
`71`	`71`	`}`
`72`	`72`	`fig.context.drawImage(fig.imageObj, 0, 0);`
`73`		`- fig.waiting = false;`
`74`	`73`	`};`
`75`	`74`
`76`	`75`	`this.imageObj.onunload = function() {`
`@@ -401,11 +400,13 @@ mpl.figure.prototype._make_on_message_function = function(fig) {`
`401`	`400`	`fig.imageObj.src = (window.URL \|\| window.webkitURL).createObjectURL(`
`402`	`401`	`evt.data);`
`403`	`402`	`fig.updated_canvas_event();`
	`403`	`+ fig.waiting = false;`
`404`	`404`	`return;`
`405`	`405`	`}`
`406`	`406`	`else if (typeof evt.data === 'string' && evt.data.slice(0, 21) == "data:image/png;base64") {`
`407`	`407`	`fig.imageObj.src = evt.data;`
`408`	`408`	`fig.updated_canvas_event();`
	`409`	`+ fig.waiting = false;`
`409`	`410`	`return;`
`410`	`411`	`}`
`411`	`412`