Merge pull request #41 from viliusle/master

small update

README.md

@@ -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 <https://www.gnu.org/licenses/>.
 
 ## Support
 

config.js

@@ -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

js/effects.js

@@ -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' },

js/events.js

@@ -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;
 
@@ -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) {

js/gui.js

@@ -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) {