some other minor changes from milpeer master
authorJan Szejko <janek37@gmail.com>
Tue, 27 Mar 2018 15:10:41 +0000 (17:10 +0200)
committerJan Szejko <janek37@gmail.com>
Tue, 27 Mar 2018 15:10:41 +0000 (17:10 +0200)
src/editor/modules/documentHistory/templates/main.html
src/wlxml/wlxml.js

index 83cd627..0abdab6 100644 (file)
@@ -8,4 +8,4 @@
     </div>
     <div style="clear:both;"></div>
     <div class="rng-module-documentHistory-itemsList"></div>
     </div>
     <div style="clear:both;"></div>
     <div class="rng-module-documentHistory-itemsList"></div>
-<div>
\ No newline at end of file
+</div>
\ No newline at end of file
index ce0ac0a..a5a87d2 100644 (file)
@@ -255,9 +255,7 @@ $.extend(WLXMLDocument.prototype, {
                     elParent = el.parent(),
                     hasSpanParent = elParent.prop('tagName') === 'SPAN',
                     hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN',
                     elParent = el.parent(),
                     hasSpanParent = elParent.prop('tagName') === 'SPAN',
                     hasSpanBefore = el.prev().length && $(el.prev()).prop('tagName') === 'SPAN',
-                    hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN',
-                    onlyChild = el.is(':only-child');
-
+                    hasSpanAfter = el.next().length && $(el.next()).prop('tagName') === 'SPAN';
 
                 var addInfo = function(toAdd, where, transformed, original) {
                     var parentContents = elParent.contents(),
 
                 var addInfo = function(toAdd, where, transformed, original) {
                     var parentContents = elParent.contents(),