Skip to content

Commit bb7ab95

Browse files
authored
deprecated Class.setOptions (#2531)
* deprecated Class.setOptions * updates
1 parent 93ba060 commit bb7ab95

File tree

5 files changed

+12
-7
lines changed

5 files changed

+12
-7
lines changed

packages/maptalks/src/core/Class.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ class Class {
5757
* @param options - options to set
5858
*/
5959
constructor(options?: ClassOptions) {
60-
if (!this || !this.setOptions) {
60+
if (!this || !this._setOptions) {
6161
throw new Error('Class instance is being created without "new" operator.');
6262
}
63-
this.setOptions(options);
63+
this._setOptions(options);
6464
this.callInitHooks();
6565
this._isUpdatingOptions = false;
6666
}
@@ -107,7 +107,7 @@ class Class {
107107
* Merges options with the default options of the object.
108108
* @param options - options to set
109109
*/
110-
setOptions(options: ClassOptions) {
110+
_setOptions(options: ClassOptions) {
111111
if (!this.hasOwnProperty('options') || isNil(this.options)) {
112112
this.options = this.options ? Object.create(this.options) : {};
113113
}
@@ -120,6 +120,11 @@ class Class {
120120
return this;
121121
}
122122

123+
setOptions(options: ClassOptions) {
124+
console.warn('setOptions(options) It is a private method and deprecated, please use _setOptions(options) instead. If you want to update options, please use config(options) instead.');
125+
return this._setOptions(options);
126+
}
127+
123128
/**
124129
*
125130
* 更新options中指定的配置项。

packages/maptalks/src/geometry/Geometry.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@ export class Geometry extends JSONAble(Eventable(Handlerable(Class))) {
13311331
delete opts['symbol'];
13321332
delete opts['id'];
13331333
delete opts['properties'];
1334-
this.setOptions(opts);
1334+
this._setOptions(opts);
13351335
if (symbol) {
13361336
this.setSymbol(symbol);
13371337
}

packages/maptalks/src/geometry/ext/Geometry.InfoWindow.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ Geometry.include(/** @lends Geometry.prototype */ {
4545
}
4646
this._infoWinOptions = extend({}, options);
4747
if (this._infoWindow) {
48-
this._infoWindow.setOptions(options);
48+
this._infoWindow._setOptions(options);
4949
} else if (this.getMap()) {
5050
this._bindInfoWindow();
5151
}

packages/maptalks/src/layer/tile/WMSTileLayer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class WMSTileLayer extends TileLayer {
6868
wmsExcludeParams = extend({}, this.options);
6969
}
7070
this.wmsParams = extend({} as WMSTileLayerOptionsType, defaultWmsParams);
71-
this.setOptions(options);
71+
this._setOptions(options);
7272
this.setZIndex(options.zIndex);
7373
if (!Browser.proxy) {
7474
this._optionsHook(options);

packages/maptalks/src/ui/Menuable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const Menuable = {
6565
this._menuOptions = options;
6666

6767
if (this._menu) {
68-
this._menu.setOptions(options);
68+
this._menu._setOptions(options);
6969
} else {
7070
this.on('contextmenu', this._defaultOpenMenu, this);
7171
}

0 commit comments

Comments
 (0)