Skip to content

Add image mode. #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nsatragno wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add image mode. #5

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bfb2c1
Feature detect Stream.stop()
nsatragno Dec 9, 2016
a6a2446
Merge pull request #3 from nicolassatragno/master
ceneon Dec 9, 2016
50172fa
Add image mode.
nsatragno Jan 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 34 additions & 5 deletions we_avatar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function we_init_video(dom_id) {
height = 0;

if( msg_container.length )
msg_container.fadeOut();
msg_container.fadeOut();

navigator.getMedia = ( navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia);
navigator.getMedia({ video: true, audio: false },
Expand All @@ -72,6 +72,12 @@ function we_init_video(dom_id) {
video.src = vendorURL.createObjectURL(stream);
}
we_stream = stream;
// Feature detect |stop()|. See
// https://developers.google.com/web/updates/2015/07/mediastream-deprecations
if (!we_stream.stop) {
we_stream.stop =
we_stream.getTracks()[0].stop.bind(we_stream.getTracks()[0]);
}
video.play();
},
function(err) {
Expand Down Expand Up @@ -185,7 +191,7 @@ function we_delete(dom_id)
if(confirm('Are you sure? / ¿Está seguro?'))
jQuery.ajax({
url: avatar.attr("data-delete-url"),
type: 'DELETE',
type: 'DELETE',
dataType: 'text',
success: function(data){
avatar.attr("data-image-url", "");
Expand All @@ -194,7 +200,7 @@ function we_delete(dom_id)
we_update(dom_id);
if( msg_container.length )
msg_container.html( '<i class="fa fa-check"></i>' + " Imagen eliminada con éxito" ).fadeIn();
},
},
error: function(){
alert("Something wrong happened! / ¡Ocurrió un error!");
}
Expand All @@ -213,7 +219,11 @@ function we_upload_callback(dom_id)
msg_container = jQuery("#" + dom_id + "_msg");

if( msg_container.length )
msg_container.fadeOut();
msg_container.fadeOut();

var imageMode = avatar.attr("data-image-mode");
if (!imageMode)
imageMode = "tile";

if(inputfile[0].files.length < 1)
return;
Expand All @@ -232,7 +242,26 @@ function we_upload_callback(dom_id)
var image = new Image();
image.src = oFREvent.target.result;
image.onload = function() {
canvas.getContext('2d').drawImage(image, 0, 0);
switch (imageMode) {
case "tile":
canvas.getContext('2d').drawImage(image, 0, 0);
break;
case "stretch":
canvas.getContext('2d').drawImage(image, 0, 0, canvas.width, canvas.height);
break;
case "fit":
var aspectRatio = image.width / image.height;
if (aspectRatio > 1) {
var height = canvas.width / aspectRatio;
canvas.getContext('2d').drawImage(image, 0, (canvas.height - height) / 2, canvas.width, height);
} else {
var width = canvas.height * aspectRatio;
canvas.getContext('2d').drawImage(image, (canvas.width - width) / 2, 0, width, canvas.height);
}
break;
default:
console.error("Image mode", imageMode, " not recognized");
}
};
};
oFReader.readAsDataURL(file);
Expand Down