Bug 1378847 - Replaced SDK `extend` with DevTools `extend`; r=jdescottes

MozReview-Commit-ID: 2OMlzrez6w1
This commit is contained in:
ZER0 2017-08-25 17:46:37 +02:00
Родитель b5ba1bbb3c
Коммит c3c1fc66d4
3 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -13,7 +13,7 @@ const SwatchBasedEditorTooltip = require("devtools/client/shared/widgets/tooltip
const {LocalizationHelper} = require("devtools/shared/l10n");
const L10N = new LocalizationHelper("devtools/client/locales/inspector.properties");
const Heritage = require("sdk/core/heritage");
const {extend} = require("devtools/shared/extend");
const colorWidgetPref = "devtools.inspector.colorWidget.enabled";
const NEW_COLOR_WIDGET = Services.prefs.getBoolPref(colorWidgetPref);
@ -50,7 +50,7 @@ function SwatchColorPickerTooltip(document,
this.cssColor4 = supportsCssColor4ColorFunction();
}
SwatchColorPickerTooltip.prototype = Heritage.extend(SwatchBasedEditorTooltip.prototype, {
SwatchColorPickerTooltip.prototype = extend(SwatchBasedEditorTooltip.prototype, {
/**
* Fill the tooltip with a new instance of the spectrum color picker widget
* initialized with the given color, and return the instance of spectrum

Просмотреть файл

@ -9,7 +9,7 @@ const {Task} = require("devtools/shared/task");
const {CubicBezierWidget} = require("devtools/client/shared/widgets/CubicBezierWidget");
const SwatchBasedEditorTooltip = require("devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip");
const Heritage = require("sdk/core/heritage");
const {extend} = require("devtools/shared/extend");
const XHTML_NS = "http://www.w3.org/1999/xhtml";
@ -34,7 +34,7 @@ function SwatchCubicBezierTooltip(document) {
this._onUpdate = this._onUpdate.bind(this);
}
SwatchCubicBezierTooltip.prototype = Heritage.extend(SwatchBasedEditorTooltip.prototype, {
SwatchCubicBezierTooltip.prototype = extend(SwatchBasedEditorTooltip.prototype, {
/**
* Fill the tooltip with a new instance of the cubic-bezier widget
* initialized with the given value, and return a promise that resolves to

Просмотреть файл

@ -8,7 +8,7 @@ const {Task} = require("devtools/shared/task");
const {CSSFilterEditorWidget} = require("devtools/client/shared/widgets/FilterWidget");
const SwatchBasedEditorTooltip = require("devtools/client/shared/widgets/tooltip/SwatchBasedEditorTooltip");
const Heritage = require("sdk/core/heritage");
const {extend} = require("devtools/shared/extend");
const XHTML_NS = "http://www.w3.org/1999/xhtml";
@ -36,7 +36,7 @@ function SwatchFilterTooltip(document, cssIsValid) {
this._onUpdate = this._onUpdate.bind(this);
}
SwatchFilterTooltip.prototype = Heritage.extend(SwatchBasedEditorTooltip.prototype, {
SwatchFilterTooltip.prototype = extend(SwatchBasedEditorTooltip.prototype, {
/**
* Fill the tooltip with a new instance of the CSSFilterEditorWidget
* widget initialized with the given filter value, and return a promise