Skip to content
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

Added stroke, eraser, changed to data-attribute #3

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

Added stroke, eraser, changed to data-attribute #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a50d4c
Added stroke, eraser, changed to data-attribute
Jan 21, 2022
a6ec2f0
Moved events into function
Jan 21, 2022
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
26 changes: 23 additions & 3 deletions resources/css/bcPaint.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,28 @@
cursor: pointer;
border-radius: 5px;
margin: 0 5px;
border: 1px #ccc solid;
}
.bcPaint-palette-stroke {

background-color:#AAA;
display: inline-block;
margin: 2px;
border: 2px #ccc solid;
border-radius: 15px;

#bcPaint-palette > .selected {
border: 2px solid #343a40;
}
}
#bcPaint-palette > .selectedColor {
border: 2px solid #777;
}
#bcPaint-palette > .selectedStroke {
border: 3px solid #777;
}
#bcPaint-palette {
width:1100px;
}
#bcPaint-canvas-container {
height:800px;
width:1100px;
border: 1px #ccc solid;
}
104 changes: 76 additions & 28 deletions resources/js/bcPaint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,28 @@
* Copyright (c) 2018-2021 Alexandre Bobkov
* Licensed under MIT
* @author Alexandre Bobkov
* @version 0.7.3
* @contributor Jeppe Bundsgaard
* @version 0.8
*/

$(document).ready(function(){
$('body').on('click', '.bcPaint-palette-color', function(){
$(this).parent().find('.selected').removeClass('selected');
$(this).addClass('selected');
$.fn.bcPaint.setColor($(this).css('background-color'));
});

$('body').on('click', '#bcPaint-reset', function(){
$.fn.bcPaint.clearCanvas();
});

$('body').on('click', '#bcPaint-export', function(){
$.fn.bcPaint.export();
});
});


