Commit 0cd22ae3 by doszhang

dos

parent a114cfca
...@@ -79,9 +79,9 @@ $(document).ready(function () { ...@@ -79,9 +79,9 @@ $(document).ready(function () {
}); });
$('input[name=btn-upload]').change(function () { $('input[name=btn-upload]').change(function () {
$('.regulate-block').show(); $('.regulate-block').show();
bindUpload(this, uploadCtx, uploadCanvas, 1, function () { bindUpload(this, uploadCtx, uploadCanvas, 1, function (img) {
var mc = new Hammer($('#uploadCanvas').get(0)); var mc = new Hammer($('#uploadCanvas').get(0));
bindMc(mc, uploadCtx, uploadCanvas, headimg[1], imgInfo1); bindMc(mc, uploadCtx, uploadCanvas, img, imgInfo);
}, imgInfo); }, imgInfo);
return false; return false;
}); });
...@@ -188,7 +188,7 @@ function bindUpload(that, ctx, myCanvas, index, callback, imgInfo) { ...@@ -188,7 +188,7 @@ function bindUpload(that, ctx, myCanvas, index, callback, imgInfo) {
img.src = results.base64; img.src = results.base64;
console.log(img.src); console.log(img.src);
// headimg[index] = img; // headimg[index] = img;
callback(); callback(img);
}); });
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment