Commit c3c1fc66 authored by ZER0's avatar ZER0
Browse files

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

MozReview-Commit-ID: 2OMlzrez6w1
parent b5ba1bbb

devtools/client/shared/widgets/tooltip/SwatchColorPickerTooltip.js

+2 −2
Original line number Diff line number Diff line
@@ -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

devtools/client/shared/widgets/tooltip/SwatchCubicBezierTooltip.js

+2 −2
Original line number Diff line number Diff line
@@ -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

devtools/client/shared/widgets/tooltip/SwatchFilterTooltip.js

+2 −2
Original line number Diff line number Diff line
@@ -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