From c77b79f0d259faeb605d40036cfadf879921732c Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Thu, 30 Aug 2018 02:41:58 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=80=EA=BC=B4=20=ED=81=AC=EA=B8=B0=20?=
 =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=84=B0=EB=A7=88=EC=9D=B4=EC=A7=95=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 e_lib/trumbowyg/trumbowyg.fontsize.css | 28 +++++++-------
 e_lib/trumbowyg/trumbowyg.fontsize.js  | 52 ++++++++++++++------------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/e_lib/trumbowyg/trumbowyg.fontsize.css b/e_lib/trumbowyg/trumbowyg.fontsize.css
index cbd6631c..e2eefb02 100644
--- a/e_lib/trumbowyg/trumbowyg.fontsize.css
+++ b/e_lib/trumbowyg/trumbowyg.fontsize.css
@@ -1,27 +1,27 @@
-.trumbowyg-fontsize_24pt-dropdown-button{
-    min-height:25pt;
+.trumbowyg-fontsize_24px-dropdown-button{
+    min-height:25px;
 }
 
-.trumbowyg-fontsize_28pt-dropdown-button{
-    min-height:29pt;
+.trumbowyg-fontsize_28px-dropdown-button{
+    min-height:29px;
 }
 
-.trumbowyg-fontsize_32pt-dropdown-button{
-    min-height:33pt;
+.trumbowyg-fontsize_32px-dropdown-button{
+    min-height:33px;
 }
 
-.trumbowyg-fontsize_40pt-dropdown-button{
-    min-height:41pt;
+.trumbowyg-fontsize_40px-dropdown-button{
+    min-height:41px;
 }
 
-.trumbowyg-fontsize_46pt-dropdown-button{
-    min-height:47pt;
+.trumbowyg-fontsize_46px-dropdown-button{
+    min-height:47px;
 }
 
-.trumbowyg-fontsize_52pt-dropdown-button{
-    min-height:53pt;
+.trumbowyg-fontsize_52px-dropdown-button{
+    min-height:53px;
 }
 
-.trumbowyg-fontsize_60pt-dropdown-button{
-    min-height:61pt;
+.trumbowyg-fontsize_60px-dropdown-button{
+    min-height:61px;
 }
\ No newline at end of file
diff --git a/e_lib/trumbowyg/trumbowyg.fontsize.js b/e_lib/trumbowyg/trumbowyg.fontsize.js
index 19231cf2..5d4d26db 100644
--- a/e_lib/trumbowyg/trumbowyg.fontsize.js
+++ b/e_lib/trumbowyg/trumbowyg.fontsize.js
@@ -7,11 +7,6 @@
             en: {
                 fontsize: 'Font size',
                 fontsizes: {
-                    'x-small': 'Extra small',
-                    'small': 'Small',
-                    'medium': 'Regular',
-                    'large': 'Large',
-                    'x-large': 'Extra large',
                     'custom': 'Custom'
                 }
             },
@@ -41,30 +36,41 @@
     function buildDropdown(trumbowyg) {
         var dropdown = [];
         var sizes = [
-            '8pt',
-            '9pt',
-            '10pt',
-            '11pt',
-            '12pt',
-            '14pt',
-            '16pt',
-            '18pt',
-            '20pt',
-            '24pt',
-            '28pt',
-            '32pt',
-            '40pt',
-            '46pt',
-            '52pt',
-            '60pt'
+            '8px',
+            '9px',
+            '10px',
+            '11px',
+            '12px',
+            '14px',
+            '16px',
+            '18px',
+            '20px',
+            '24px',
+            '28px',
+            '32px',
+            '40px',
+            '46px',
+            '52px',
+            '60px'
         ];
 
         $.each(sizes, function (index, size) {
             trumbowyg.addBtnDef('fontsize_' + size, {
-                text: '<span style="font-size: ' + size + ';line-height: ' + size + '">' + size + '</span>',
+                text: '<span style="font-size: ' + size + ';">' + size + '</span>',
                 hasIcon: false,
                 fn: function () {
-                    trumbowyg.execCmd('fontSize', index + 1, true);
+                    trumbowyg.saveRange();
+                    var text = trumbowyg.range.startContainer.parentElement;
+                    var selectedText = trumbowyg.getRangeText();
+                    if ($(text).html() === selectedText) {
+                        $(text).css('font-size', size);
+                    } else {
+                        trumbowyg.range.deleteContents();
+                        var html = '<span style="font-size: ' + size + ';">' + selectedText + '</span>';
+                        var node = $(html)[0];
+                        trumbowyg.range.insertNode(node);
+                    }
+                    trumbowyg.saveRange();
                 }
             });
             dropdown.push('fontsize_' + size);