Merge pull request #1548 from splitbrain/fix-broken-js-in-xhtml

Fix broken JS in xhtml
dokuwiki · Jan 30, 2017 · 9d2d084 · 9d2d084
2 parents e01e83d + 694afa0
commit 9d2d084
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 26 deletions.
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
@@ -147,7 +147,7 @@ function document_end() {
                     }
 
                     // add footnote markup and close this footnote
-                    $this->doc .= $footnote;
+                    $this->doc .= '<div class="content">'.$footnote.'</div>';
                     $this->doc .= '</div>'.DOKU_LF;
                 }
             }

diff --git a/lib/scripts/behaviour.js b/lib/scripts/behaviour.js
@@ -168,26 +168,28 @@ var dw_behaviour = {
      * disable multiple revisions checkboxes if two are checked
      *
      * @author Andreas Gohr <andi@splitbrain.org>
+     * @author Anika Henke <anika@selfthinker.org>
      */
-    revisionBoxHandler: function(){
-        var $checked = jQuery('#page__revisions input[type=checkbox]:checked');
-        var $all     = jQuery('#page__revisions input[type=checkbox]');
-
-        if($checked.length < 2){
-            $all.attr('disabled',false);
-            jQuery('#page__revisions button').attr('disabled',true);
-        }else{
-            $all.attr('disabled',true);
-            jQuery('#page__revisions button').attr('disabled',false);
-            for(var i=0; i<$checked.length; i++){
-                $checked[i].disabled = false;
-                if(i>1){
-                    $checked[i].checked = false;
+    revisionBoxHandler: function() {
+        var $revisions = jQuery('#page__revisions');
+        var $all       = jQuery('input[type=checkbox]', $revisions);
+        var $checked   = $all.filter(':checked');
+        var $button    = jQuery('button', $revisions);
+
+        if($checked.length < 2) {
+            $all.removeAttr('disabled');
+            $button.attr('disabled', true);
+        } else {
+            $all.attr('disabled', true);
+            $button.removeAttr('disabled');
+            $checked.each(function(i) {
+                jQuery(this).removeAttr('disabled');
+                if(i>1) {
+                    jQuery(this).attr('checked', false);
                 }
-            }
+            });
         }
     }
-
 };
 
 jQuery(dw_behaviour.init);
diff --git a/lib/scripts/editor.js b/lib/scripts/editor.js
@@ -63,7 +63,7 @@ var dw_editor = {
             ['smaller', function(){dw_editor.sizeCtl(editor,-100);}],
             ['wrap', function(){dw_editor.toggleWrap(editor);}]
         ], function (_, img) {
-            jQuery(document.createElement('IMG'))
+            jQuery(document.createElement('img'))
                 .attr('src', DOKU_BASE+'lib/images/' + img[0] + '.gif')
                 .attr('alt', '')
                 .click(img[1])

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
@@ -83,23 +83,26 @@ dw_page = {
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @author Chris Smith <chris@jalakai.co.uk>
+     * @author Anika Henke <anika@selfthinker.org>
      */
     footnoteDisplay: function () {
-        var content = jQuery(jQuery(this).attr('href')) // Footnote text anchor
-                      .closest('div.fn').html();
+        var $content = jQuery(jQuery(this).attr('href')) // Footnote text anchor
+                      .parent().siblings('.content').clone();
 
-        if (content === null){
+        if (!$content) {
             return;
         }
 
-        // strip the leading content anchors and their comma separators
-        content = content.replace(/((^|\s*,\s*)<sup>.*?<\/sup>)+\s*/gi, '');
-
         // prefix ids on any elements with "insitu__" to ensure they remain unique
-        content = content.replace(/\bid=(['"])([^"']+)\1/gi,'id="insitu__$2');
+        jQuery('[id]', $content).each(function(){
+            var id = jQuery(this).attr('id');
+            jQuery(this).attr('id', 'insitu__' + id);
+        });
 
+        var content = $content.html().trim();
         // now put the content into the wrapper
-        dw_page.insituPopup(this, 'insitu__fn').html(content).show().attr('aria-hidden', 'false');
+        dw_page.insituPopup(this, 'insitu__fn').html(content)
+        .show().attr('aria-hidden', 'false');
     },
 
     /**

diff --git a/lib/tpl/dokuwiki/css/_footnotes.css b/lib/tpl/dokuwiki/css/_footnotes.css
@@ -23,6 +23,9 @@ div.insitu-footnote {
 }
 .dokuwiki div.footnotes div.fn {
 }
+.dokuwiki div.footnotes div.fn div.content {
+    display: inline;
+}
 .dokuwiki div.footnotes div.fn sup a.fn_bot {
     font-weight: bold;
 }