Ver Fonte

add type=simple

visuddhinanda há 2 anos atrás
pai
commit
32fd483e1a
2 ficheiros alterados com 66 adições e 21 exclusões
  1. 9 4
      app/Http/Api/MdRender.php
  2. 57 17
      app/Http/Api/TemplateRender.php

+ 9 - 4
app/Http/Api/MdRender.php

@@ -302,6 +302,7 @@ class MdRender{
                 }
                 break;
             case 'text':
+            case 'simple':
                 if(isset($tplProps)){
                     if(is_array($tplProps)){
                         return '';
@@ -554,6 +555,7 @@ class MdRender{
                 $output = preg_replace($pattern,$replacement,$html);
                 break;
             case 'text':
+            case 'simple':
                 $html = strip_tags($html);
                 $output = htmlspecialchars_decode($html,ENT_QUOTES);
                 //$output = html_entity_decode($html);
@@ -588,10 +590,13 @@ class MdRender{
             $GLOBALS["MdRenderStack"] = 1;
         }
         if($GLOBALS["MdRenderStack"]<3){
-            $mdRender = new MdRender(['mode'=>$mode,
-                                    'channelType'=>$channelType,
-                                    'contentType'=>$contentType,
-                                    'format'=>$format]);
+            $mdRender = new MdRender(
+                            [
+                                'mode'=>$mode,
+                                'channelType'=>$channelType,
+                                'contentType'=>$contentType,
+                                'format'=>$format
+                            ]);
 
             $output  = $mdRender->convert($markdown,$channelId,$queryId);
         }else{

+ 57 - 17
app/Http/Api/TemplateRender.php

@@ -250,6 +250,20 @@ class TemplateRender{
                     $output = $props["word"];
                 }
                 break;
+            case 'simple':
+                if(isset($props["meaning"])){
+                    $output = $props["meaning"];
+                }else{
+                    $output = $props["word"];
+                }
+                break;
+            default:
+                if(isset($props["meaning"])){
+                    $output = $props["meaning"];
+                }else{
+                    $output = $props["word"];
+                }
+                break;
         }
         return $output;
     }
@@ -322,6 +336,12 @@ class TemplateRender{
             case 'tex':
                 $output = $trigger;
                 break;
+            case 'simple':
+                $output = '';
+                break;
+            default:
+                $output = '';
+                break;
         }
         return $output;
     }
@@ -354,6 +374,9 @@ class TemplateRender{
             case 'tex':
                 $output = $pali.'၊'.$meaning;
                 break;
+            case 'simple':
+                $output = $pali.'၊'.$meaning;
+                break;
             default:
                 $output = $pali.'၊'.$meaning;
                 break;
@@ -390,6 +413,9 @@ class TemplateRender{
             case 'tex':
                 $output = $title;
                 break;
+            case 'simple':
+                $output = $title;
+                break;
             default:
                 $output = '';
                 break;
@@ -434,6 +460,9 @@ class TemplateRender{
             case 'tex':
                 $output = $title;
                 break;
+            case 'simple':
+                $output = $title;
+                break;
             default:
                 $output = '';
                 break;
@@ -489,8 +518,11 @@ class TemplateRender{
                 case 'tex':
                     $output = $props["innerString"];
                     break;
+                case 'simple':
+                    $output = $props["innerString"];
+                    break;
                 default:
-                    $output = '';
+                    $output = $props["innerString"];
                     break;
             }
             return $output;
@@ -539,14 +571,7 @@ class TemplateRender{
                 $output = '';
                 if(isset($props['translation']) && is_array($props['translation'])){
                     foreach ($props['translation'] as $key => $value) {
-                        $output .= MdRender::render($value['content'],
-                                    [$value['channel']['id']],
-                                    null,
-                                    'read',
-                                    $value['channel']['type'],
-                                    'translation',
-                                    'text'
-                                    );
+                        $output .= $value['html'];
                     }
                 }
                 break;
@@ -554,14 +579,26 @@ class TemplateRender{
                 $output = '';
                 if(isset($props['translation']) && is_array($props['translation'])){
                     foreach ($props['translation'] as $key => $value) {
-                        $output .= MdRender::render($value['content'],
-                                    [$value['channel']['id']],
-                                    null,
-                                    'read',
-                                    $value['channel']['type'],
-                                    'translation',
-                                    'tex'
-                                    );
+                        $output .= $value['html'];
+                    }
+                }
+                break;
+            case 'simple':
+                $output = '';
+                if(isset($props['translation']) &&
+                   is_array($props['translation']) &&
+                   count($props['translation']) > 0
+                   ){
+                    $sentences = $props['translation'];
+                }else if(isset($props['origin']) &&
+                         is_array($props['origin']) &&
+                         count($props['origin']) > 0
+                         ){
+                    $sentences = $props['origin'];
+                }
+                if(isset($sentences)){
+                    foreach ($sentences as $key => $value) {
+                        $output .= $value['html'];
                     }
                 }
                 break;
@@ -598,6 +635,9 @@ class TemplateRender{
             case 'tex':
                 $output = 'mermaid';
                 break;
+            case 'simple':
+                $output = 'mermaid';
+                break;
             default:
                 $output = 'mermaid';
                 break;