remove support for IE7; prune IE7-specific shims from code

warpech · warpech · commit a07db93e6ff7 · 2013-06-28T12:32:36.000+02:00
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Handsontable is a minimalistic approach to Excel-like table editor in HTML & jQuery. Requires jQuery 1.9+ or 2.0+ (may work with 1.7+ too, but there are known issues with [IE10](https://github.com/warpech/jquery-handsontable/issues/410)).
 
-Runs in IE7, IE8, IE9, IE10, Firefox, Chrome, Safari and Opera.
+Runs in IE8, IE9, IE10, Firefox, Chrome, Safari and Opera.
 
 See the demos at http://handsontable.com/ or fork the example on [JSFiddle](http://jsfiddle.net/warpech/hU6Kz/).
 
diff --git a/demo/js/samples.js b/demo/js/samples.js
@@ -30,7 +30,6 @@
   }
 
   $(function () {
-    //if (!$.browser.msie || parseInt($.browser.version, 10) > 6) { //syntax coloring does not work well with IE7
     $('.descLayout pre.javascript code').each(function () {
       var $script = $(this);
       var code = trimCodeBlock($script[0].innerHTML);
@@ -48,7 +47,6 @@
       $pre.insertAfter($script);
     });
     hljs.initHighlighting();
-    //}
 
     //http://stackoverflow.com/questions/2419749/get-selected-elements-outer-html
     jQuery.fn.outerHTML = function (s) {
diff --git a/src/3rdparty/walkontable/README.md b/src/3rdparty/walkontable/README.md
@@ -2,7 +2,7 @@
 
 This is a playground for next table view engine that will enable virtual rendering in [Handsontable](http://handsontable.com/).
 
-Works in IE7+, FF3.6+, latest Opera, Safari and Chrome.
+Works in IE8+, FF3.6+, latest Opera, Safari and Chrome.
 
 Built with almost full TDD test coverage (Jasmine).
 
diff --git a/src/3rdparty/walkontable/src/dom.js b/src/3rdparty/walkontable/src/dom.js
@@ -190,7 +190,7 @@ if (document.createTextNode('test').textContent) { //STANDARDS
     }
   };
 }
-else { //IE7-8
+else { //IE8
   WalkontableDom.prototype.fastInnerText = function (element, content) {
     var child = element.firstChild;
     if (child && child.nodeType === 3 && child.nextSibling === null) {
@@ -219,7 +219,7 @@ WalkontableDom.prototype.isVisible = function (elem) {
     }
   }
   catch (e) {
-    return false; //IE7-8 throws "Unspecified error" when offsetParent is not found - we catch it here
+    return false; //IE8 throws "Unspecified error" when offsetParent is not found - we catch it here
   }
 
 //  if (elem.offsetWidth > 0 || (elem.parentNode && elem.parentNode.offsetWidth > 0)) { //IE10 was mistaken here
@@ -234,23 +234,11 @@ WalkontableDom.prototype.isVisible = function (elem) {
       return false;
     }
     else if (next.nodeType === 11) {
-      if (next.nodeName === '#document-fragment') { //Shadow DOM
-        return (true);
-      }
-      else { //IE7 reports nodeType === 11 after detaching element from DOM
-        return (false);
-      }
+      return true;
     }
     else if (next.style.display === 'none') {
       return false;
     }
-    /*else if (next !== elem && next.offsetWidth === 0) {
-     //this is the technique used by jQuery is(':visible')
-     //but in IE7, clientWidth & offsetWidth sometimes returns 0 when it shouldn't
-     return false;
-
-     compare with jQuery :visible selector (search jquery.js for `reliableHiddenOffsets`)
-     }*/
     next = next.parentNode;
   }
   return true;
diff --git a/src/3rdparty/walkontable/src/table.js b/src/3rdparty/walkontable/src/table.js
@@ -12,13 +12,6 @@ function WalkontableTable(instance) {
   this.wtDom = this.instance.wtDom;
   this.wtDom.removeTextNodes(this.TABLE);
 
-  this.hasEmptyCellProblem = ($.browser.msie && (parseInt($.browser.version, 10) <= 7));
-  this.hasCellSpacingProblem = ($.browser.msie && (parseInt($.browser.version, 10) <= 7));
-
-  if (this.hasCellSpacingProblem) { //IE7
-    this.TABLE.cellSpacing = 0;
-  }
-
   //wtSpreader
   var parent = this.TABLE.parentNode;
   if (!parent || parent.nodeType !== 1 || !this.wtDom.hasClass(parent, 'wtHolder')) {
@@ -240,9 +233,6 @@ WalkontableTable.prototype.adjustAvailableNodes = function () {
       TD = TR.firstChild; //actually it is TH but let's reuse single variable
       for (c = 0; c < displayThs; c++) {
         rowHeaders[c](-displayThs + c, TD);
-        if (this.hasEmptyCellProblem) { //IE7
-          TD.innerHTML = '&nbsp;';
-        }
         TD = TD.nextSibling;
       }
     }
@@ -382,9 +372,6 @@ WalkontableTable.prototype._doDraw = function () {
         TD.className = '';
         TD.removeAttribute('style');
         this.instance.getSetting('cellRenderer', source_r, source_c, TD);
-        if (this.hasEmptyCellProblem && TD.innerHTML === '') { //IE7
-          TD.innerHTML = '&nbsp;';
-        }
       }
 
       offsetRow = this.instance.getSetting('offsetRow'); //refresh the value
diff --git a/src/3rdparty/walkontable/src/wheel.js b/src/3rdparty/walkontable/src/wheel.js
@@ -4,7 +4,7 @@ function WalkontableWheel(instance) {
   }
 
   $(instance.wtTable.TABLE).on('mousewheel', function (event, delta, deltaX, deltaY) {
-    if (!deltaX && !deltaY && delta) { //we are in IE7-8, see https://github.com/brandonaaron/jquery-mousewheel/issues/53
+    if (!deltaX && !deltaY && delta) { //we are in IE8, see https://github.com/brandonaaron/jquery-mousewheel/issues/53
       deltaY = delta;
     }
 
diff --git a/src/3rdparty/walkontable/test/jasmine/spec/table.spec.js b/src/3rdparty/walkontable/test/jasmine/spec/table.spec.js
@@ -339,7 +339,7 @@ describe('WalkontableTable', function () {
   });
 
   it("should remove rows if they were removed in data source", function () {
-    this.data.splice(8, this.data.length - 8); //second param is required by IE7-8
+    this.data.splice(8, this.data.length - 8); //second param is required by IE8
 
     var wt = new Walkontable({
       table: $table[0],
@@ -353,7 +353,7 @@ describe('WalkontableTable', function () {
     wt.draw();
     expect($table.find('tbody tr').length).toBe(8);
 
-    this.data.splice(7, this.data.length - 7); //second param is required by IE7-8
+    this.data.splice(7, this.data.length - 7); //second param is required by IE8
     wt.draw();
     expect($table.find('tbody tr').length).toBe(7);
   });
@@ -415,7 +415,7 @@ describe('WalkontableTable', function () {
   });
 
   it("should render all rows if height is null", function () {
-    this.data.splice(20, this.data.length - 20); //second param is required by IE7-8
+    this.data.splice(20, this.data.length - 20); //second param is required by IE8
 
     var wt = new Walkontable({
       table: $table[0],
@@ -509,10 +509,10 @@ describe('WalkontableTable', function () {
       }
     });
     wt.draw();
-    expect($table.find('tbody tr:first td:eq(0)').outerWidth()).toBeInArray([48, 50]); //IE7 reports 48, other browsers report 50
-    expect($table.find('tbody tr:first td:eq(1)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('tbody tr:first td:eq(2)').outerWidth()).toBeInArray([148, 150]); //IE7 reports 148, other browsers report 150
-    expect($table.find('tbody tr:first td:eq(3)').outerWidth()).toBeInArray([198, 200]); //IE7 reports 198, other browsers report 200
+    expect($table.find('tbody tr:first td:eq(0)').outerWidth()).toBe(50);
+    expect($table.find('tbody tr:first td:eq(1)').outerWidth()).toBe(100);
+    expect($table.find('tbody tr:first td:eq(2)').outerWidth()).toBe(150);
+    expect($table.find('tbody tr:first td:eq(3)').outerWidth()).toBe(200);
   });
 
   it("should use column width array to get column width", function () {
@@ -533,10 +533,10 @@ describe('WalkontableTable', function () {
       columnWidth: [50, 100, 150, 200]
     });
     wt.draw();
-    expect($table.find('tbody tr:first td:eq(0)').outerWidth()).toBeInArray([48, 50]); //IE7 reports 48, other browsers report 50
-    expect($table.find('tbody tr:first td:eq(1)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('tbody tr:first td:eq(2)').outerWidth()).toBeInArray([148, 150]); //IE7 reports 148, other browsers report 150
-    expect($table.find('tbody tr:first td:eq(3)').outerWidth()).toBeInArray([198, 200]); //IE7 reports 198, other browsers report 200
+    expect($table.find('tbody tr:first td:eq(0)').outerWidth()).toBe(50);
+    expect($table.find('tbody tr:first td:eq(1)').outerWidth()).toBe(100);
+    expect($table.find('tbody tr:first td:eq(2)').outerWidth()).toBe(150);
+    expect($table.find('tbody tr:first td:eq(3)').outerWidth()).toBe(200);
   });
 
   it("should use column width integer to get column width", function () {
@@ -557,10 +557,10 @@ describe('WalkontableTable', function () {
       columnWidth: 100
     });
     wt.draw();
-    expect($table.find('tbody tr:first td:eq(0)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('tbody tr:first td:eq(1)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('tbody tr:first td:eq(2)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('tbody tr:first td:eq(3)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
+    expect($table.find('tbody tr:first td:eq(0)').outerWidth()).toBe(100);
+    expect($table.find('tbody tr:first td:eq(1)').outerWidth()).toBe(100);
+    expect($table.find('tbody tr:first td:eq(2)').outerWidth()).toBe(100);
+    expect($table.find('tbody tr:first td:eq(3)').outerWidth()).toBe(100);
   });
 
   it("should use column width also when there are no rows", function () {
@@ -584,10 +584,10 @@ describe('WalkontableTable', function () {
     });
     wt.draw();
     //start from eq(1) because eq(0) is corner header
-    expect($table.find('thead tr:first th:eq(1)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('thead tr:first th:eq(2)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('thead tr:first th:eq(3)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
-    expect($table.find('thead tr:first th:eq(4)').outerWidth()).toBeInArray([98, 100]); //IE7 reports 98, other browsers report 100
+    expect($table.find('thead tr:first th:eq(1)').outerWidth()).toBe(100);
+    expect($table.find('thead tr:first th:eq(2)').outerWidth()).toBe(100);
+    expect($table.find('thead tr:first th:eq(3)').outerWidth()).toBe(100);
+    expect($table.find('thead tr:first th:eq(4)').outerWidth()).toBe(100);
   });
 
   it("should not render a cell that is outside of the viewport horizontally", function () {
diff --git a/src/editors/handsontableEditor.js b/src/editors/handsontableEditor.js
@@ -79,7 +79,7 @@ HandsontableHandsontableEditorClass.prototype.finishEditing = function (isCancel
   if (Handsontable.helper.isDescendant(this.instance.rootElement[0], document.activeElement)) {
     var that = this;
     setTimeout(function () {
-      that.instance.listen(); //return the focus to the cell must be done after destroyer to work in IE7-9
+      that.instance.listen(); //return the focus to the cell must be done after destroyer to work in IE8-9
     }, 0);
     that.instance.listen(); //return the focus to the cell
   }
diff --git a/src/plugins/observeChanges.js b/src/plugins/observeChanges.js
@@ -136,7 +136,7 @@ function HandsontableObserveChanges() {
           window.addEventListener('mouseup', fastCheck);
           window.addEventListener('keydown', fastCheck);
         } else {
-          //IE7 has different syntax
+          //IE8 has different syntax
           window.attachEvent('onmousedown', fastCheck);
           window.attachEvent('onmouseup', fastCheck);
           window.attachEvent('onkeydown', fastCheck);
diff --git a/src/tableView.js b/src/tableView.js
@@ -222,7 +222,7 @@ Handsontable.TableView = function (instance) {
         that.settings.afterOnCellMouseDown.call(instance, event, coords, TD);
       }
       setTimeout(function () {
-        instance.listen(); //fix IE7-8 bug that sets focus to TD after mousedown
+        instance.listen(); //fix IE8 bug that sets focus to TD after mousedown
       });
     },
     onCellMouseOver: function (event, coords/*, TD*/) {
diff --git a/test/jasmine/spec/Core_alterSpec.js b/test/jasmine/spec/Core_alterSpec.js
@@ -259,7 +259,7 @@ describe('Core_alter', function () {
     expect(countRows()).toEqual(6);
     expect(this.$container.find('tr:eq(4) td:eq(0)').html()).toEqual('e1');
 
-    expect(this.$container.find('tr:last td:eq(0)').html()).toEqual(emptyCell());
+    expect(this.$container.find('tr:last td:eq(0)').html()).toEqual('');
   });
 
   it('should insert the amount of rows at given index', function () {
@@ -276,7 +276,7 @@ describe('Core_alter', function () {
 
     expect(countRows()).toEqual(8);
 
-    expect(this.$container.find('tr:eq(1) td:eq(0)').html()).toEqual(emptyCell());
+    expect(this.$container.find('tr:eq(1) td:eq(0)').html()).toEqual('');
 
     expect(this.$container.find('tr:eq(4) td:eq(0)').html()).toEqual('b1');
   });
@@ -296,9 +296,9 @@ describe('Core_alter', function () {
     expect(countRows()).toEqual(8);
     expect(this.$container.find('tr:eq(4) td:eq(0)').html()).toEqual('e1');
 
-    expect(this.$container.find('tr:eq(5) td:eq(0)').html()).toEqual(emptyCell());
-    expect(this.$container.find('tr:eq(6) td:eq(0)').html()).toEqual(emptyCell());
-    expect(this.$container.find('tr:eq(7) td:eq(0)').html()).toEqual(emptyCell());
+    expect(this.$container.find('tr:eq(5) td:eq(0)').html()).toEqual('');
+    expect(this.$container.find('tr:eq(6) td:eq(0)').html()).toEqual('');
+    expect(this.$container.find('tr:eq(7) td:eq(0)').html()).toEqual('');
   });
 
   it('should insert not more rows than maxRows', function () {
@@ -383,9 +383,9 @@ describe('Core_alter', function () {
     expect(countCols()).toEqual(11);
     expect(this.$container.find('tr:eq(1) td:eq(7)').html()).toEqual('h');
 
-    expect(this.$container.find('tr:eq(1) td:eq(8)').html()).toEqual(emptyCell());
-    expect(this.$container.find('tr:eq(1) td:eq(9)').html()).toEqual(emptyCell());
-    expect(this.$container.find('tr:eq(1) td:eq(10)').html()).toEqual(emptyCell());
+    expect(this.$container.find('tr:eq(1) td:eq(8)').html()).toEqual('');
+    expect(this.$container.find('tr:eq(1) td:eq(9)').html()).toEqual('');
+    expect(this.$container.find('tr:eq(1) td:eq(10)').html()).toEqual('');
   });
 
   it('should insert not more cols than maxCols', function () {
@@ -411,8 +411,8 @@ describe('Core_alter', function () {
     alter('insert_col', 1, 10);
 
     expect(countCols()).toEqual(10);
-    expect(this.$container.find('tr:eq(1) td:eq(1)').html()).toEqual(emptyCell());
-    expect(this.$container.find('tr:eq(1) td:eq(2)').html()).toEqual(emptyCell());
+    expect(this.$container.find('tr:eq(1) td:eq(1)').html()).toEqual('');
+    expect(this.$container.find('tr:eq(1) td:eq(2)').html()).toEqual('');
     expect(this.$container.find('tr:eq(1) td:eq(3)').html()).toEqual('b');
   });
 
diff --git a/test/jasmine/spec/SpecHelper.js b/test/jasmine/spec/SpecHelper.js
@@ -243,15 +243,3 @@ function createSpreadsheetData(rowCount, colCount) {
   }
   return rows;
 }
-
-function runningIE7OrEarlier(){
-  return $.browser.msie && parseInt($.browser.version) < 8;
-}
-
-/**
- * Returns value that should be returned when retrieving data from empty cell.
- * The value varies depending on browser (IE7 hacks)
- */
-function emptyCell() {
-  return runningIE7OrEarlier() ? '&nbsp;' : '';
-}
diff --git a/test/jasmine/spec/renderers/textRendererSpec.js b/test/jasmine/spec/renderers/textRendererSpec.js
@@ -44,23 +44,15 @@ describe('TextRenderer', function () {
     handsontable();
     setDataAtCell(2, 2, null);
 
-    if(runningIE7OrEarlier()){
-      expect(getCell(2, 2).innerHTML).toEqual("&nbsp;");
-    } else {
-      expect(getCell(2, 2).innerHTML).toEqual("");
-    }
+    expect(getCell(2, 2).innerHTML).toEqual('');
   });
 
   it('should render undefined', function () {
     handsontable();
     setDataAtCell(2, 2, (function () {
     })());
 
-    if(runningIE7OrEarlier()){
-      expect(getCell(2, 2).innerHTML).toEqual("&nbsp;");
-    } else {
-      expect(getCell(2, 2).innerHTML).toEqual("");
-    }
+    expect(getCell(2, 2).innerHTML).toEqual('');
   });
 
   it('should add class name `htDimmed` to a read only cell', function () {

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ if (document.createTextNode('test').textContent) { //STANDARDS`
`190`	`190`	`}`
`191`	`191`	`};`
`192`	`192`	`}`
`193`		`-else { //IE7-8`
	`193`	`+else { //IE8`
`194`	`194`	`WalkontableDom.prototype.fastInnerText = function (element, content) {`
`195`	`195`	`var child = element.firstChild;`
`196`	`196`	`if (child && child.nodeType === 3 && child.nextSibling === null) {`
`@@ -219,7 +219,7 @@ WalkontableDom.prototype.isVisible = function (elem) {`
`219`	`219`	`}`
`220`	`220`	`}`
`221`	`221`	`catch (e) {`
`222`		`- return false; //IE7-8 throws "Unspecified error" when offsetParent is not found - we catch it here`
	`222`	`+ return false; //IE8 throws "Unspecified error" when offsetParent is not found - we catch it here`
`223`	`223`	`}`
`224`	`224`
`225`	`225`	`// if (elem.offsetWidth > 0 \|\| (elem.parentNode && elem.parentNode.offsetWidth > 0)) { //IE10 was mistaken here`
`@@ -234,23 +234,11 @@ WalkontableDom.prototype.isVisible = function (elem) {`
`234`	`234`	`return false;`
`235`	`235`	`}`
`236`	`236`	`else if (next.nodeType === 11) {`
`237`		`- if (next.nodeName === '#document-fragment') { //Shadow DOM`
`238`		`- return (true);`
`239`		`- }`
`240`		`- else { //IE7 reports nodeType === 11 after detaching element from DOM`
`241`		`- return (false);`
`242`		`- }`
	`237`	`+ return true;`
`243`	`238`	`}`
`244`	`239`	`else if (next.style.display === 'none') {`
`245`	`240`	`return false;`
`246`	`241`	`}`
`247`		`- /*else if (next !== elem && next.offsetWidth === 0) {`
`248`		`- //this is the technique used by jQuery is(':visible')`
`249`		`- //but in IE7, clientWidth & offsetWidth sometimes returns 0 when it shouldn't`
`250`		`- return false;`
`251`		`-`
`252`		- compare with jQuery :visible selector (search jquery.js for `reliableHiddenOffsets`)
`253`		`- }*/`
`254`	`242`	`next = next.parentNode;`
`255`	`243`	`}`
`256`	`244`	`return true;`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ function WalkontableWheel(instance) {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`$(instance.wtTable.TABLE).on('mousewheel', function (event, delta, deltaX, deltaY) {`
`7`		`- if (!deltaX && !deltaY && delta) { //we are in IE7-8, see https://github.com/brandonaaron/jquery-mousewheel/issues/53`
	`7`	`+ if (!deltaX && !deltaY && delta) { //we are in IE8, see https://github.com/brandonaaron/jquery-mousewheel/issues/53`
`8`	`8`	`deltaY = delta;`
`9`	`9`	`}`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ HandsontableHandsontableEditorClass.prototype.finishEditing = function (isCancel`
`79`	`79`	`if (Handsontable.helper.isDescendant(this.instance.rootElement[0], document.activeElement)) {`
`80`	`80`	`var that = this;`
`81`	`81`	`setTimeout(function () {`
`82`		`- that.instance.listen(); //return the focus to the cell must be done after destroyer to work in IE7-9`
	`82`	`+ that.instance.listen(); //return the focus to the cell must be done after destroyer to work in IE8-9`
`83`	`83`	`}, 0);`
`84`	`84`	`that.instance.listen(); //return the focus to the cell`
`85`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ Handsontable.TableView = function (instance) {`
`222`	`222`	`that.settings.afterOnCellMouseDown.call(instance, event, coords, TD);`
`223`	`223`	`}`
`224`	`224`	`setTimeout(function () {`
`225`		`- instance.listen(); //fix IE7-8 bug that sets focus to TD after mousedown`
	`225`	`+ instance.listen(); //fix IE8 bug that sets focus to TD after mousedown`
`226`	`226`	`});`
`227`	`227`	`},`
`228`	`228`	`onCellMouseOver: function (event, coords/, TD/) {`