Merge pull request #186 from cosmocode/toggle-button

Toggle button

Author: splitbrain

action/editor.php

@@ -63,6 +63,13 @@ public function addDataAndToggleButton(Doku_Event $event, $param)
             return;
         }
 
+        /** @var Doku_Form|\dokuwiki\Form\Form $form */
+        $form = $event->data;
+
+        // return early if content is not editable
+        if ($this->isReadOnly($form)) return;
+
+
         $useWYSIWYG = get_doku_pref('plugin_prosemirror_useWYSIWYG', false);
 
         $prosemirrorJSON = '';
@@ -85,16 +92,13 @@ public function addDataAndToggleButton(Doku_Event $event, $param)
             }
         }
 
-        /** @var Doku_Form|\dokuwiki\Form\Form $form */
-        $form = $event->data;
-
-        if(is_a($form, \dokuwiki\Form\Form::class)) {
-            $form->addElement($this->buildToggleButton());
+        if (is_a($form, \dokuwiki\Form\Form::class)) {
+            $form->addElement($this->buildToggleButton(), 0);
             $form->setHiddenField('prosemirror_json',$prosemirrorJSON);
             $form->addHTML('<div class="prosemirror_wrapper" id="prosemirror__editor"></div>', 1);
         } else {
             // todo remove when old stable is no longer supported
-            $form->addElement($this->buildOldToggleButton());
+            $form->insertElement(0, $this->buildOldToggleButton());
             $form->addHidden('prosemirror_json',$prosemirrorJSON);
             $form->insertElement(1, '<div class="prosemirror_wrapper" id="prosemirror__editor"></div>');
         }
@@ -106,7 +110,7 @@ public function addDataAndToggleButton(Doku_Event $event, $param)
      * Creates it as hidden if forcing WYSIWYG
      *
      * @deprecated use buildToggleButton instead
-     * @return array the pseudo-tag expected by \Doku_Form::addElement
+     * @return array the pseudo-tag expected by \Doku_Form::insertElement
      */
     protected function buildOldToggleButton()
     {
@@ -322,6 +326,27 @@ public function addJSINFO()
         global $JSINFO;
         $JSINFO['SMILEY_CONF'] = getSmileys();
     }
+
+    /**
+     * Returns true if the current content is read only
+     *
+     * @todo remove Doku_Form case when the class is removed
+     *
+     * @param $form
+     * @return bool
+     */
+    protected function isReadOnly($form)
+    {
+        if (is_a($form, \dokuwiki\Form\Form::class)) {
+            $textareaPos = $form->findPositionByType('textarea');
+            $readonly = $textareaPos !== false && !empty($form->getElementAt($textareaPos)->attr('readonly'));
+        } else {
+            /** @var Doku_Form $form */
+            $textareaPos = $form->findElementByType('wikitext');
+            $readonly = $textareaPos !== false && !empty($form->getElementAt($textareaPos)['readonly']);
+        }
+        return $readonly;
+    }
 }
 
 // vim:ts=4:sw=4:et:

lang/de/lang.php

@@ -6,7 +6,7 @@
  */
 
 // custom language strings for the plugin
-$lang['switch_editors'] = 'Schalte WYSIWYG-Editor um';
+$lang['switch_editors'] = 'Syntax ⬌ Visueller Editor umschalten';
 
 $lang['link target'] = 'Linkziel';
 $lang['type:wiki page'] = 'Eine Seite in diesem Wiki';

lang/en/lang.php

@@ -6,7 +6,7 @@
  */
 
 // custom language strings for the plugin
-$lang['switch_editors'] = 'Toggle WYSIWYG editor';
+$lang['switch_editors'] = 'Toggle syntax ⬌ visual editor';
 
 $lang['link target'] = 'Link target';
 $lang['type:wiki page'] = 'A page in this wiki';

style.less

@@ -95,12 +95,8 @@
 
 .dokuwiki {
     .plugin_prosemirror_useWYSIWYG {
-        position: absolute;
-        top: 2.9em;
-        right: 2em;
-        padding: 3px 8px;
-        color: #444;
-        background-color: white;
+        display: flex;
+        margin-bottom: 0.75rem;
     }
 
     .footnote-tooltip {