diff options
author | Ulrich-Matthias Schäfer <ulima.ums@googlemail.com> | 2017-04-22 20:31:58 +0200 |
---|---|---|
committer | Ulrich-Matthias Schäfer <ulima.ums@googlemail.com> | 2017-04-22 20:31:58 +0200 |
commit | 408940add58e81e7879098682e94504a8cf3a734 (patch) | |
tree | b7d1a4c2bc659bdafe50097c6a0e9921cbbf9ee1 /src/svg.js | |
parent | 60d3ad099f3ee1a39b401d12405dba9e4d7e5da2 (diff) | |
parent | 04e21b18c30d546ed6a16b279504a2b58b503541 (diff) | |
download | svg.js-408940add58e81e7879098682e94504a8cf3a734.tar.gz svg.js-408940add58e81e7879098682e94504a8cf3a734.zip |
Merge branch 'master' into 3.0.0
# Conflicts - all resolved:
# dist/svg.js
# dist/svg.min.js
# package.json
# spec/SpecRunner.html
# spec/spec/boxes.js
# spec/spec/element.js
# spec/spec/image.js
# spec/spec/svg.js
# src/boxes.js
# src/flatten.js
# src/image.js
# src/polyfill.js
# src/style.js
# src/svg.js
Diffstat (limited to 'src/svg.js')
-rw-r--r-- | src/svg.js | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -126,7 +126,7 @@ SVG.adopt = function(node) { SVG.prepare = function() { // Select document body and create invisible svg element var body = document.getElementsByTagName('body')[0] - , draw = (body ? new SVG.Doc(body) : new SVG.Doc(document.documentElement).nested()).size(2, 0) + , draw = (body ? new SVG.Doc(body) : SVG.adopt(document.documentElement).nested()).size(2, 0) // Create parser object SVG.parser = { @@ -137,7 +137,7 @@ SVG.prepare = function() { left:'-100%', top:'-100%', overflow:'hidden' - }) + }).node , poly: draw.polyline().node , path: draw.path().node , native: SVG.create('svg') |