Merge remote-tracking branch 'upstream/master'

intersystems-community · Jun 1, 2015 · 8558c90 · 8558c90
2 parents 7400954 + d7d64e8
commit 8558c90
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"

diff --git a/web/index.html b/web/index.html
@@ -80,6 +80,5 @@ <h2 id="methodLabel"></h2>
             </div>
         </div>
     </div>
-    <canvas id="canvas" width="1000px" height="600px"></canvas>
 </body>
 </html>
diff --git a/web/jsLib/ImageExporter.js b/web/jsLib/ImageExporter.js
@@ -16,7 +16,7 @@ var enableSVGDownload = function (classView) {
     function getSources(doc, emptySvgDeclarationComputed) {
 
         var svgInfo = [],
-            svgs = doc.querySelectorAll("svg");
+            svgs = doc.querySelectorAll("#svgContainer > svg");
 
         [].forEach.call(svgs, function (svg) {
 
@@ -67,17 +67,15 @@ var enableSVGDownload = function (classView) {
 
     document.getElementById("button.downloadSVG").addEventListener("click", function () {
 
-        var emptySvg = window.document.createElementNS(prefix.svg, 'svg'),
-            emptySvgDeclarationComputed = getComputedStyle(emptySvg),
-            source = getSources(document, emptySvgDeclarationComputed)[0];
-
+        var emptySvg = document.createElementNS(prefix.svg, 'svg');
+        document.body.appendChild(emptySvg);
+        var emptySvgDeclarationComputed = getComputedStyle(emptySvg);
+        var source = getSources(document, emptySvgDeclarationComputed)[0];
         var filename = (classView || {}).SELECTED_NAME || "classDiagram";
-
         var img = new Image();
-        var url = window.URL.createObjectURL(new Blob(source.source, { "type" : 'image/svg+xml;charset=utf-8'/*"text\/xml"*/ }));
-
-        var canvas = document.createElement('canvas');
-        var ctx = canvas.getContext('2d');
+        var url = window.URL.createObjectURL(new Blob(source.source, { "type" : 'image/svg+xml;charset=utf-8' }));
+        var canvas = document.createElement("canvas");
+        var ctx = canvas.getContext("2d");
         canvas.setAttribute("width", source.width);
         canvas.setAttribute("height", source.height);
         document.body.appendChild(canvas);
@@ -92,6 +90,7 @@ var enableSVGDownload = function (classView) {
             a.click();
             setTimeout(function () {
                 a.parentNode.removeChild(a);
+                document.body.removeChild(emptySvg);
                 canvas.parentNode.removeChild(canvas);
                 window.URL.revokeObjectURL(url);
             }, 10);
@@ -110,6 +109,10 @@ var enableSVGDownload = function (classView) {
             for (i=0, len=cSSStyleDeclarationComputed.length; i<len; i++) {
                 key=cSSStyleDeclarationComputed[i];
                 value=cSSStyleDeclarationComputed.getPropertyValue(key);
+
+                // weird fix for weird bug in chrome: css rewrites w/h tag attributes!
+                if (value === "auto" && (key === "width" || key === "height")) continue;
+
                 if (value!==emptySvgDeclarationComputed.getPropertyValue(key)) {
                     computedStyleStr+=key+":"+value+";";
                 }