From a0406188d8935e34b7721637a4827202f42a4083 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 20 Mar 2023 16:00:40 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=ED=8E=B8?=
 =?UTF-8?q?=EC=A7=91=EA=B8=B0=20=EC=88=98=EC=A0=95(=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=ED=99=95=EB=8C=80=20=EB=8B=A8=EC=B6=95=ED=82=A4=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95,=20=ED=88=B4=20?=
 =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../paintweb/interfaces/default/layout.xhtml  | 29 +++++++++----------
 .../resources/3rd-party/paintweb/paintweb.js  |  4 +--
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
index cba7738b..8c485fbd 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
+++ b/src/main/webapp/resources/3rd-party/paintweb/interfaces/default/layout.xhtml
@@ -29,6 +29,7 @@
 
         <li data-pwTool="selection">Selection</li>
         <!--<li data-pwTool="hand">Hand</li>-->
+        <li data-pwTool="rectangle">Rectangle</li>
 
         <li class="paintweb_toolSeparator">&#160;</li>
 
@@ -36,20 +37,28 @@
         <li data-pwCommand="selectionCopy">Copy selection</li>
         <li data-pwCommand="clipboardPaste">Clipboard paste</li>
         <!--<li data-pwTool="insertimg">Insert image</li>-->
-        <li data-pwCommand="imageRotate">Rotate image</li>
+        <li class="paintweb_strokeFillStyles">
+          <p class="paintweb_opt_fillStyle">Fill
+            <span data-pwColorInput="fillStyle">&#160;</span>
+          </p>
+          <p class="paintweb_opt_strokeStyle">Stroke
+            <span data-pwColorInput="strokeStyle">&#160;</span>
+          </p>
+        </li>
 
         <li class="paintweb_toolSeparator">&#160;</li>
 
+        <li data-pwCommand="imageRotate">Rotate image</li>
+        <li class="paintweb_buttonStyle" data-pwCommand="imageBright">brighten image</li>
+        <li class="paintweb_buttonStyle" data-pwCommand="imageDark">darken image</li>
+
         <!-- All elements with data-pwTool will have a class name like 
         .paintweb_tool_toolID and a generic class name .paintweb_tool. In this 
         case the class names will be .paintweb_tool_insertimg and 
         .paintweb_tool.  -->
         <!--<li data-pwTool="text">Text</li>-->
-        <li data-pwTool="rectangle">Rectangle</li>
 
         <li class="paintweb_toolSeparator">&#160;</li>
-        <li class="paintweb_toolSeparator">&#160;</li>
-
 
         <!--<li data-pwTool="cpicker">Color picker</li>
         <li data-pwTool="cbucket">Color bucket</li>-->
@@ -64,18 +73,6 @@
         <li data-pwCommand="imageClear">Clear image</li>
         <li data-pwCommand="imageSave">Save image</li>
 
-        <li class="paintweb_strokeFillStyles">
-          <p class="paintweb_opt_fillStyle">Fill
-            <span data-pwColorInput="fillStyle">&#160;</span>
-          </p>
-          <p class="paintweb_opt_strokeStyle">Stroke
-            <span data-pwColorInput="strokeStyle">&#160;</span>
-          </p>
-        </li>
-
-        <li class="paintweb_buttonStyle" data-pwCommand="imageBright">brighten image</li>
-        <li class="paintweb_buttonStyle" data-pwCommand="imageDark">darken image</li>
-
       </ul>
 
 
diff --git a/src/main/webapp/resources/3rd-party/paintweb/paintweb.js b/src/main/webapp/resources/3rd-party/paintweb/paintweb.js
index ca430f2e..bf46b7e2 100644
--- a/src/main/webapp/resources/3rd-party/paintweb/paintweb.js
+++ b/src/main/webapp/resources/3rd-party/paintweb/paintweb.js
@@ -1683,9 +1683,9 @@ function PaintWeb (win, doc) {
     if (!level) {
       return false;
     } else if (level === '+') {
-      level = image.zoom + config.imageZoomStep;
+      level = Number(image.zoom) + config.imageZoomStep;
     } else if (level === '-') {
-      level = image.zoom - config.imageZoomStep;
+      level = Number(image.zoom) - config.imageZoomStep;
     } else if (typeof level !== 'number') {
       return false;
     }