Merge branch 'master' of git.interhacker.space:tmplab/ImageGenerator

This commit is contained in:
alban 2019-12-01 00:41:02 +01:00
commit 6d14862ae0

View File

@ -139,12 +139,6 @@ dd{
</select> </select>
</dd> </dd>
<!-- <!--
<dt>
<label>a stamp of your own?</label>
</dt>
<dd>
<input class=btn type="file" id="custompicture" />
</dd>
<dt> <dt>
<label>now shine</label> <label>now shine</label>
</dt> </dt>
@ -186,6 +180,12 @@ dd{
<button class=btn type="submit">build</button> <button class=btn type="submit">build</button>
</form> </form>
</dd> </dd>
<dt>
<label>a stamp of your own?</label>
</dt>
<dd>
<input class=btn type="file" id="custompicture" />
</dd>
</dl> </dl>
</div> </div>
</div> </div>
@ -233,7 +233,6 @@ document.getElementById("stamps").addEventListener("change", function(){
updateCanvas(this.value); updateCanvas(this.value);
}, false); }, false);
/*
// When the user clicks on upload a custom picture // When the user clicks on upload a custom picture
document.getElementById('custompicture').addEventListener("change", function(e){ document.getElementById('custompicture').addEventListener("change", function(e){
var reader = new FileReader(); var reader = new FileReader();
@ -256,7 +255,7 @@ if(e.target.files[0]){
reader.readAsDataURL(e.target.files[0]); reader.readAsDataURL(e.target.files[0]);
} }
}, false); }, false);
*/
// When the user selects a picture that has been added and press the DEL key // When the user selects a picture that has been added and press the DEL key
// The object will be removed ! // The object will be removed !
document.addEventListener("keydown", function(e) { document.addEventListener("keydown", function(e) {