From 43fc160d11bc041302367984901ebf7ecd8118ef Mon Sep 17 00:00:00 2001 From: jules Date: Fri, 7 Feb 2014 23:54:25 -0500 Subject: split out file save api --- Gruntfile.js | 1 + js/frames.js | 51 ------------------------------------------------ js/save.js | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ shader-combo.html | 1 + shader-localstorage.html | 1 + shader-picker.html | 1 + 6 files changed, 55 insertions(+), 51 deletions(-) create mode 100644 js/save.js diff --git a/Gruntfile.js b/Gruntfile.js index 42d25c3..333b2a4 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -37,6 +37,7 @@ module.exports = function(grunt) { "js/gallery.js", "js/frames.js", "js/render.js", + "js/save.js", "js/shader.js", "js/error.highlight.js", "js/help.js", diff --git a/js/frames.js b/js/frames.js index 93d4ac3..163e899 100644 --- a/js/frames.js +++ b/js/frames.js @@ -156,54 +156,3 @@ encoder.on("rendered-url", function(url){ pause(true) }) -function get_filename(){ - var basename = $("#url").val().replace(/^.*\//,"").replace(/\..*$/,"").replace(/[^-_ a-zA-Z0-9]/g,"") - var username = user.username - var filename = basename + "-" + username + "-" + (+new Date()) + ".gif" - return filename.replace(/ /g,"_").replace(/-+/g,"-") -} -function save (){ - if (! lastGif) return; - var filename = get_filename() - var blob = dataUriToBlob(lastGif) - saveAs(blob, filename); -} -function saveJSON (data, filename) { - var bytes = JSON.stringify(data) - var buf = new ArrayBuffer(bytes.length); - var arr = new Uint8Array(buf); - for (var i = 0; i < bytes.length; i++) { - arr[i] = bytes.charCodeAt(i); - } - - var blob = new Blob([arr], { type: "text/json" }); - blob.slice = blob.slice || blob.webkitSlice; - - saveAs(blob, filename); -} - -function upload(){ - var filename = get_filename() - var username = user.username - var blob = dataUriToBlob(lastGif) - uploadImage({ - blob: blob, - filename: filename, - username: username, - success: function(data){ - - // data.url - // data.filesize - // data.success - - console.log(data); - status("uploaded"); - $("#uploaded-url").show().focus().val(data.url) - $("#uploaded-url + br").show() - }, - error: function(data){ - console.log(data) - status("error uploading: " + data.error) - } - }); -} diff --git a/js/save.js b/js/save.js new file mode 100644 index 0000000..f54f7d1 --- /dev/null +++ b/js/save.js @@ -0,0 +1,51 @@ +function get_filename(){ + var basename = $("#url").val().replace(/^.*\//,"").replace(/\..*$/,"").replace(/[^-_ a-zA-Z0-9]/g,"") + var username = user.username + var filename = basename + "-" + username + "-" + (+new Date()) + ".gif" + return filename.replace(/ /g,"_").replace(/-+/g,"-") +} +function save (){ + if (! lastGif) return; + var filename = get_filename() + var blob = dataUriToBlob(lastGif) + saveAs(blob, filename); +} +function saveJSON (data, filename) { + var bytes = JSON.stringify(data) + var buf = new ArrayBuffer(bytes.length); + var arr = new Uint8Array(buf); + for (var i = 0; i < bytes.length; i++) { + arr[i] = bytes.charCodeAt(i); + } + + var blob = new Blob([arr], { type: "text/json" }); + blob.slice = blob.slice || blob.webkitSlice; + + saveAs(blob, filename); +} + +function upload(){ + var filename = get_filename() + var username = user.username + var blob = dataUriToBlob(lastGif) + uploadImage({ + blob: blob, + filename: filename, + username: username, + success: function(data){ + + // data.url + // data.filesize + // data.success + + console.log(data); + status("uploaded"); + $("#uploaded-url").show().focus().val(data.url) + $("#uploaded-url + br").show() + }, + error: function(data){ + console.log(data) + status("error uploading: " + data.error) + } + }); +} diff --git a/shader-combo.html b/shader-combo.html index a7ede26..54f4329 100644 --- a/shader-combo.html +++ b/shader-combo.html @@ -183,6 +183,7 @@ a { color: #00f; } + diff --git a/shader-localstorage.html b/shader-localstorage.html index 923f1b6..48c5184 100644 --- a/shader-localstorage.html +++ b/shader-localstorage.html @@ -125,6 +125,7 @@ a { color: #00f; } + + -- cgit v1.2.3-70-g09d2