(function( $ ) {
/**
* Private variables
**/
var isDragged = false,
isEraser = false,
startPoint = { x:0, y:0 },
templates = {
container : $('<div class="row" id="bcPaint-container"></div>'),
palette : $('<div class="col-sm-3 cols-md-3 bg-light rounded pt-4 text-center" id="bcPaint-palette"><h6 class="bg-dark rounded p-3 mb-4 text-white font-weight-normal">Color Palette</h6></div>'),
palette : $('<div class="col-sm-3 cols-md-3 bg-light rounded pt-4 text-center" id="bcPaint-palette"></div>'),
color : $('<div class="bcPaint-palette-color"></div>'),
stroke : $('<div class="bcPaint-palette-stroke"></div>'),
canvasContainer : $('<div class="col-sm-9 col-md-9" id="bcPaint-canvas-container"></div>'),
canvasPane : $('<canvas id="bcPaintCanvas" class="border border-dark rounded"></canvas>'),
bottom : $('<div class="col-sm-12 col-md-12 text-center mt-3" id="bcPaint-bottom"></div>'),
buttonReset : $('<button type="button" class="btn btn-secondary btn-sm mr-1" id="bcPaint-reset"><i class="fas fa-eraser"></i> Clear</button>'),
buttonSave : $('<button type="button" class="btn btn-primary btn-sm ml-1" id="bcPaint-export"><i class="fas fa-download"></i> Export</button>')
buttonSave : $('<button type="button" class="btn btn-primary btn-sm ml-1" id="bcPaint-export"><i class="fas fa-download"></i> Export</button>'),
eraser : $('<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" fill="#CCC" class="bi bi-eraser" id="bcPaint-eraser" viewBox="0 0 16 16"><path d="M8.086 2.207a2 2 0 0 1 2.828 0l3.879 3.879a2 2 0 0 1 0 2.828l-5.5 5.5A2 2 0 0 1 7.879 15H5.12a2 2 0 0 1-1.414-.586l-2.5-2.5a2 2 0 0 1 0-2.828l6.879-6.879zm2.121.707a1 1 0 0 0-1.414 0L4.16 7.547l5.293 5.293 4.633-4.633a1 1 0 0 0 0-1.414l-3.879-3.879zM8.746 13.547 3.453 8.254 1.914 9.793a1 1 0 0 0 0 1.414l2.5 2.5a1 1 0 0 0 .707.293H7.88a1 1 0 0 0 .707-.293l.16-.16z"/></svg>')
},
paintCanvas,
paintContext;
Expand All @@ -50,7 +37,9 @@ $(document).ready(function(){
return this.each(function () {
var rootElement = $(this),
colorSet = $.extend({}, $.fn.bcPaint.defaults, options),
strokeSet = $.extend({}, $.fn.bcPaint.defaults, options),
defaultColor = (rootElement.val().length > 0) ? rootElement.val() : colorSet.defaultColor,
defaultStroke = strokeSet.defaultStroke,
container = templates.container.clone(),
// header = templates.header.clone(),
palette = templates.palette.clone(),
Expand All @@ -59,7 +48,9 @@ $(document).ready(function(){
bottom = templates.bottom.clone(),
buttonReset = templates.buttonReset.clone(),
buttonSave = templates.buttonSave.clone(),
color;
color,
stroke,
eraser = templates.eraser.clone();

// assembly pane
rootElement.append(container);
Expand All @@ -69,15 +60,26 @@ $(document).ready(function(){
container.append(bottom);
// header.append(palette);
canvasContainer.append(canvasPane);
bottom.append(buttonReset);
bottom.append(buttonSave);
// bottom.append(buttonReset);
// bottom.append(buttonSave);

// assembly color palette
$.each(colorSet.colors, function (i) {
color = templates.color.clone();
color.css('background-color', $.fn.bcPaint.toHex(colorSet.colors[i]));
color.attr('data-color',colorSet.colors[i])
palette.append(color);
});
$.each(strokeSet.strokes, function (i) {
stroke = templates.stroke.clone();
stroke.css('height', strokeSet.strokes[i]+"px"); //.find('.bcPaint-palette-stroke')
stroke.css('width', strokeSet.strokes[i]+"px");
stroke.attr('data-stroke',strokeSet.strokes[i])
palette.append(stroke);
});
// eraser.css("float","right");
palette.append(eraser)


// set canvas pane width and height
var bcCanvas = rootElement.find('canvas');
Expand All @@ -91,6 +93,8 @@ $(document).ready(function(){

// set color
$.fn.bcPaint.setColor(defaultColor);
// set color
$.fn.bcPaint.setStroke(defaultStroke);

// bind mouse actions
paintCanvas.onmousedown = $.fn.bcPaint.onMouseDown;
Expand Down Expand Up @@ -124,14 +128,31 @@ $(document).ready(function(){
e.preventDefault();
}
}, false);

// Palette events
palette.on('click', '.bcPaint-palette-color', function(){
$.fn.bcPaint.setColor($(this).data('color'));
});
palette.on('click', '.bcPaint-palette-stroke', function(){
$.fn.bcPaint.setStroke($(this).data('stroke'));
});
palette.on('click', '#bcPaint-eraser', function(){
$.fn.bcPaint.setEraser()
});
palette.on('click', '#bcPaint-reset', function(){
$.fn.bcPaint.clearCanvas();
});
palette.on('click', '#bcPaint-export', function(){
$.fn.bcPaint.export();
});

});
}

/**
* Extend plugin
**/
$.extend(true, $.fn.bcPaint, {

/**
* Dispatch mouse event
*/
Expand Down Expand Up @@ -179,16 +200,41 @@ $(document).ready(function(){
**/
onMouseMove : function(e){
if(isDragged){
paintContext.lineTo(e.offsetX, e.offsetY);
paintContext.stroke();
if(isEraser) {
paintContext.clearRect(e.offsetX, e.offsetY,paintContext.lineWidth*2,paintContext.lineWidth*2);
}
else {
paintContext.lineTo(e.offsetX, e.offsetY);
paintContext.stroke();
}
}
},

/**
* Set selected color
* Set selected color, disable eraser
**/
setColor : function(color){
$('.selectedColor').removeClass('selectedColor');
$('.bcPaint-palette-color[data-color="'+color+'"]').addClass('selectedColor');
paintContext.strokeStyle = $.fn.bcPaint.toHex(color);
isEraser=false
},
/**
* Set selected stroke
**/
setStroke : function(stroke){
$('.bcPaint-palette-stroke.selectedStroke').removeClass('selectedStroke');
$('.bcPaint-palette-stroke[data-stroke="'+stroke+'"]').addClass('selectedStroke');

paintContext.lineWidth = stroke;
},
/**
* enable eraser
**/
setEraser : function(){
$('.selectedColor').removeClass('selectedColor');
$('#bcPaint-eraser').addClass('selectedColor');
isEraser=!isEraser
},

/**
Expand Down Expand Up @@ -242,11 +288,13 @@ $(document).ready(function(){
// default color set
colors : [
'000000', '444444', '999999', 'DDDDDD', '#e83e8c', '#dc3545',
'#fd7e14', '#ffc107', '#28a745', '#20c997', '#6f42c1', '#007bff'
'#fd7e14', '#ffc107', '#28a745', '#20c997', '#6f42c1', '#007bff','#FFFFFF'
],

// extend default set
addColors : [],
strokes : [ 1, 2, 4, 8, 16, 24],
defaultStroke : 2,
};

})(jQuery);