check for defaultTool in hiddenTools

Author: ivictbor

CONTRIBUTORS.md

@@ -0,0 +1,11 @@
+
+
+Painterro contributors
+============================================
+
+* **[Jesfery](https://github.com/Jesfery)**
+
+  * defaultTool param
+  
+* **[Ivan Borshchov](https://github.com/ivictbor)**  
+  * maintainer

README.md

@@ -137,7 +137,8 @@ Painterro({
 |`backgroundFillColorAlpha`| Transparancy of `backgroundFillColor` from 0.0 to 1.0 | 1.0 |
 |`defaultFontSize` | Default font size in pixels | 24 |
 |`defaultSize` | default image size, should be string in format `<width>x<height>` in pixel, e.g. `'200x100'`. If value is `'fill'`(default) than all container size will be used | `'fill'` |
-|`hiddenTools` | List of tools that you wish to exclude from toolbar e.g. something from this list `['crop', 'line', 'rect', 'ellipse', 'brush', 'text', 'rotate', 'resize',  'save', 'open', 'close']` | [] |
+|`defaultTool` | Tool selected by default | 'select' | 
+|`hiddenTools` | List of tools that you wish to exclude from toolbar e.g. something from this list `['crop', 'line', 'rect', 'ellipse', 'brush', 'text', 'rotate', 'resize',  'save', 'open', 'close']`, You can't hide default tool | [] |
 |`initText` | Display some centered text before painting. If null, no text will be shown | null |
 |`initTextColor` | Color of init text | '#808080' |
 |`initTextStyle` | Style of init text | "26px 'Open Sans', sans-serif" |
@@ -345,6 +346,11 @@ Add/edit icons in `res` folder. Then run
 npm run buildfont
 ```
 
+Contributing
+------------
+Pull-requests are welcome. Please add yourself to CONTRIBUTORS.md
+
+
 ToDo list
 ---------
 

build/index.html

@@ -46,7 +46,8 @@
 
   Painterro({
     initText: 'Press Prn Scr, Ctrl+V to paste a screenshot',
-   // hiddenTools: ['crop']
+    // defaultTool: 'line',
+    //hiddenTools: ['line']
   }).show();
 </script>
 </body>

js/main.js

@@ -7,7 +7,7 @@ import WorkLog from './worklog';
 import { genId, addDocumentObjectHelpers, KEYS, trim, isMobileOrTablet, getScrollbarWidth } from './utils';
 import PrimitiveTool from './primitive';
 import ColorPicker from './colorPicker';
-import { setDefaults, setParam } from './params';
+import { setDefaults, setParam, logError } from './params';
 import { tr } from './translation';
 import ZoomHelper from './zoomHelper';
 import TextTool from './text';
@@ -491,15 +491,11 @@ class PainterroProc {
     this.currentBackground = this.colorWidgetState.bg.alphaColor;
     this.currentBackgroundAlpha = this.colorWidgetState.bg.alpha;
 
-    if (this.params.defaultTool) {
-      this.defaultTool = this.toolByName[this.params.defaultTool];
-    }
-    this.defaultTool = this.defaultTool || this.toolByName.select;
-
+    this.defaultTool = this.toolByName[this.params.defaultTool] || this.toolByName.select;
 
     this.tools.filter(t => this.params.hiddenTools.indexOf(t.name) === -1).forEach((b) => {
       this.getBtnEl(b).onclick = () => {
-        if (b === this.toolByName.select && this.activeTool === b) {
+        if (b === this.defaultTool && this.activeTool === b) {
           return;
         }
         const currentActive = this.activeTool;
@@ -596,7 +592,7 @@ class PainterroProc {
         this.saving = false;
       });
     } else {
-      console.error('No saveHandler defined, please check documentation');
+      logError('No saveHandler defined, please check documentation');
       if (icon) {
         icon.className = 'ptro-icon ptro-icon-save';
       }

js/params.js

@@ -1,6 +1,6 @@
 import { HexToRGBA } from './colorPicker';
 import Translation from './translation';
-import { trim } from './utils';
+import { trim, logError } from './utils';
 
 const STORAGE_KEY = 'painterro-data';
 
@@ -60,7 +60,15 @@ export function setDefaults(parameters) {
   params.backgroundFillAlphaColor = HexToRGBA(params.backgroundFillColor,
     params.backgroundFillColorAlpha);
 
+
+  params.defaultTool = params.defaultTool || 'select';
   params.hiddenTools = params.hiddenTools || [];
+  const defaultInHiddenIndex = params.hiddenTools.indexOf(params.defaultTool);
+  if (defaultInHiddenIndex > -1) {
+    logError(`Can't hide default tool '${params.defaultTool}', please change default tool to another to hide it`);
+    params.hiddenTools.splice(defaultInHiddenIndex, 1);
+  }
+
   params.pixelizePixelSize = settings.pixelizePixelSize || params.pixelizePixelSize || '20%';
 
   params.colorScheme = params.colorScheme || {};

js/utils.js

@@ -156,3 +156,7 @@ export function imgToDataURL(url, callback) {
   xhr.responseType = 'blob';
   xhr.send();
 }
+
+export function logError(error) {
+  console.error(`[Painterro] ${error}`);
+}