From 630a7c4e4f5dcffd04f5c210c9a3be383758ec6d Mon Sep 17 00:00:00 2001
From: Neil Jenkins <neilj@opera.com>
Date: Tue, 24 Jul 2012 15:54:05 +1000
Subject: [PATCH] Tidy IE8 range code.

---
 build/ie8.js       |  2 +-
 source/ie8range.js | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/ie8.js b/build/ie8.js
index bbbc2a5..b6c8353 100644
--- a/build/ie8.js
+++ b/build/ie8.js
@@ -1 +1 @@
-/* Copyright © 2011-2012 by Neil Jenkins. Licensed under the MIT license. */(function(a){Array.prototype.indexOf=function(a,b){var c=this.length;for(var d=b<0?Math.max(0,c+b):b||0;d<c;d+=1)if(this[d]===a)return d;return-1},Array.prototype.forEach=function(a,b){var c=this.length>>>0;if(typeof a!="function")throw new TypeError;for(var d=0;d<c;d+=1)a.call(b,this[d],d,this)},Array.prototype.filter=function(a,b){var c=[];for(var d=0,e=this.length;d<e;d+=1){var f=this[d];a.call(b,f,d,this)&&c.push(f)}return c},Object.keyOf=function(a,b){for(var c in a)if(a[c]===b)return c},Date.now=function(){return+(new Date)},String.prototype.trim=function(){var a=this.replace(/^\s\s*/,""),b=/\s/,c=a.length;while(b.test(a.charAt(c-=1)));return a.slice(0,c+1)}})(),function(){var a=document;window.ie=8,a.defaultView=window;var b={focus:"focusin",blur:"focusout"},c=function(){return!0},d=function(){return!1},e="altKey ctrlKey metaKey shiftKey clientX clientY charCode keyCode".split(" "),f=function(a){var c=a.type,d=document,f=a.srcElement||d,g=(f.ownerDocument||d).documentElement,h=e.length,i;while(h--)i=e[h],this[i]=a[i];c==="propertychange"&&(c=f.nodeName==="INPUT"&&f.type!=="text"&&f.type!=="password"?"change":"input"),this.type=Object.keyOf(b,c)||c,this.target=f,this.pageX=a.clientX+g.scrollLeft,this.pageY=a.clientY+g.scrollTop,a.button&&(this.button=a.button&4?1:a.button&2?2:0,this.which=this.button+1),this.relatedTarget=a.fromElement===f?a.toElement:a.fromElement,this._event=a};f.prototype={constructor:f,isEvent:!0,preventDefault:function(){this.isDefaultPrevented=c,this._event.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=c,this._event.cancelBubble=!0},isDefaultPrevented:d,isPropagationStopped:d},[a,Element.prototype].forEach(function(a){a.addEventListener=function(a,c,d){var e=c._ie_handleEvent||(c._ie_handleEvent=function(){var a=new f(window.event);typeof c=="object"?c.handleEvent(a):c.call(this,a)}),g=/paste|cut/.test(a)?this.body||this:this;c._ie_registeredCount=(c._ie_registeredCount||0)+1,g.attachEvent("on"+(b[a]||a),e)},a.addEventListener.isFake=!0,a.removeEventListener=function(a,c,d){var e=c._ie_handleEvent,f=/paste|cut/.test(a)?this.body||this:this;(c._ie_registeredCount-=1)||delete c._ie_handleEvent,e&&f.detachEvent("on"+(b[a]||a),e)},a.removeEventListener.isFake=!0}),a.defaultView.addEventListener=function(b,c,d){return a.addEventListener(b,c,d)},Object.defineProperty(Element.prototype,"textContent",{get:function(){return this.innerText},set:function(a){this.innerText=a}}),Element.prototype.compareDocumentPosition=function(a){a.nodeType!==1&&(a=a.parentNode);var b=this,c=b!==a,d=b.sourceIndex,e=a.sourceIndex;return(c&&b.contains(a)?16:0)+(c&&a.contains(b)?8:0)+(d<e?4:0)+(e<d?2:0)},HTMLDocument.prototype.normalize=function(){var a=this.childNodes,b=a.length,c;while(b--)c=a[b],c.nodeType===1&&c.normalize()}}();var Range;(function(){var a=Array.prototype.indexOf,b=0,c=1,d=2,e=3,f=function(a,b){while(b=b.parentNode)if(a===b)return!0;return!1},g=function(a,b){var c,d,e,g,h;if(a===b||f(a,b))c=a;else if(f(b,a))c=b;else{d=[],e=[];while(a=a.parentNode)d.push(a);while(b=b.parentNode)e.push(b);g=d.length,h=e.length;while(g--&&h--)if(d[g]!==e[h]){c=d[g+1];break}c||(c=g===-1?d[0]:e[0])}return c};Range=function(a,b,c,d){a=a||document,b=b||0,this.startContainer=a,this.startOffset=b,this.endContainer=c||a,this.endOffset=d!==undefined?d:b,this._updateCollapsedAndAncestor()},Range.prototype={constructor:Range,_updateCollapsedAndAncestor:function(){this.collapsed=this.startContainer===this.endContainer&&this.startOffset===this.endOffset,this.commonAncestorContainer=g(this.startContainer,this.endContainer)},setStart:function(a,b){this.startContainer=a,this.startOffset=b,this._updateCollapsedAndAncestor()},setEnd:function(a,b){this.endContainer=a,this.endOffset=b,this._updateCollapsedAndAncestor()},setStartAfter:function(b){var c=b.parentNode;this.setStart(c,a.call(c.childNodes,b)+1)},setEndBefore:function(b){var c=b.parentNode;this.setEnd(c,a.call(c.childNodes,b))},selectNode:function(b){var c=b.parentNode,d=a.call(c.childNodes,b);this.setStart(c,d),this.setEnd(c,d+1)},selectNodeContents:function(a){this.setStart(a,0),this.setEnd(a,a.childNodes.length)},cloneRange:function(){return new Range(this.startContainer,this.startOffset,this.endContainer,this.endOffset)},collapse:function(a){a?this.setEnd(this.startContainer,this.startOffset):this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(d,f){var g,h,i,j,k,l;d===b||d===e?(g=this.startContainer,h=this.startOffset):(g=this.endContainer,h=this.endOffset),d===b||d===c?(i=f.startContainer,j=f.startOffset):(i=f.endContainer,j=f.endOffset);if(g===i)return h<j?-1:h>j?1:0;k=g;while(l=k.parentNode){if(l===i)return a.call(l.childNodes,k)<j?-1:1;k=l}k=i;while(l=k.parentNode){if(l===g)return a.call(l.childNodes,k)<h?1:-1;k=l}return g.nodeType!==1&&(g=g.parentNode),i.nodeType!==1&&(i=i.parentNode),g.sourceIndex<i.sourceIndex?-1:g.sourceIndex>i.sourceIndex?1:0}},document.createRange=function(){return new Range};var h=function(a,b){return a===b||f(a,b)},i=function(a){var b=a.nodeType;return b===3||b===4||b===8},j=function(a,b){this.node=a,this.offset=b},k=function(a){var b=a.parentElement(),c,d,e,f;return c=a.duplicate(),c.collapse(!0),d=c.parentElement(),c=a.duplicate(),c.collapse(!1),e=c.parentElement(),f=d===e?d:g(d,e),f===b?f:g(b,f)},l=function(b,c,d,e){var f=b.duplicate();f.collapse(d);var g=f.parentElement();h(c,g)||(g=c);if(!g.canHaveHTML)return new j(g.parentNode,a.call(g.parentNode.childNodes,g));var k=document.createElement("span"),l=d?"StartToStart":"StartToEnd",m,n,o,p,q;do g.insertBefore(k,k.previousSibling),f.moveToElementText(k),m=f.compareEndPoints(l,b);while(m>0&&k.previousSibling);q=k.nextSibling;if(m===-1&&q&&i(q)){f.setEndPoint(d?"EndToStart":"EndToEnd",b);var r;if(/[\r\n]/.test(q.data)||/[\r\n]/.test(f.text)){var s=f.duplicate(),t=s.text.replace(/\r\n/g,"\r").length;r=s.moveStart("character",t);while((m=s.compareEndPoints("StartToEnd",s))===-1)r+=1,s.moveStart("character",1)}else r=f.text.length;p=new j(q,r)}else n=(e||!d)&&k.previousSibling,o=(e||d)&&k.nextSibling,o&&i(o)?p=new j(o,0):n&&i(n)?(n.data,p=new j(n,n.length)):p=new j(g,a.call(g.childNodes,k));return k.parentNode.removeChild(k),p},m=function(a,b){var c,d,e=a.offset,f=document,g,h,j=f.body.createTextRange(),k=i(a.node);return k?(c=a.node,d=c.parentNode):(h=a.node.childNodes,c=e<h.length?h[e]:null,d=a.node),g=f.createElement("span"),g.innerHTML="&#xfeff;",c?d.insertBefore(g,c):d.appendChild(g),j.moveToElementText(g),j.collapse(!b),d.removeChild(g),k&&j[b?"moveStart":"moveEnd"]("character",e),j},n=function(a){var b=k(a),c,d;return a.compareEndPoints("StartToEnd",a)===0?c=d=l(a,b,!0,!0):(c=l(a,b,!0,!1),d=l(a,b,!1,!1)),new Range(c.node,c.offset,d.node,d.offset)},o=function(a){var b,c,d;return a.collapsed?b=m(new j(a.startContainer,a.startOffset),!0):(c=m(new j(a.startContainer,a.startOffset),!0),d=m(new j(a.endContainer,a.endOffset),!1),b=document.body.createTextRange(),b.setEndPoint("StartToStart",c),b.setEndPoint("EndToEnd",d)),b},p={rangeCount:1,getRangeAt:function(a){if(a!==0)return undefined;var b=document.selection.createRange();if(b.add){var c=document.createRange();c.moveToElementText(b.item(0)),c.collapse(!1),c.select(),b=c}return n(b)},removeAllRanges:function(){},addRange:function(a){o(a).select()}};document.attachEvent("onbeforeactivate",function(){p.rangeCount=1}),document.attachEvent("ondeactivate",function(){p.rangeCount=0}),window.getSelection=function(){return p}})();
\ No newline at end of file
+/* Copyright © 2011-2012 by Neil Jenkins. Licensed under the MIT license. */(function(e){Array.prototype.indexOf=function(e,t){var n=this.length;for(var r=t<0?Math.max(0,n+t):t||0;r<n;r+=1)if(this[r]===e)return r;return-1},Array.prototype.forEach=function(e,t){var n=this.length>>>0;if(typeof e!="function")throw new TypeError;for(var r=0;r<n;r+=1)e.call(t,this[r],r,this)},Array.prototype.filter=function(e,t){var n=[];for(var r=0,i=this.length;r<i;r+=1){var s=this[r];e.call(t,s,r,this)&&n.push(s)}return n},Object.keyOf=function(e,t){for(var n in e)if(e[n]===t)return n},Date.now=function(){return+(new Date)},String.prototype.trim=function(){var e=this.replace(/^\s\s*/,""),t=/\s/,n=e.length;while(t.test(e.charAt(n-=1)));return e.slice(0,n+1)}})(),function(){var e=document;window.ie=8,e.defaultView=window;var t={focus:"focusin",blur:"focusout"},n=function(){return!0},r=function(){return!1},i="altKey ctrlKey metaKey shiftKey clientX clientY charCode keyCode".split(" "),s=function(e){var n=e.type,r=document,s=e.srcElement||r,o=(s.ownerDocument||r).documentElement,u=i.length,a;while(u--)a=i[u],this[a]=e[a];n==="propertychange"&&(n=s.nodeName==="INPUT"&&s.type!=="text"&&s.type!=="password"?"change":"input"),this.type=Object.keyOf(t,n)||n,this.target=s,this.pageX=e.clientX+o.scrollLeft,this.pageY=e.clientY+o.scrollTop,e.button&&(this.button=e.button&4?1:e.button&2?2:0,this.which=this.button+1),this.relatedTarget=e.fromElement===s?e.toElement:e.fromElement,this._event=e};s.prototype={constructor:s,isEvent:!0,preventDefault:function(){this.isDefaultPrevented=n,this._event.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=n,this._event.cancelBubble=!0},isDefaultPrevented:r,isPropagationStopped:r},[e,Element.prototype].forEach(function(e){e.addEventListener=function(e,n,r){var i=n._ie_handleEvent||(n._ie_handleEvent=function(){var e=new s(window.event);typeof n=="object"?n.handleEvent(e):n.call(this,e)}),o=/paste|cut/.test(e)?this.body||this:this;n._ie_registeredCount=(n._ie_registeredCount||0)+1,o.attachEvent("on"+(t[e]||e),i)},e.addEventListener.isFake=!0,e.removeEventListener=function(e,n,r){var i=n._ie_handleEvent,s=/paste|cut/.test(e)?this.body||this:this;(n._ie_registeredCount-=1)||delete n._ie_handleEvent,i&&s.detachEvent("on"+(t[e]||e),i)},e.removeEventListener.isFake=!0}),e.defaultView.addEventListener=function(t,n,r){return e.addEventListener(t,n,r)},Object.defineProperty(Element.prototype,"textContent",{get:function(){return this.innerText},set:function(e){this.innerText=e}}),Element.prototype.compareDocumentPosition=function(e){e.nodeType!==1&&(e=e.parentNode);var t=this,n=t!==e,r=t.sourceIndex,i=e.sourceIndex;return(n&&t.contains(e)?16:0)+(n&&e.contains(t)?8:0)+(r<i?4:0)+(i<r?2:0)},HTMLDocument.prototype.normalize=function(){var e=this.childNodes,t=e.length,n;while(t--)n=e[t],n.nodeType===1&&n.normalize()}}();var Range;(function(){var e=Array.prototype.indexOf,t=0,n=1,r=3,i=function(e,t){while(t=t.parentNode)if(e===t)return!0;return!1},s=function(e,t){var n,r,s,o,u;if(e===t||i(e,t))n=e;else if(i(t,e))n=t;else{r=[],s=[];while(e=e.parentNode)r.push(e);while(t=t.parentNode)s.push(t);o=r.length,u=s.length;while(o--&&u--)if(r[o]!==s[u]){n=r[o+1];break}n||(n=o===-1?r[0]:s[0])}return n};Range=function(e,t,n,r){e=e||document,t=t||0,this.startContainer=e,this.startOffset=t,this.endContainer=n||e,this.endOffset=r!==undefined?r:t,this._updateCollapsedAndAncestor()},Range.prototype={constructor:Range,_updateCollapsedAndAncestor:function(){this.collapsed=this.startContainer===this.endContainer&&this.startOffset===this.endOffset,this.commonAncestorContainer=s(this.startContainer,this.endContainer)},setStart:function(e,t){this.startContainer=e,this.startOffset=t,this._updateCollapsedAndAncestor()},setEnd:function(e,t){this.endContainer=e,this.endOffset=t,this._updateCollapsedAndAncestor()},setStartAfter:function(t){var n=t.parentNode;this.setStart(n,e.call(n.childNodes,t)+1)},setEndBefore:function(t){var n=t.parentNode;this.setEnd(n,e.call(n.childNodes,t))},selectNode:function(t){var n=t.parentNode,r=e.call(n.childNodes,t);this.setStart(n,r),this.setEnd(n,r+1)},selectNodeContents:function(e){this.setStart(e,0),this.setEnd(e,e.childNodes.length)},cloneRange:function(){return new Range(this.startContainer,this.startOffset,this.endContainer,this.endOffset)},collapse:function(e){e?this.setEnd(this.startContainer,this.startOffset):this.setStart(this.endContainer,this.endOffset)},compareBoundaryPoints:function(i,s){var o,u,a,f,l,c;i===t||i===r?(o=this.startContainer,u=this.startOffset):(o=this.endContainer,u=this.endOffset),i===t||i===n?(a=s.startContainer,f=s.startOffset):(a=s.endContainer,f=s.endOffset);if(o===a)return u<f?-1:u>f?1:0;l=o;while(c=l.parentNode){if(c===a)return e.call(c.childNodes,l)<f?-1:1;l=c}l=a;while(c=l.parentNode){if(c===o)return e.call(c.childNodes,l)<u?1:-1;l=c}return o.nodeType!==1&&(o=o.parentNode),a.nodeType!==1&&(a=a.parentNode),o.sourceIndex<a.sourceIndex?-1:o.sourceIndex>a.sourceIndex?1:0}},document.createRange=function(){return new Range};var o=function(e,t){return e===t||i(e,t)},u=function(e){var t=e.nodeType;return t===3||t===4||t===8},a=function(e,t){this.node=e,this.offset=t},f=function(e){var t=e.parentElement(),n,r,i,o;return n=e.duplicate(),n.collapse(!0),r=n.parentElement(),n=e.duplicate(),n.collapse(!1),i=n.parentElement(),o=r===i?r:s(r,i),o===t?o:s(t,o)},l=function(t,n,r,i){var s=t.duplicate();s.collapse(r);var f=s.parentElement();o(n,f)||(f=n);if(!f.canHaveHTML)return new a(f.parentNode,e.call(f.parentNode.childNodes,f));var l=document.createElement("span"),c=r?"StartToStart":"StartToEnd",h,p,d,v,m;do f.insertBefore(l,l.previousSibling),s.moveToElementText(l),h=s.compareEndPoints(c,t);while(h>0&&l.previousSibling);m=l.nextSibling;if(h===-1&&m&&u(m)){s.setEndPoint(r?"EndToStart":"EndToEnd",t);var g;if(/[\r\n]/.test(m.data)||/[\r\n]/.test(s.text)){var y=s.duplicate(),b=y.text.replace(/\r\n/g,"\r").length;g=y.moveStart("character",b);while((h=y.compareEndPoints("StartToEnd",y))===-1)g+=1,y.moveStart("character",1)}else g=s.text.length;v=new a(m,g)}else p=(i||!r)&&l.previousSibling,d=(i||r)&&l.nextSibling,d&&u(d)?v=new a(d,0):p&&u(p)?v=new a(p,p.data.length):v=new a(f,e.call(f.childNodes,l));return l.parentNode.removeChild(l),v},c=function(e,t){var n,r,i=e.offset,s=document,o,a,f=s.body.createTextRange(),l=u(e.node);return l?(n=e.node,r=n.parentNode):(a=e.node.childNodes,n=i<a.length?a[i]:null,r=e.node),o=s.createElement("span"),o.innerHTML="&#xfeff;",n?r.insertBefore(o,n):r.appendChild(o),f.moveToElementText(o),f.collapse(!t),r.removeChild(o),l&&f[t?"moveStart":"moveEnd"]("character",i),f},h=function(e){var t=f(e),n,r;return e.compareEndPoints("StartToEnd",e)===0?n=r=l(e,t,!0,!0):(n=l(e,t,!0,!1),r=l(e,t,!1,!1)),new Range(n.node,n.offset,r.node,r.offset)},p=function(e){var t,n,r;return e.collapsed?t=c(new a(e.startContainer,e.startOffset),!0):(n=c(new a(e.startContainer,e.startOffset),!0),r=c(new a(e.endContainer,e.endOffset),!1),t=document.body.createTextRange(),t.setEndPoint("StartToStart",n),t.setEndPoint("EndToEnd",r)),t},d={rangeCount:1,getRangeAt:function(e){if(e!==0)return undefined;var t=document.selection.createRange();if(t.add){var n=document.createRange();n.moveToElementText(t.item(0)),n.collapse(!1),n.select(),t=n}return h(t)},removeAllRanges:function(){},addRange:function(e){p(e).select()}};document.attachEvent("onbeforeactivate",function(){d.rangeCount=1}),document.attachEvent("ondeactivate",function(){d.rangeCount=0}),window.getSelection=function(){return d}})();
\ No newline at end of file
diff --git a/source/ie8range.js b/source/ie8range.js
index 2c256c9..2efc583 100644
--- a/source/ie8range.js
+++ b/source/ie8range.js
@@ -16,7 +16,6 @@ var indexOf = Array.prototype.indexOf;
 
 var START_TO_START = 0;
 var START_TO_END   = 1;
-var END_TO_END     = 2;
 var END_TO_START   = 3;
 
 var contains = function ( a, b ) {
@@ -342,13 +341,12 @@ var getTextRangeBoundaryPosition = function (
         if ( nextNode && isCharacterDataNode( nextNode ) ) {
             boundaryPosition = new DomPosition( nextNode, 0 );
         } else if ( previousNode && isCharacterDataNode( previousNode ) ) {
-            // Strange bug; if we don't read the data property, the length
+            // Strange bug: if we don't read the data property, the length
             // property is often returned incorrectly as 0. Don't ask me why.
-            /*jshint expr: true */
-            previousNode.data;
-            /*jshint expr: false */
+            // Therefore get the length from the data property rather than
+            // reading it directly from the node.
             boundaryPosition = new DomPosition(
-                previousNode, previousNode.length );
+                previousNode, previousNode.data.length );
         } else {
             boundaryPosition = new DomPosition(
                 containerElement,