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.

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

small update #41

Merged
merged 6 commits into from
Dec 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
674 changes: 674 additions & 0 deletions LICENSE.txt

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,21 @@ miniPaint operates directly in the browser. You can create images, paste from cl
- Print support.

### License
GPL

Copyright (C) 2013-2016 ViliusL

miniPaint is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.

miniPaint is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with miniPaint. If not, see <http:https://www.gnu.org/licenses/>.

## Support

Expand Down
2 changes: 1 addition & 1 deletion config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var canvas_grid = document.getElementById("canvas_grid").getContext("2d"); //gr
var canvas_preview = document.getElementById("canvas_preview").getContext("2d"); //mini preview

//global settings
var VERSION = '3.2.1';
var VERSION = '3.2.2';
var WIDTH; //canvas midth
var HEIGHT; //canvas height
var COLOR = '#0000ff'; //active color
Expand Down
1 change: 1 addition & 0 deletions js/effects.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ function EFFECTS_CLASS() {
{title: 'JPG Compression', name: 'effects_jpg_vintage' },
{title: 'Mosaic', name: 'effects_Mosaic' },
{title: 'Oil', name: 'effects_Oil' },
{title: 'Perspective', name: 'effects_perspective' },
{title: 'Sepia', name: 'effects_Sepia' },
{title: 'Sharpen', name: 'effects_Sharpen' },
{title: 'Solarize', name: 'effects_Solarize' },
Expand Down
6 changes: 3 additions & 3 deletions js/events.js
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,6 @@ function CLIPBOARD_CLASS(canvas_id, autoresize) {
}
var ctrl_pressed = false;
var command_pressed = false;
var reading_dom = false;
var text_top = 15;
var pasteCatcher;
var paste_mode;

Expand Down Expand Up @@ -729,9 +727,11 @@ function CLIPBOARD_CLASS(canvas_id, autoresize) {
}();
//default paste action
this.paste_auto = function (e) {
if (POP.active == true || e.target.type == 'text')
return true;

paste_mode = '';
pasteCatcher.innerHTML = '';
var plain_text_used = false;
if (e.clipboardData) {
var items = e.clipboardData.items;
if (items) {
Expand Down
3 changes: 2 additions & 1 deletion js/gui.js
Original file line number Diff line number Diff line change
Expand Up @@ -559,8 +559,9 @@ function GUI_CLASS() {
COLOR = object.value;
this.sync_colors();
}
else if (object.value.length > 7)
else if (object.value.length > 7) {
object.value = COLOR;
}
};

this.set_color_rgb = function (object, c) {
Expand Down