diff --git a/public/assets/css/componentStyle.css b/public/assets/css/componentStyle.css index 8a6412a4..a837dabd 100644 --- a/public/assets/css/componentStyle.css +++ b/public/assets/css/componentStyle.css @@ -122,8 +122,7 @@ button.copy-button { height: 6em; } -#asset-preview { - display: none; +#asset-preview-holder { width: 100%; margin-bottom: 1em; } diff --git a/public/assets/js/claimPublish.js b/public/assets/js/index.js similarity index 100% rename from public/assets/js/claimPublish.js rename to public/assets/js/index.js diff --git a/public/assets/js/memeDraw.js b/public/assets/js/memeFodder-draw.js similarity index 100% rename from public/assets/js/memeDraw.js rename to public/assets/js/memeFodder-draw.js diff --git a/public/assets/js/memePublish.js b/public/assets/js/memeFodder-publish.js similarity index 100% rename from public/assets/js/memePublish.js rename to public/assets/js/memeFodder-publish.js diff --git a/public/assets/js/publishFunctions.js b/public/assets/js/publishFunctions.js index de8626eb..67fcbf09 100644 --- a/public/assets/js/publishFunctions.js +++ b/public/assets/js/publishFunctions.js @@ -66,79 +66,13 @@ function validateClaimName (name) { return deferred; } -function captureScreenshot(file){ - console.log(file); - var deferred = new Promise(function(resolve, reject) { - // create elements - var canvas = document.createElement('canvas'); - canvas.class="snapshot-generator" ; - canvas.id="canvasElem"; - document.body.appendChild(canvas); - canvas = document.getElementById('canvasElem'); - - var video = document.createElement('video'); - video.class="snapshot-generator"; - video.id="video"; - video.muted = true; - document.body.appendChild(video); - video = document.getElementById('video'); - - // load the video - var metadataLoaded = false; - var dataLoaded = false; - var suspendDone = false; - function stepTwoCheck() { - if (metadataLoaded && dataLoaded && suspendDone) { - stepThree(); - } - } - video.src = '#'; // file source here - video.addEventListener('loadedmetadata', function() { - metadataLoaded = true; - stepTwoCheck(); - }); - video.addEventListener('loadeddata', function() { - dataLoaded = true; - stepTwoCheck(); - }); - video.addEventListener('suspend', function() { - suspendDone = true; - stepTwoCheck(); - }); - video.addEventListener('seeked', function(){ - stepFour(); - }) - // set the time - function stepThree(){ - video.currentTime = 1; - }; - // grab the snapshot - function stepFour(){ - canvas.height = video.videoHeight; - canvas.width = video.videoWidth; - canvas.msGetInputContext('2d').drawImage(video, 0 , 0); - var snapshot = canvas.toDataUrl(); - video.remove; - canvas.remove; - resolve(snapshot); - } - }); - return deferred; -} - /* regular publish helper functions */ function previewAndStageFile(selectedFile){ - var preview = document.getElementById('asset-preview'); + var previewHolder = document.getElementById('asset-preview-holder'); var dropzone = document.getElementById('drop-zone'); var previewReader = new FileReader(); var nameInput = document.getElementById('publish-name'); - // set the preview after reading the asset - previewReader.onloadend = function () { - preview.style.display = 'block'; - dropzone.style.display = 'none'; - preview.src = previewReader.result; - }; // validate the file try { validateFile(selectedFile); @@ -146,22 +80,18 @@ function previewAndStageFile(selectedFile){ alert(error.message); return; } - // read the data (when completed, it will trigger the asset preview) + // set the preview if (selectedFile.type === 'video/mp4') { - captureScreenshot(selectedFile) - .then(function (snapshot) { - console.log(test) - preview.style.display = 'block'; - dropzone.style.display = 'none'; - preview.src = snapshot; - }) - .catch(function (error) { - alert(error); - }) + } else { - previewReader.readAsDataURL(selectedFile); + previewReader.readAsDataURL(selectedFile); + previewReader.onloadend = function () { + dropzone.style.display = 'none'; + previewHolder.style.display = 'block'; + previewHolder.innerHTML = 'image preview'; + + }; } - // set the name input value to the image name if none is set yet if (nameInput.value === "") { nameInput.value = selectedFile.name.substring(0, selectedFile.name.indexOf('.')); diff --git a/views/index.handlebars b/views/index.handlebars index 0e1302f9..a698756f 100644 --- a/views/index.handlebars +++ b/views/index.handlebars @@ -10,4 +10,4 @@ - + diff --git a/views/memeFodder.handlebars b/views/memeFodder.handlebars index 214bde12..12a1dd50 100644 --- a/views/memeFodder.handlebars +++ b/views/memeFodder.handlebars @@ -10,5 +10,5 @@ - - \ No newline at end of file + + \ No newline at end of file diff --git a/views/partials/publish.handlebars b/views/partials/publish.handlebars index 85c17deb..d2b49224 100644 --- a/views/partials/publish.handlebars +++ b/views/partials/publish.handlebars @@ -6,7 +6,7 @@
- asset preview +