From dc05f972800da90c27793df61797e11cf1b2a474 Mon Sep 17 00:00:00 2001 From: Valvin Date: Tue, 19 Sep 2017 22:35:25 +0200 Subject: [PATCH] Remove remote url feature and replace it with upload file feature --- comicgen.js | 25 +++++++++++++++++-------- gege.css | 9 +++++++++ index.html | 11 ++++++----- ragaboom.min.js | 2 +- 4 files changed, 33 insertions(+), 14 deletions(-) diff --git a/comicgen.js b/comicgen.js index b4a7bf0..7ddebab 100644 --- a/comicgen.js +++ b/comicgen.js @@ -177,16 +177,25 @@ cg.createTextFromInput = function(e){ pop.play(); } } -cg.createImageFromInput= function(e){ +cg.createImageFromInput= function(t){ - var key = e.keyCode || e.which; - var imgUrl = $('#newImgUrl').val(); + var fileList = t.files; /* now you can work with the file list */ + var imageType = /image.*/; + var nBytes = 0; + + for (var i = 0; i < fileList.length; i++) + { + + var file = fileList[i]; + nBytes += file.size; + if (!file.type.match(imageType)) + { + continue; + } + imgUrl = window.URL.createObjectURL(file); + cg.createImage(imgUrl); + } - if(key == 13){ - - cg.createImage(imgUrl); - $('#newImgUrl').val(''); - } } cg.saveImage = function(){ var data = c.toDataURL('png'); diff --git a/gege.css b/gege.css index 4c9a40b..374f965 100644 --- a/gege.css +++ b/gege.css @@ -248,3 +248,12 @@ text-decoration: underline; width: 70px ; display : inline; } +.upload{ + margin-top: 20px; + margin-bottom: 20px; + +} + +input.file { + display:none; +} diff --git a/index.html b/index.html index cfd0c3c..cdf4615 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + @@ -70,13 +70,14 @@
-
-
+
+ +

Télécharger une image

+
T
-

Instructions

    @@ -99,7 +100,7 @@
    - + Le générateur du GKND a besoin d'un navigateur récent et de javascript pour fonctionner.
    diff --git a/ragaboom.min.js b/ragaboom.min.js index 95483a7..d984778 100644 --- a/ragaboom.min.js +++ b/ragaboom.min.js @@ -4,7 +4,7 @@ c.length;i++)this.add(c[i])};this.remove=function(c){for(var c=c.getId(),i=d.len e=h+i;e<0&&(e=0);e>=a&&(e=a-1);a=d[h];d[h]=d[e];d[e]=a};getObjectById=function(c){for(var a=d.length,f=0;f=0;a--){var f=r[a];if(f.checkRange(RB.xPos(c),RB.yPos(c))){f.onmousedown(c);t=f;currentObjectIndex=a;A=RB.xPos(c)-t.x;l=RB.yPos(c)-t.y;v=!0;break}}j.onmousedown(c)};b.onmouseup=function(c){v=!1;j.onmouseup(c)};n.onkeydown= function(c){B(c,!0);j.onkeydown(c)};n.onkeyup=function(c){B(c,!1);j.onkeyup(c)};this.getObjectSize=function(){return d.length};this.getObj=function(c){return d[c]};this.rect=function(c,a,f,h,e){var h=h||this.genID(),h=RB.createCanvas(c,a,h),g=h.getContext("2d");if(f)g.fillStyle=RB.getFS(f,g,a),g.fillRect(0,0,c,a);if(e)f=e.lineWidth||1,g.lineWidth=e.lineWidth,g.strokeStyle=e.strokeStyle,g.rect(0+f,0+f,c-f-f,a-f-f),g.stroke();return rectObj=new RB.Obj(h,this.ctx)};this.image=function(c,i,f){var h=new Image, -e=this,g=null;h.crossOrigin = "anonymous";h.onload=function(){f=f||e.genID();g=RB.createCanvas(h.width,h.height,f);g.getContext("2d").drawImage(this,0,0);a++;var c=new RB.Obj(g,e.ctx);i(c)};h.src=c;x++};this.loadImage=function(c,i,f){var h=new Image,e=this,g=null;h.onload=function(){i=i||e.genID();g=RB.createCanvas(h.width,h.height,i);g.getContext("2d").drawImage(this,0,0);a++;f(g)};h.src=c;x++};this.imagePattern=function(c,i,f,h,e){var g=new Image,b=this;g.onload=function(){e=e||b.genID();var c=RB.createCanvas(i,f,e).getContext("2d"), +e=this,g=null;h.onload=function(){f=f||e.genID();g=RB.createCanvas(h.width,h.height,f);g.getContext("2d").drawImage(this,0,0);a++;var c=new RB.Obj(g,e.ctx);i(c)};h.src=c;x++};this.loadImage=function(c,i,f){var h=new Image,e=this,g=null;h.onload=function(){i=i||e.genID();g=RB.createCanvas(h.width,h.height,i);g.getContext("2d").drawImage(this,0,0);a++;f(g)};h.src=c;x++};this.imagePattern=function(c,i,f,h,e){var g=new Image,b=this;g.onload=function(){e=e||b.genID();var c=RB.createCanvas(i,f,e).getContext("2d"), d=c.createPattern(g,h);c.fillStyle=d;c.fillRect(0,0,i,f);a++;a==x&&b.doAfterLoad()};g.src=c;x++};this.roundRect=function(c,a,f,h,e,g){var e=e||this.genID(),e=RB.createCanvas(c,a,e),b=e.getContext("2d");b.beginPath();b.moveTo(0+f,0);b.lineTo(c+0-f,0);b.quadraticCurveTo(c+0,0,c+0,0+f);b.lineTo(c+0,a+0-f);b.quadraticCurveTo(c+0,0+a,c+0-f,0+a);b.lineTo(0+f,0+a);b.quadraticCurveTo(0,0+a,0,0+a-f);b.lineTo(0,0+f);b.quadraticCurveTo(0,0,0+f,0);b.closePath();if(h)b.fillStyle=RB.getFS(h,b,a),b.fill();if(g)b.lineWidth= g.lineWidth,b.strokeStyle=g.strokeStyle,b.stroke();return new RB.Obj(e,this.ctx)};this.text=function(a,b,f,h,e){var g=RB.getTextBuffer(),e=e||this.genID();g.innerHTML=a;g.style.fontFamily=b;g.style.fontSize=f+"px";var d=RB.el(e);d?(e=d.getContext("2d"),d.width=g.offsetWidth,d.height=g.offsetHeight+15,e.clearRect(0,0,g.offsetWidth,g.offsetHeight+15)):(d=RB.createCanvas(g.offsetWidth,g.offsetHeight+15,e),e=d.getContext("2d"));e.fillStyle=RB.getFS(h,e,g.offsetHeight+25);e.font="normal "+f+"px "+b;e.fillText(a, 0,g.offsetHeight+5);return new RB.Obj(d,this.ctx)};this.start=function(){w=!0;this.animate()};this.stop=function(){w=!1};this.toggleStart=function(){w?this.stop():this.start()};this.onLoop=function(){};this.runOnce=function(){this.ctx.restore();for(var a=d.length,b=q.length,f=0;f