jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
huang 2016-01-08 23:03:39 +08:00
parent 100ecfb184 d4d1fe65b3
commit 4e25b9730f
1 changed files with 182 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/javascripts/avatars.js
View File

@ -2,6 +2,9 @@
Copyright (C) 2006-2013 Jean-Philippe Lang
Modified by Jianfeng Tao, to upload one avatar for user*/
(function(){
function addFile(inputEl, file, eagerUpload) {
var fileSpan = $('#avatar_file');
@ -109,7 +112,7 @@ function uploadBlob(blob, uploadUrl, source_type,source_id, options) {
});
}
function addInputAvatar(inputEl) {
window.addInputAvatar = function(inputEl) {
// var clearedFileInput = $(inputEl).clone().val('');
if (inputEl.files) {
@ -129,7 +132,6 @@ function addInputAvatar(inputEl) {
//clearedFileInput.insertAfter('#avatars_fields');
}
function uploadAndAttachFiles(files, inputEl) {
var maxFileSize = $(inputEl).data('max-file-size');
@ -170,8 +172,10 @@ function uploadAndTypeFiles(files, inputEl) {
}
}
function handleFileDropEvent(e) {
function handleFileDropEvent(e) {
$(this).removeClass('fileover');
blockEventPropagation(e);
@ -191,6 +195,7 @@ function dragOutHandler(e) {
}
function setupFileDrop() {
console.log("setupFileDrop");
$('#avatar_image').on('click', function(){
console.log("click");
});
@ -209,3 +214,5 @@ function setupFileDrop() {
}
$(document).ready(setupFileDrop);
})();