@@ -7,13 +7,12 @@ import tabManager from '../tabbedView.js';
77import * as hover from '../hover.js' ;
88import each from '../each.js' ;
99import wrap from '../2.pokemon.js' ;
10- import SettingType from './types/setting.js' ;
1110import AdvancedMap from './types/map2.js' ;
1211import * as types from './types/index.js' ;
1312import { translateText } from '../translate.js' ;
1413import RegisteredSetting from './RegisteredSetting.js' ;
1514import styles from './settings.css' ;
16- import { registry } from './settingRegistry.js' ;
15+ import { isSettingType , registry } from './settingRegistry.js' ;
1716
1817const defaultSetting = new RegisteredSetting ( ) ;
1918
@@ -233,7 +232,7 @@ export function register(data) {
233232 setting . data = data . options ;
234233 }
235234
236- if ( ! ( setting . type instanceof SettingType ) ) {
235+ if ( ! isSettingType ( setting . type ) ) {
237236 switch ( typeof setting . type ) {
238237 case 'string' :
239238 setting . type = registry . get ( setting . type ) ;
@@ -254,7 +253,7 @@ export function register(data) {
254253 default : break ;
255254 }
256255 }
257- if ( ! ( setting . type instanceof SettingType ) ) return undefined ; // TODO: Throw error?
256+ if ( ! isSettingType ( setting . type ) ) return undefined ; // TODO: Throw error?
258257
259258 const conf = init ( page ) ;
260259
@@ -440,7 +439,7 @@ export function on(...args) {
440439}
441440
442441export function registerType ( type , addStyle = style . add ) {
443- if ( ! ( type instanceof SettingType ) ) throw new Error ( `SettingType: Tried to register object of: ${ typeof type } ` ) ;
442+ if ( ! isSettingType ( type ) ) throw new Error ( `SettingType: Tried to register object of: ${ typeof type } ` ) ;
444443 const name = type . name ;
445444 if ( ! name || registry . has ( name ) ) throw new Error ( `SettingType: "${ name } " already exists` ) ;
446445 registry . set ( name , type ) ;
0 commit comments