untested attempt on fixing #169

This hasn't been tested and might not fully work yet. But it should show
what needs to be adjusted.

Author: annda

action/prosemirror.php

@@ -3,6 +3,7 @@
 use dokuwiki\Extension\ActionPlugin;
 use dokuwiki\Extension\EventHandler;
 use dokuwiki\Extension\Event;
+use dokuwiki\plugin\gallery\classes\Options;
 use dokuwiki\plugin\gallery\GalleryNode;
 use dokuwiki\plugin\prosemirror\parser\RootNode;
 use dokuwiki\plugin\prosemirror\schema\Node;
@@ -42,18 +43,33 @@ public function writeDefaultsToJSINFO(Event $event, $param)
     {
         global $JSINFO;
 
-        /** @var syntax_plugin_gallery $syntax */
-        $syntax = plugin_load('syntax', 'gallery');
-        $defaults = $syntax->getDataFromParams($syntax->getConf('options'));
-        $attributes = $this->cleanAttributes($defaults);
+        $options = new Options();
+        $defaults = [
+            'thumbnailsize' => $options->thumbnailWidth . 'x' . $options->thumbnailHeight,
+            'imagesize' => $options->lightboxWidth . 'X' . $options->lightboxHeight,
+            'cache' => $options->cache,
+            'filter' => $options->filter,
+            'showname' => $options->showname,
+            'showtitle' => $options->showtitle,
+            'crop' => $options->crop,
+            'direct' => $options->direct,
+            'reverse' => $options->reverse,
+            'recursive' => $options->recursive,
+            'align' => $options->align,
+            'cols' => $options->columns,
+            'limit' => $options->limit,
+            'offset' => $options->offset,
+            'paginate' => $options->paginate,
+            'sort' => $options->sort,
+        ];
 
         if (!isset($JSINFO['plugins'])) {
             $JSINFO['plugins'] = [];
         }
         $JSINFO['plugins']['gallery'] = [
             'defaults' => array_map(function ($default) {
                 return ['default' => $default,];
-            }, $attributes),
+            }, $defaults),
         ];
         $JSINFO['plugins']['gallery']['defaults']['namespace'] = ['default' => ''];
     }
@@ -82,7 +98,6 @@ public function renderFromInstructions(Event $event, $param)
         // FIXME we may have to parse the namespace from the original syntax ?
         $data = $event->data['data'];
         $ns = $data['ns'];
-        $data = $this->cleanAttributes($data);
 
         if (cleanID($ns) === $ns) {
             $ns = ':' . $ns;
@@ -94,37 +109,6 @@ public function renderFromInstructions(Event $event, $param)
         $event->data['renderer']->nodestack->add($node);
     }
 
-    /**
-     * Slightly rewrite the attributes to the format expected by our schema
-     *
-     * @param $data
-     *
-     * @return mixed
-     */
-    public function cleanAttributes($data)
-    {
-        $data['thumbnailsize'] = $data['tw'] . 'x' . $data['th'];
-        $data['imagesize'] = $data['iw'] . 'X' . $data['ih'];
-        if ($data['random']) {
-            $data['sort'] = 'random';
-        } else {
-            $data['sort'] .= 'sort';
-        }
-
-        if ($data['align'] === 1) {
-            $data['align'] = 'right';
-        } elseif ($data['align'] === 2) {
-            $data['align'] = 'left';
-        } else {
-            $data['align'] = 'center';
-        }
-
-        unset($data['tw'], $data['th'], $data['iw'], $data['ih'], $data['random']);
-        unset($data['ns'], $data['galid']);
-
-        return $data;
-    }
-
     /**
      * Render our syntax instructions for prosemirror
      *