#7003 WIP:

- better convertToXHTML
- fix drawPng src should be set after onload handler to

js/notebook/src/plot/plotUtils.js

@@ -889,12 +889,13 @@ define([
       var download = this.download;
       var context = canvas.getContext("2d");
       var image = new Image;
-      image.src = imgsrc;
       image.onload = function() {
         context.drawImage(image, 0, 0, canvas.width, canvas.height);
         download(canvas.toDataURL("image/png"), fileName);
         context.clearRect(0, 0, canvas.width, canvas.height);
       };
+
+      image.src = imgsrc;
     },
     addInlineStyles: function(element, extraStyles) {
       var styleEl = document.createElement('style');
@@ -983,7 +984,10 @@ define([
       return xhr.responseText;
     },
     convertToXHTML: function (html) {
-      return html.replace(/input[^>]+"/g, "$&" + '/');
+      var doc = document.implementation.createHTMLDocument('');
+      doc.documentElement.setAttribute('xmlns', doc.documentElement.namespaceURI);
+      doc.write(html);
+      return (new XMLSerializer).serializeToString(doc.body.firstChild);
     },
     download: function(url, fileName) {
       var a = document.createElement('a');