From 3892d6be5ea1c0804840922c0344cfce1d7dd4d6 Mon Sep 17 00:00:00 2001
From: tianya <tianya@benshar.com>
Date: Wed, 12 May 2021 21:36:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=A9=E8=BF=9B=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/dede/sys_safetest.php                     |   2 +-
 src/include/inc/inc_fun_funAdmin.php          |   2 +-
 src/static/ckeditor/config.js                 |   4 +-
 .../textindent/icons/hidpi/textindent.png     | Bin 0 -> 917 bytes
 .../plugins/textindent/icons/textindent.png   | Bin 0 -> 600 bytes
 .../ckeditor/plugins/textindent/plugin.js     |  95 ++++++++++++++++++
 6 files changed, 99 insertions(+), 4 deletions(-)
 create mode 100644 src/static/ckeditor/plugins/textindent/icons/hidpi/textindent.png
 create mode 100644 src/static/ckeditor/plugins/textindent/icons/textindent.png
 create mode 100644 src/static/ckeditor/plugins/textindent/plugin.js

diff --git a/src/dede/sys_safetest.php b/src/dede/sys_safetest.php
index da0918bd..379ad6b7 100755
--- a/src/dede/sys_safetest.php
+++ b/src/dede/sys_safetest.php
@@ -28,7 +28,7 @@ foreach ($filelist as $key => $ff) {
 $alter = "";
 
 if (count($offFiles) == 0) {
-    $alter = 'EOT
+    $alter = '
     <div class="alert alert-danger maintable mb-2" style="margin:0 auto;" role="alert">
     无法同官方网站文件服务器通信，校验时候无法保证本地文件是否同官方服务器文件是否一致。
     </div>';
diff --git a/src/include/inc/inc_fun_funAdmin.php b/src/include/inc/inc_fun_funAdmin.php
index f4c4f925..db7be63b 100755
--- a/src/include/inc/inc_fun_funAdmin.php
+++ b/src/include/inc/inc_fun_funAdmin.php
@@ -173,7 +173,7 @@ function SpGetEditor($fname, $fvalue, $nheight = "350", $etype = "Basic", $gtype
     } else if ($GLOBALS['cfg_html_editor'] == 'ckeditor') {
         $addConfig = "";
         if (defined("DEDEADMIN")) {
-            $addConfig = ",{allowedContent:true,filebrowserImageUploadUrl:'./dialog/select_images_post.php',filebrowserUploadUrl:'./dialog/select_media_post.php?ck=1',extraPlugins:'html5video,dedepagebreak,ddfilebrowser'}";
+            $addConfig = ",{allowedContent:true,filebrowserImageUploadUrl:'./dialog/select_images_post.php',filebrowserUploadUrl:'./dialog/select_media_post.php?ck=1',extraPlugins:'html5video,dedepagebreak,ddfilebrowser,textindent'}";
             // $addConfig = ",{filebrowserImageUploadUrl:'./dialog/select_images_post.php'}";
         }
         $code = <<<EOT
diff --git a/src/static/ckeditor/config.js b/src/static/ckeditor/config.js
index 722b21e6..400d3571 100644
--- a/src/static/ckeditor/config.js
+++ b/src/static/ckeditor/config.js
@@ -11,7 +11,7 @@ CKEDITOR.editorConfig = function (config) {
 		{ name: 'forms', groups: ['forms'] },
 		'/',
 		{ name: 'basicstyles', groups: ['basicstyles', 'cleanup'] },
-		{ name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align', 'bidi', 'paragraph'] },
+		{ name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align', 'bidi', 'paragraph','textindent'] },
 		{ name: 'links', groups: ['links'] },
 		{ name: 'insert', groups: ['insert'] },
 		'/',
@@ -20,7 +20,7 @@ CKEDITOR.editorConfig = function (config) {
 		{ name: 'tools', groups: ['tools'] }
 	];
 
-	config.extraPlugins = 'html5video,dedepagebreak';
+	config.extraPlugins = 'html5video,dedepagebreak,textindent';
 
 	config.removeButtons = 'About,ShowBlocks,Iframe,Flash,Form,Checkbox,Radio,TextField,Textarea,Select,Button,ImageButton,HiddenField';
 
diff --git a/src/static/ckeditor/plugins/textindent/icons/hidpi/textindent.png b/src/static/ckeditor/plugins/textindent/icons/hidpi/textindent.png
new file mode 100644
index 0000000000000000000000000000000000000000..021238af45c267ada0c96779f4e7c6cc795e1e58
GIT binary patch
literal 917
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UEa{HEjtmSN`?>!lvVtU&J%W50
z7^>757#dm_7=8hT8eT9klo~KFyh>nTu$sZZAYL$MSD+10f+@+{-G$+Qd;gjJKpuOE
zr>`sfBPMAfab43o8!e#xTu&Fr5Rc<)r&?!(1PZk6-}(JbUYVh{+$O_FRYgUytfgj6
z)0%oW*#)_%u5b})F6(O2xY5EPCKfhLEJ{1#riP13lulCW<K`a>rJrx4$ls|xf5T<-
z$9uEy9;#neeC|wr+CR&~jixVB8~7~s{^l%o^5*yu{$`0x%9ix+OQ(CL#{7DbzVe~T
zIhFUfL|5rOpZk5w=Qr7(zkL>bVpJ-dcxUe6*ymLfO-~DdVzHlFZTiE*b*JJM21%=>
zYpPadPp|&nRbIqz-}lgexf-8-%AE!Yt?bQ_!S>3_43|3Wo4zM1_5S*K-{Vap<-b-j
z_uq)|%J!ev#C%(=*#6x+)+IehlOpBoEw^zq*?!-3I{3H4nGLt|C$(u5haEmE{WVNO
z&g)*DT;0CsHyWca=LUUU{JHLcrPdw=O|BEK{)#c`crSawzEZpWx$(NI8f>bjCZE@=
z2)d;6A>5%|)*?qq_|Eg-MOH!Yix(f|HhJ9<?qU<WxFNM|{Su9nb-EMN7JS^mDC)q%
zx={Dja}(*4MYpF2DtR-+$R2TAnAslXpwX;Zc4_9WiVVBtEtM4sXZA;%29^q6y%^P}
zb#|HK<hzQ~?L$3FntCrX_?<}ZDZ8~JUu?E(w8({NZr|e1Fvz{-Fy$1ylcpZKvb%NX
zmdEawyQ9pbcmMnm{gv6AvvY^ezFRIk1MW|{@WPB^UReFE^SPp(8jjMo$)YPBc7-0~
zweFp)etheZMP0}2SQ`D_s%6}IE++6%sQlv8SsG`S&Yi){@=s-XXNkv=t{+*xOCLP-
z^%1|aN>tqCO4ZE&u}x2HYM<<w6>;T9Vcg6w3PH`+40tO_S~!{1Zn~Dga!Rb5%g?&?
zT-&X$>YGn*781JHwfxpI`K9iU?L|TtbDtDHw}~_R!VW?4_skDEwEnQ!t8*H=OSD`D
zrd`z%*NBpo#FA92<f2p{#b9J$XrXIhq-$gzVrXGyWNc+(s%v0sWnggkrKmcJhTQy=
Z%(P0}8rE!CI~%Bh!PC{xWt~$(69B>yelh?6

literal 0
HcmV?d00001

diff --git a/src/static/ckeditor/plugins/textindent/icons/textindent.png b/src/static/ckeditor/plugins/textindent/icons/textindent.png
new file mode 100644
index 0000000000000000000000000000000000000000..8c39510b5a7c36dd22c2d3ef0b595e435685d220
GIT binary patch
literal 600
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{Xiaj
ziKnkC`y(c4AyHPNzu$niF(!DrIEHAPZ|$?q7D*IoonQQXZeg-nO8GVaFb>X4o{!3|
zEUbb$IxZaFw6^_Y@|NDXNl<a`ey1%Pe5C_bV!H%fV-NPuo_l2Gp6g1+PB}KqcNLto
z^=~TL{e11qdo|C0_i(-KR5tsQWpldw;=8{&l@DU~7WPFH`>XiuUv=-tyX&pq*UQ2s
z5*aKmHicEK)H-)``}t+p%;Ic$_=U;~ZrRwzEtO+6H!XSHruzFwW#Df^riRG>&KsK#
zDYGuR$KU>b*|b~FZ)V?9e|d6kPWs`7)U=t`n=H?1{r3u(P<XK8XRrMBy^Jg(dpG$o
zsLl>aIcfO%h!>NW-;eCQbIx40+Mu!Ly8M|{F71C;gjHtO#<U*ZtonU|f4pDab;ka*
z#cwWu?)txS-j0kTe}0{}?veH=k73_bb&;_|V9~5+`?f!R+_^T4L1Tt+-Ln6=$NoEU
zT{`zHVRu`Ow_W9~>efY^59|t8{n_-F-C}*4*N%I3S-{{|Epd$~Nl7e8wMs5Z1yT$~
z28I^821dF@<{^d_Rz`+a2Bx|Ord9?9v0<klplHa=PsvQH#H~SxyEq1@fx*+&&t;uc
GLK6Tys_%UO

literal 0
HcmV?d00001

diff --git a/src/static/ckeditor/plugins/textindent/plugin.js b/src/static/ckeditor/plugins/textindent/plugin.js
new file mode 100644
index 00000000..3f5dbc27
--- /dev/null
+++ b/src/static/ckeditor/plugins/textindent/plugin.js
@@ -0,0 +1,95 @@
+CKEDITOR.plugins.add( 'textindent', {
+    icons: 'textindent',
+	init: function( editor ) {
+
+        var indentation = editor.config.indentation;
+        var indentationKey = editor.config.indentationKey;
+
+        if(typeof(indentation) == 'undefined')
+            indentation = '2em';
+        if(typeof(indentationKey) == 'undefined')
+            indentationKey = 'tab';
+
+        editor.ui.addButton( 'textindent', {
+            label: '缩进',
+            command: 'ident-paragraph',
+            toolbar: "textindent"
+        });
+
+        if( indentationKey !== false){
+
+            editor.on('key', function(ev) {
+                if(ev.data.domEvent.$.key.toLowerCase() === indentationKey.toLowerCase().trim() || ev.data.keyCode === indentationKey){
+                    editor.execCommand('ident-paragraph');
+                    ev.cancel();  
+                }
+            });
+        }
+        
+        editor.on( 'selectionChange', function()
+            {
+                var style_textindente = new CKEDITOR.style({
+                        element: 'p',
+                        styles: { 'text-indent': indentation },
+                        overrides: [{
+                            element: 'text-indent', attributes: { 'size': '0'}
+                        }]
+                    });
+
+                if( style_textindente.checkActive(editor.elementPath(), editor) )
+                   editor.getCommand('ident-paragraph').setState(CKEDITOR.TRISTATE_ON);
+                else
+                   editor.getCommand('ident-paragraph').setState(CKEDITOR.TRISTATE_OFF);
+                
+        });
+
+        editor.addCommand("ident-paragraph", {
+            allowedContent: 'p{text-indent}',
+            requiredContent: 'p',
+            exec: function(evt) {
+
+                var range = editor.getSelection().getRanges()[0]; 
+
+                var walker = new CKEDITOR.dom.walker( range ),
+                node;
+
+                var state = editor.getCommand('ident-paragraph').state;
+
+                while ( ( node = walker.next() ) ) {
+                    if ( node.type == CKEDITOR.NODE_ELEMENT ) {
+                        if(node.getName() === "p"){
+                                editor.fire('saveSnapshot');
+                                if( state == CKEDITOR.TRISTATE_ON){
+                                    node.removeStyle("text-indent");
+                                    editor.getCommand('ident-paragraph').setState(CKEDITOR.TRISTATE_OFF);
+                                }
+                                else{
+                                    node.setStyle( "text-indent", indentation );
+                                    editor.getCommand('ident-paragraph').setState(CKEDITOR.TRISTATE_ON);
+                                }
+                        }
+                    }
+                }
+
+                if(node === null){
+                    
+                    node = editor.getSelection().getStartElement().getAscendant('p', true);
+    
+                    editor.fire('saveSnapshot');
+
+                    if( state == CKEDITOR.TRISTATE_ON){
+                        node.removeStyle("text-indent");
+                        editor.getCommand('ident-paragraph').setState(CKEDITOR.TRISTATE_OFF);
+                    }
+                    else{
+                        node.setStyle( "text-indent", indentation );
+                        editor.getCommand('ident-paragraph').setState(CKEDITOR.TRISTATE_ON);
+                    }
+                }
+                
+
+            }
+        });
+	}
+
+});