From 4802becf985a7e314243b0c4d0a30bd7f906d078 Mon Sep 17 00:00:00 2001
From: Michael Hamann <michael@content-space.de>
Date: Sun, 9 Sep 2012 18:44:16 +0200
Subject: Fix section edit highlighting when the start marker is hidden

This fixes the section edit highlighting when the start marker (normally
a heading) is inside other HTML elements like a div from the wrap
plugin.
---
 lib/scripts/page.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib/scripts/page.js')

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index 5ac81f33b..b8e83cb0c 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -27,9 +27,14 @@ dw_page = {
                 // Walk the DOM tree up (first previous siblings, then parents)
                 // until boundary element
                 while($tgt.length > 0 && !$tgt.hasClass('sectionedit' + nr)) {
-                    // $.last gives the DOM-ordered last element:
-                    // prev if present, else parent.
-                    $tgt = $tgt.prev().add($tgt.parent()).last();
+                    // go down when the sectionedit begin marker is below $tgt
+                    if ($tgt.find('.sectionedit' + nr).length > 0) {
+                        $tgt = $tgt.children().last();
+                    } else {
+                        // $.last gives the DOM-ordered last element:
+                        // prev if present, else parent.
+                        $tgt = $tgt.prev().add($tgt.parent()).last();
+                    }
                     $tgt.addClass('section_highlight');
                 }
             })
-- 
cgit v1.2.3


From 870c8a4b77dd7c2cfdc14045f8604b5bbf34c01e Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 12 Oct 2012 00:41:37 +0100
Subject: #2541, alter section highlighting to insert a container into the DOM
 to hold the elements being highlighted & later remove it

---
 lib/scripts/page.js | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'lib/scripts/page.js')

diff --git a/lib/scripts/page.js b/lib/scripts/page.js
index b8e83cb0c..4ab0bf9b5 100644
--- a/lib/scripts/page.js
+++ b/lib/scripts/page.js
@@ -22,24 +22,27 @@ dw_page = {
         jQuery('form.btn_secedit')
             .mouseover(function(){
                 var $tgt = jQuery(this).parent(),
-                    nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2];
-
-                // Walk the DOM tree up (first previous siblings, then parents)
-                // until boundary element
-                while($tgt.length > 0 && !$tgt.hasClass('sectionedit' + nr)) {
-                    // go down when the sectionedit begin marker is below $tgt
-                    if ($tgt.find('.sectionedit' + nr).length > 0) {
-                        $tgt = $tgt.children().last();
-                    } else {
-                        // $.last gives the DOM-ordered last element:
-                        // prev if present, else parent.
-                        $tgt = $tgt.prev().add($tgt.parent()).last();
-                    }
-                    $tgt.addClass('section_highlight');
+                    nr = $tgt.attr('class').match(/(\s+|^)editbutton_(\d+)(\s+|$)/)[2],
+                    $highlight = jQuery(),                                             // holder for elements in the section to be highlighted
+                    $highlightWrap = jQuery('<div class="section_highlight"></div>');  // section highlight wrapper
+
+                // Walk the dom tree in reverse to find the sibling which is or contains the section edit marker
+                while($tgt.length > 0 && !($tgt.hasClass('sectionedit' + nr) || $tgt.find('.sectionedit' + nr).length)) {
+                    $tgt = $tgt.prev();
+                    $highlight = $highlight.add($tgt);
                 }
+              // insert the section highlight wrapper before the last element added to $highlight
+              $highlight.filter(':last').before($highlightWrap);
+              // and move the elements to be highlighted inside the section highlight wrapper
+              $highlight.detach().appendTo($highlightWrap);
             })
             .mouseout(function(){
-                jQuery('.section_highlight').removeClass('section_highlight');
+                // find the section highlight wrapper...
+                var $highlightWrap = jQuery('.section_highlight');
+                // ...move its children in front of it (as siblings)...
+                $highlightWrap.before($highlightWrap.children().detach());
+                // ...and remove the section highlight wrapper
+                $highlightWrap.detach();
             });
     },
 
-- 
cgit v1.2.3