Skip to content

Commit 7d9da07

Browse files
author
Michael Bleigh
committed
Switch download to open data-uri in a new window instead of the octet stream hack.
1 parent c89e3b1 commit 7d9da07

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

docs/sketch.html

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,7 @@
141141
<span class="nv">format = </span><span class="s2">&quot;jpeg&quot;</span> <span class="k">if</span> <span class="nx">format</span> <span class="o">==</span> <span class="s2">&quot;jpg&quot;</span>
142142
<span class="nv">mime = </span><span class="s2">&quot;image/#{format}&quot;</span>
143143

144-
<span class="nv">imgData = </span><span class="nx">@el</span><span class="p">.</span><span class="nx">toDataURL</span><span class="p">(</span><span class="nx">mime</span><span class="p">)</span>
145-
<span class="nv">imgData = </span><span class="nx">imgData</span><span class="p">.</span><span class="nx">replace</span><span class="p">(</span><span class="nx">mime</span><span class="p">,</span> <span class="s2">&quot;image/octet-stream&quot;</span><span class="p">)</span>
146-
147-
<span class="nb">document</span><span class="p">.</span><span class="nv">location.href = </span><span class="nx">imgData</span>
144+
<span class="nb">window</span><span class="p">.</span><span class="nx">open</span> <span class="nx">@el</span><span class="p">.</span><span class="nx">toDataURL</span><span class="p">(</span><span class="nx">mime</span><span class="p">)</span>
148145

149146
<span class="nv">$.sketch.tools.marker =</span>
150147
<span class="nv">draw: </span><span class="nf">(action)-&gt;</span>

lib/sketch.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,13 @@ var __slice = Array.prototype.slice;
142142
}
143143
};
144144
Sketch.prototype.download = function(filename, format) {
145-
var imgData, mime;
145+
var mime;
146146
format || (format = "png");
147147
if (format === "jpg") {
148148
format = "jpeg";
149149
}
150150
mime = "image/" + format;
151-
imgData = this.el.toDataURL(mime);
152-
imgData = imgData.replace(mime, "image/octet-stream");
153-
return document.location.href = imgData;
151+
return window.open(this.el.toDataURL(mime));
154152
};
155153
return Sketch;
156154
})();

src/sketch.coffee

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,7 @@
176176
format = "jpeg" if format == "jpg"
177177
mime = "image/#{format}"
178178

179-
imgData = @el.toDataURL(mime)
180-
imgData = imgData.replace(mime, "image/octet-stream")
181-
182-
document.location.href = imgData
179+
window.open @el.toDataURL(mime)
183180

184181
$.sketch.tools.marker =
185182
draw: (action)->

0 commit comments

Comments
 (0)