ready to ship

palasthotel · Oct 22, 2020 · 2542f66 · 2542f66
1 parent 4f0c090
commit 2542f66
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 42 deletions.
diff --git a/js/dist/grid-editor.js b/js/dist/grid-editor.js
diff --git a/js/dist/grid-editor.map b/js/dist/grid-editor.map
diff --git a/js/grid_htmlbox_ckeditor_config.js.php b/js/grid_htmlbox_ckeditor_config.js.php
@@ -7,7 +7,8 @@
 */
 header('Content-Type: application/javascript');
 ?>
-/*
+if(typeof CKEDITOR !== typeof undefined){
+  /*
  CKEDITOR.stylesSet.add( 'grid_styles',
  [
  // Block-level styles
@@ -19,53 +20,53 @@
  { name : 'Marker: Yellow', element : 'span', styles : { 'background-color' : 'Yellow' } }
  ]);
  */
-CKEDITOR.stylesSet.add( 'grid_styles',
+  CKEDITOR.stylesSet.add( 'grid_styles',
     [
-        // Block-level styles
-        <?php
-        $tmp=array();
-        foreach($styles as $style)
-        {
-            $tmp[]=json_encode($style);
-        }
-        echo implode(",", $tmp);
-        ?>
-        //{ name : 'Fett', element : 'h2', attributes : { 'class' : 'emm-headline-bold' } },
-        //{ name : 'Mittel' , element : 'p', attributes : { 'class' : 'emm-medium' } }
+      // Block-level styles
+      <?php
+      $tmp=array();
+      foreach($styles as $style)
+      {
+        $tmp[]=json_encode($style);
+      }
+      echo implode(",", $tmp);
+      ?>
+      //{ name : 'Fett', element : 'h2', attributes : { 'class' : 'emm-headline-bold' } },
+      //{ name : 'Mittel' , element : 'p', attributes : { 'class' : 'emm-medium' } }
     ]);
-<?php
-$items=array();
-if(count($styles)>0)
-{
+  <?php
+  $items=array();
+  if(count($styles)>0)
+  {
     $items[]="Styles";
-}
-if(count($formats)>0)
-{
+  }
+  if(count($formats)>0)
+  {
     $items[]="Format";
-}
-if(!in_array("p",$formats))
-{
+  }
+  if(!in_array("p",$formats))
+  {
     $formats[]="p";
-}
+  }
 
-/**
- * add external ckeditor plugins
- */
-foreach($ckeditor_plugins as $slug => $path){
+  /**
+   * add external ckeditor plugins
+   */
+  foreach($ckeditor_plugins as $slug => $path){
     echo "CKEDITOR.plugins.addExternal('$slug', '$path');";
-}
-?>
+  }
+  ?>
 
-CKEDITOR.editorConfig = function( config ) {
+  CKEDITOR.editorConfig = function( config ) {
     config.language = 'de';
     config.toolbar = [
-        { name: 'basicstyles', items: [ 'Bold', 'Italic', 'Underline', 'Strike'] },
-        { name: 'links', items: ['Link', 'Unlink', 'Anchor']},
-        { name: "format", items: <?=json_encode($items)?>},
+      { name: 'basicstyles', items: [ 'Bold', 'Italic', 'Underline', 'Strike'] },
+      { name: 'links', items: ['Link', 'Unlink', 'Anchor']},
+      { name: "format", items: <?=json_encode($items)?>},
 
-        { name: 'blockstyles', items: [  'NumberedList','BulletedList', 'Blockquote' ] },
-        { name: 'clipboard', items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
-        { name: 'document', items: [ 'Source' ] }
+      { name: 'blockstyles', items: [  'NumberedList','BulletedList', 'Blockquote' ] },
+      { name: 'clipboard', items: [ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+      { name: 'document', items: [ 'Source' ] }
     ];
 
     config.allowedContent = true;
@@ -80,9 +81,11 @@
      *load external plugins for ckeditor
      */
     foreach($ckeditor_plugins as $slug => $path){
-        echo "config.extraPlugins = '$slug';";
+      echo "config.extraPlugins = '$slug';";
     }
     ?>
 
-};
+  };
 
+
+}
diff --git a/src/grid-editor/frameworks/GridICanHaz.js b/src/grid-editor/frameworks/GridICanHaz.js
@@ -1,5 +1,5 @@
 // Changed line 521
-//  if (script && script.innerHTML && script.id && (script.type === "text/html" || script.type === "text/x-icanhaz")) 
+//  if (script && script.innerHTML && script.id && (script.type === "text/html" || script.type === "text/x-icanhaz"))
 //  To
 //  if (script && script.innerHTML && script.id && ( script.type === "text/grid-icanhaz")) {
 //  Because of Wordpress issues
@@ -554,5 +554,7 @@ var Mustache = function () {
         }
     }
 
+    window.ich = ich;
+
 })();
 })();