Get rid of global GrDiffBuilderBinary
* Replace the global GrDiffBuilderBinary variable with named imports.
* Update gr-app-global-var-init.js
Change-Id: I2140fa302c781c3660b17ecb0b4d8492c7f91d90
diff --git a/polygerrit-ui/app/.eslintrc.js b/polygerrit-ui/app/.eslintrc.js
index ff381c9..b66b758 100644
--- a/polygerrit-ui/app/.eslintrc.js
+++ b/polygerrit-ui/app/.eslintrc.js
@@ -177,7 +177,6 @@
"GrChangeReplyInterface": "readonly",
"GrChangeViewApi": "readonly",
"GrCountStringFormatter": "readonly",
- "GrDiffBuilderBinary": "readonly",
"GrDomHook": "readonly",
"GrDomHooksManager": "readonly",
"GrEditConstants": "readonly",
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-binary.js b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-binary.js
index 217ee19..a65fdca 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-binary.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-binary.js
@@ -17,34 +17,25 @@
import {GrDiffBuilder} from './gr-diff-builder.js';
-(function(window) {
- 'use strict';
+/** @constructor */
+export function GrDiffBuilderBinary(diff, prefs, outputEl) {
+ GrDiffBuilder.call(this, diff, prefs, outputEl);
+}
- // Prevent redefinition.
- if (window.GrDiffBuilderBinary) { return; }
+GrDiffBuilderBinary.prototype = Object.create(GrDiffBuilder.prototype);
+GrDiffBuilderBinary.prototype.constructor = GrDiffBuilderBinary;
- /** @constructor */
- function GrDiffBuilderBinary(diff, prefs, outputEl) {
- GrDiffBuilder.call(this, diff, prefs, outputEl);
- }
+// This method definition is a no-op to satisfy the parent type.
+GrDiffBuilderBinary.prototype.addColumns = function(outputEl, fontSize) {};
- GrDiffBuilderBinary.prototype = Object.create(GrDiffBuilder.prototype);
- GrDiffBuilderBinary.prototype.constructor = GrDiffBuilderBinary;
-
- // This method definition is a no-op to satisfy the parent type.
- GrDiffBuilderBinary.prototype.addColumns = function(outputEl, fontSize) {};
-
- GrDiffBuilderBinary.prototype.buildSectionElement = function() {
- const section = this._createElement('tbody', 'binary-diff');
- const row = this._createElement('tr');
- const cell = this._createElement('td');
- const label = this._createElement('label');
- label.textContent = 'Difference in binary files';
- cell.appendChild(label);
- row.appendChild(cell);
- section.appendChild(row);
- return section;
- };
-
- window.GrDiffBuilderBinary = GrDiffBuilderBinary;
-})(window);
+GrDiffBuilderBinary.prototype.buildSectionElement = function() {
+ const section = this._createElement('tbody', 'binary-diff');
+ const row = this._createElement('tr');
+ const cell = this._createElement('td');
+ const label = this._createElement('label');
+ label.textContent = 'Difference in binary files';
+ cell.appendChild(label);
+ row.appendChild(cell);
+ section.appendChild(row);
+ return section;
+};
diff --git a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element.js b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element.js
index d9b9bb3..7b8535d 100644
--- a/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element.js
+++ b/polygerrit-ui/app/elements/diff/gr-diff-builder/gr-diff-builder-element.js
@@ -22,7 +22,6 @@
import '../gr-ranged-comment-layer/gr-ranged-comment-layer.js';
import '../../../scripts/util.js';
import './gr-diff-builder-side-by-side.js';
-import './gr-diff-builder-binary.js';
import {dom} from '@polymer/polymer/lib/legacy/polymer.dom.js';
import {GestureEventListeners} from '@polymer/polymer/lib/mixins/gesture-event-listeners.js';
import {LegacyElementMixin} from '@polymer/polymer/lib/legacy/legacy-element-mixin.js';
@@ -33,6 +32,7 @@
import {GrDiffBuilderSideBySide} from './gr-diff-builder-side-by-side.js';
import {GrDiffBuilderImage} from './gr-diff-builder-image.js';
import {GrDiffBuilderUnified} from './gr-diff-builder-unified.js';
+import {GrDiffBuilderBinary} from './gr-diff-builder-binary.js';
const DiffViewMode = {
SIDE_BY_SIDE: 'SIDE_BY_SIDE',
diff --git a/polygerrit-ui/app/elements/gr-app-global-var-init.js b/polygerrit-ui/app/elements/gr-app-global-var-init.js
index 2893b16..9d5d5af 100644
--- a/polygerrit-ui/app/elements/gr-app-global-var-init.js
+++ b/polygerrit-ui/app/elements/gr-app-global-var-init.js
@@ -31,6 +31,7 @@
import {GrDiffBuilderSideBySide} from './diff/gr-diff-builder/gr-diff-builder-side-by-side.js';
import {GrDiffBuilderImage} from './diff/gr-diff-builder/gr-diff-builder-image.js';
import {GrDiffBuilderUnified} from './diff/gr-diff-builder/gr-diff-builder-unified.js';
+import {GrDiffBuilderBinary} from './diff/gr-diff-builder/gr-diff-builder-binary.js';
export function initGlobalVariables() {
window.GrDisplayNameUtils = GrDisplayNameUtils;
@@ -42,4 +43,5 @@
window.GrDiffBuilderSideBySide = GrDiffBuilderSideBySide;
window.GrDiffBuilderImage = GrDiffBuilderImage;
window.GrDiffBuilderUnified = GrDiffBuilderUnified;
+ window.GrDiffBuilderBinary = GrDiffBuilderBinary;
}
