Merge pull request dollarshaveclub#30 from dollarshaveclub/feature/ie-8

updates shave for textContent prop
DiTso · Nov 18, 2016 · b03cab0 · b03cab0
2 parents 5ad96c7 + 83ed031
commit b03cab0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/dist/shave.js b/dist/shave.js
@@ -23,14 +23,16 @@ function shave(target, maxHeight, opts) {
     var el = els[i];
     var span = el.querySelector('.' + classname);
 
+    var textProp = el.textContent === undefined ? 'innerText' : 'textContent';
+
     // If element text has already been shaved
     if (span) {
       // Remove the ellipsis to recapture the original text
       el.removeChild(el.querySelector('.js-shave-char'));
-      el.textContent = el.textContent; // nuke span, recombine text
+      el[textProp] = el[textProp]; // nuke span, recombine text
     }
 
-    var fullText = el.textContent;
+    var fullText = el[textProp];
     var words = spaces ? fullText.split(' ') : fullText;
 
     // If 0 or 1 words, we're done
@@ -55,12 +57,12 @@ function shave(target, maxHeight, opts) {
     var pivot = void 0;
     while (min < max) {
       pivot = min + max + 1 >> 1;
-      el.textContent = spaces ? words.slice(0, pivot).join(' ') : words.slice(0, pivot);
+      el[textProp] = spaces ? words.slice(0, pivot).join(' ') : words.slice(0, pivot);
       el.insertAdjacentHTML('beforeend', charHtml);
       if (el.offsetHeight > maxHeight) max = spaces ? pivot - 1 : pivot - 2;else min = pivot;
     }
 
-    el.textContent = spaces ? words.slice(0, max).join(' ') : words.slice(0, max);
+    el[textProp] = spaces ? words.slice(0, max).join(' ') : words.slice(0, max);
     el.insertAdjacentHTML('beforeend', charHtml);
     var diff = spaces ? words.slice(max + 1).join(' ') : words.slice(max);
 

diff --git a/dist/shave.min.js b/dist/shave.min.js
diff --git a/src/shave.js b/src/shave.js
@@ -18,14 +18,16 @@ export default function shave(target, maxHeight, opts) {
     const el = els[i];
     const span = el.querySelector(`.${classname}`);
 
+    const textProp = el.textContent === undefined ? 'innerText' : 'textContent';
+
     // If element text has already been shaved
     if (span) {
       // Remove the ellipsis to recapture the original text
       el.removeChild(el.querySelector('.js-shave-char'));
-      el.textContent = el.textContent; // nuke span, recombine text
+      el[textProp] = el[textProp]; // nuke span, recombine text
     }
 
-    const fullText = el.textContent;
+    const fullText = el[textProp];
     const words = spaces ? fullText.split(' ') : fullText;
 
     // If 0 or 1 words, we're done
@@ -50,13 +52,13 @@ export default function shave(target, maxHeight, opts) {
     let pivot;
     while (min < max) {
       pivot = (min + max + 1) >> 1;
-      el.textContent = spaces ? words.slice(0, pivot).join(' ') : words.slice(0, pivot);
+      el[textProp] = spaces ? words.slice(0, pivot).join(' ') : words.slice(0, pivot);
       el.insertAdjacentHTML('beforeend', charHtml);
       if (el.offsetHeight > maxHeight) max = spaces ? pivot - 1 : pivot - 2;
       else min = pivot;
     }
 
-    el.textContent = spaces ? words.slice(0, max).join(' ') : words.slice(0, max);
+    el[textProp] = spaces ? words.slice(0, max).join(' ') : words.slice(0, max);
     el.insertAdjacentHTML('beforeend', charHtml);
     const diff = spaces ? words.slice(max + 1).join(' ') : words.slice(max);