Merge "Merge branch 'stable-3.1'"
This commit is contained in:
		@@ -824,15 +824,6 @@ limitations under the License.
 | 
			
		||||
        element.render(keyLocations, prefs).then(done);
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      test('renderSection', () => {
 | 
			
		||||
        let section = outputEl.querySelector('stub:nth-of-type(2)');
 | 
			
		||||
        const prevInnerHTML = section.innerHTML;
 | 
			
		||||
        section.innerHTML = 'wiped';
 | 
			
		||||
        element._builder.renderSection(section);
 | 
			
		||||
        section = outputEl.querySelector('stub:nth-of-type(2)');
 | 
			
		||||
        assert.equal(section.innerHTML, prevInnerHTML);
 | 
			
		||||
      });
 | 
			
		||||
 | 
			
		||||
      test('addColumns is called', done => {
 | 
			
		||||
        element.render(keyLocations, {}).then(done);
 | 
			
		||||
        assert.isTrue(element._builder.addColumns.called);
 | 
			
		||||
 
 | 
			
		||||
@@ -115,18 +115,6 @@
 | 
			
		||||
    group.element = element;
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  GrDiffBuilder.prototype.renderSection = function(element) {
 | 
			
		||||
    for (let i = 0; i < this.groups.length; i++) {
 | 
			
		||||
      const group = this.groups[i];
 | 
			
		||||
      if (group.element === element) {
 | 
			
		||||
        const newElement = this.buildSectionElement(group);
 | 
			
		||||
        group.element.parentElement.replaceChild(newElement, group.element);
 | 
			
		||||
        group.element = newElement;
 | 
			
		||||
        break;
 | 
			
		||||
      }
 | 
			
		||||
    }
 | 
			
		||||
  };
 | 
			
		||||
 | 
			
		||||
  GrDiffBuilder.prototype.getGroupsByLineRange = function(
 | 
			
		||||
      startLine, endLine, opt_side) {
 | 
			
		||||
    const groups = [];
 | 
			
		||||
 
 | 
			
		||||
@@ -181,7 +181,7 @@
 | 
			
		||||
              }
 | 
			
		||||
              // If we are done, resolve the promise.
 | 
			
		||||
              if (state.chunkIndex >= chunks.length) {
 | 
			
		||||
                resolve(this.groups);
 | 
			
		||||
                resolve();
 | 
			
		||||
                this._nextStepHandle = null;
 | 
			
		||||
                return;
 | 
			
		||||
              }
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user