Skip to content

deprecated Class.setOptions #2531

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions packages/maptalks/src/core/Class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ class Class {
* @param options - options to set
*/
constructor(options?: ClassOptions) {
if (!this || !this.setOptions) {
if (!this || !this._setOptions) {
throw new Error('Class instance is being created without "new" operator.');
}
this.setOptions(options);
this._setOptions(options);
this.callInitHooks();
this._isUpdatingOptions = false;
}
Expand Down Expand Up @@ -107,7 +107,7 @@ class Class {
* Merges options with the default options of the object.
* @param options - options to set
*/
setOptions(options: ClassOptions) {
_setOptions(options: ClassOptions) {
if (!this.hasOwnProperty('options') || isNil(this.options)) {
this.options = this.options ? Object.create(this.options) : {};
}
Expand All @@ -120,6 +120,11 @@ class Class {
return this;
}

setOptions(options: ClassOptions) {
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.');
return this._setOptions(options);
}

/**
*
* 更新options中指定的配置项。
Expand Down
2 changes: 1 addition & 1 deletion packages/maptalks/src/geometry/Geometry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ export class Geometry extends JSONAble(Eventable(Handlerable(Class))) {
delete opts['symbol'];
delete opts['id'];
delete opts['properties'];
this.setOptions(opts);
this._setOptions(opts);
if (symbol) {
this.setSymbol(symbol);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/maptalks/src/geometry/ext/Geometry.InfoWindow.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Geometry.include(/** @lends Geometry.prototype */ {
}
this._infoWinOptions = extend({}, options);
if (this._infoWindow) {
this._infoWindow.setOptions(options);
this._infoWindow._setOptions(options);
} else if (this.getMap()) {
this._bindInfoWindow();
}
Expand Down
2 changes: 1 addition & 1 deletion packages/maptalks/src/layer/tile/WMSTileLayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class WMSTileLayer extends TileLayer {
wmsExcludeParams = extend({}, this.options);
}
this.wmsParams = extend({} as WMSTileLayerOptionsType, defaultWmsParams);
this.setOptions(options);
this._setOptions(options);
this.setZIndex(options.zIndex);
if (!Browser.proxy) {
this._optionsHook(options);
Expand Down
2 changes: 1 addition & 1 deletion packages/maptalks/src/ui/Menuable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const Menuable = {
this._menuOptions = options;

if (this._menu) {
this._menu.setOptions(options);
this._menu._setOptions(options);
} else {
this.on('contextmenu', this._defaultOpenMenu, this);
}
Expand Down