@urso/core 0.7.51 → 0.7.52
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/js/index.js +1 -1
- package/build/js/index.js.LICENSE.txt +87 -87
- package/package.json +1 -1
- package/src/js/components/debug/controller.js +1 -1
- package/src/js/components/deviceRotate/controller.js +2 -2
- package/src/js/components/editor/controller.js +1 -1
- package/src/js/components/fullscreen/controller.js +1 -1
- package/src/js/components/layersSwitcher/controller.js +3 -1
- package/src/js/components/loader/controller.js +17 -16
- package/src/js/components/soundInitialPopup/controller.js +1 -1
- package/src/js/components/stateDriven/controller.js +1 -1
- package/src/js/config/load.js +191 -5
- package/src/js/extra/{_info.js → main.js} +0 -6
- package/src/js/index.js +3 -4
- package/src/js/modules/assets/models/atlas.js +5 -3
- package/src/js/modules/assets/models/audiosprite.js +2 -1
- package/src/js/modules/assets/models/bitmapFont.js +3 -1
- package/src/js/modules/assets/models/container.js +3 -1
- package/src/js/modules/assets/models/font.js +3 -1
- package/src/js/modules/assets/models/html.js +3 -1
- package/src/js/modules/assets/models/image.js +3 -1
- package/src/js/modules/assets/models/json.js +3 -1
- package/src/js/modules/assets/models/sound.js +3 -1
- package/src/js/modules/assets/models/spine.js +3 -1
- package/src/js/modules/objects/baseModel.js +1 -1
- package/src/js/modules/objects/models/atlasImage.js +3 -1
- package/src/js/modules/objects/models/bitmapText.js +3 -1
- package/src/js/modules/objects/models/button.js +4 -1
- package/src/js/modules/objects/models/buttonComposite.js +3 -1
- package/src/js/modules/objects/models/component.js +3 -1
- package/src/js/modules/objects/models/container.js +3 -1
- package/src/js/modules/objects/models/emitter.js +3 -1
- package/src/js/modules/objects/models/emitterFx.js +8 -6
- package/src/js/modules/objects/models/graphics.js +3 -1
- package/src/js/modules/objects/models/group.js +3 -1
- package/src/js/modules/objects/models/hitArea.js +3 -1
- package/src/js/modules/objects/models/image.js +3 -1
- package/src/js/modules/objects/models/imagesAnimation.js +3 -1
- package/src/js/modules/objects/models/mask.js +3 -1
- package/src/js/modules/objects/models/nineSlicePlane.js +3 -1
- package/src/js/modules/objects/models/scrollbox.js +3 -1
- package/src/js/modules/objects/models/slider.js +8 -6
- package/src/js/modules/objects/models/spine.js +3 -1
- package/src/js/modules/objects/models/text.js +3 -1
- package/src/js/modules/objects/models/textInput.js +11 -9
- package/src/js/modules/objects/models/toggle.js +5 -6
- package/src/js/modules/objects/models/world.js +3 -1
- package/src/js/modules/transport/baseConnectionType.js +8 -7
- package/src/js/modules/transport/connectionTypes/websocket.js +16 -14
- package/src/js/modules/transport/connectionTypes/xhr.js +11 -9
- package/src/js/components/_info.js +0 -11
- package/src/js/components/base/_info.js +0 -3
- package/src/js/components/debug/_info.js +0 -7
- package/src/js/components/deviceRotate/_info.js +0 -3
- package/src/js/components/editor/_info.js +0 -4
- package/src/js/components/fullscreen/_info.js +0 -6
- package/src/js/components/layersSwitcher/_info.js +0 -4
- package/src/js/components/loader/_info.js +0 -4
- package/src/js/components/soundInitialPopup/_info.js +0 -4
- package/src/js/components/stateDriven/_info.js +0 -3
- package/src/js/lib/_info.js +0 -13
- package/src/js/modules/_info.js +0 -12
- package/src/js/modules/assets/_info.js +0 -7
- package/src/js/modules/assets/models/_info.js +0 -12
- package/src/js/modules/i18n/_info.js +0 -4
- package/src/js/modules/instances/_info.js +0 -3
- package/src/js/modules/logic/_info.js +0 -6
- package/src/js/modules/logic/config/_info.js +0 -3
- package/src/js/modules/objects/_info.js +0 -13
- package/src/js/modules/objects/models/_info.js +0 -27
- package/src/js/modules/observer/_info.js +0 -4
- package/src/js/modules/scenes/_info.js +0 -8
- package/src/js/modules/soundManager/_info.js +0 -4
- package/src/js/modules/statesManager/_info.js +0 -12
- package/src/js/modules/statesManager/actions/_info.js +0 -3
- package/src/js/modules/template/_info.js +0 -6
- package/src/js/modules/transport/_info.js +0 -9
- package/src/js/modules/transport/connectionTypes/_info.js +0 -4
- package/src/js/templates/_info.js +0 -4
- package/src/js/templates/groups/_info.js +0 -1
- package/src/js/templates/scenes/_info.js +0 -1
package/src/js/config/load.js
CHANGED
|
@@ -1,5 +1,191 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
1
|
+
//Urso namespace
|
|
2
|
+
window.Urso = {
|
|
3
|
+
//Core namespace
|
|
4
|
+
Core: {
|
|
5
|
+
Components: {
|
|
6
|
+
Base: {
|
|
7
|
+
Controller: require('../components/base/controller')
|
|
8
|
+
},
|
|
9
|
+
Debug: {
|
|
10
|
+
Controller: require('../components/debug/controller'),
|
|
11
|
+
Coords: require('../components/debug/coords'),
|
|
12
|
+
Fps: require('../components/debug/fps'),
|
|
13
|
+
Template: require('../components/debug/template'),
|
|
14
|
+
Timescale: require('../components/debug/timescale')
|
|
15
|
+
},
|
|
16
|
+
DeviceRotate: {
|
|
17
|
+
Controller: require('../components/deviceRotate/controller')
|
|
18
|
+
},
|
|
19
|
+
Editor: {
|
|
20
|
+
Controller: require('../components/editor/controller'),
|
|
21
|
+
Api: require('../components/editor/api')
|
|
22
|
+
},
|
|
23
|
+
Fullscreen: {
|
|
24
|
+
Android: require('../components/fullscreen/android'),
|
|
25
|
+
Controller: require('../components/fullscreen/controller'),
|
|
26
|
+
Desktop: require('../components/fullscreen/desktop'),
|
|
27
|
+
Ios: require('../components/fullscreen/ios')
|
|
28
|
+
},
|
|
29
|
+
LayersSwitcher: {
|
|
30
|
+
Controller: require('../components/layersSwitcher/controller'),
|
|
31
|
+
Config: require('../components/layersSwitcher/config')
|
|
32
|
+
},
|
|
33
|
+
Loader: {
|
|
34
|
+
Controller: require('../components/loader/controller'),
|
|
35
|
+
Template: require('../components/loader/template')
|
|
36
|
+
},
|
|
37
|
+
SoundInitialPopup: {
|
|
38
|
+
Controller: require('../components/soundInitialPopup/controller'),
|
|
39
|
+
Template: require('../components/soundInitialPopup/template')
|
|
40
|
+
},
|
|
41
|
+
StateDriven: {
|
|
42
|
+
Controller: require('../components/stateDriven/controller')
|
|
43
|
+
}
|
|
44
|
+
},
|
|
45
|
+
Config: {
|
|
46
|
+
Main: require('../config/main')
|
|
47
|
+
},
|
|
48
|
+
Extra: {
|
|
49
|
+
BrowserEvents: require('../extra/browserEvents'),
|
|
50
|
+
Main: require('../extra/main'),
|
|
51
|
+
PixiPatch: require('../extra/pixiPatch')
|
|
52
|
+
},
|
|
53
|
+
Lib: {
|
|
54
|
+
Cache: require('../lib/cache'),
|
|
55
|
+
Composition: require('../lib/composition'),
|
|
56
|
+
Device: require('../lib/device'),
|
|
57
|
+
Helper: require('../lib/helper'),
|
|
58
|
+
Loader: require('../lib/loader'),
|
|
59
|
+
LocalData: require('../lib/localData'),
|
|
60
|
+
Logger: require('../lib/logger'),
|
|
61
|
+
Math: require('../lib/math'),
|
|
62
|
+
ObjectPool: require('../lib/objectPool'),
|
|
63
|
+
Time: require('../lib/time'),
|
|
64
|
+
Tween: require('../lib/tween')
|
|
65
|
+
},
|
|
66
|
+
Modules: {
|
|
67
|
+
Assets: {
|
|
68
|
+
BaseModel: require('../modules/assets/baseModel'),
|
|
69
|
+
Config: require('../modules/assets/config'),
|
|
70
|
+
Controller: require('../modules/assets/controller'),
|
|
71
|
+
Service: require('../modules/assets/service'),
|
|
72
|
+
Models: {
|
|
73
|
+
Atlas: require('../modules/assets/models/atlas'),
|
|
74
|
+
Audiosprite: require('../modules/assets/models/audiosprite'),
|
|
75
|
+
BitmapFont: require('../modules/assets/models/bitmapFont'),
|
|
76
|
+
Container: require('../modules/assets/models/container'),
|
|
77
|
+
Font: require('../modules/assets/models/font'),
|
|
78
|
+
Html: require('../modules/assets/models/html'),
|
|
79
|
+
Image: require('../modules/assets/models/image'),
|
|
80
|
+
Json: require('../modules/assets/models/json'),
|
|
81
|
+
Sound: require('../modules/assets/models/sound'),
|
|
82
|
+
Spine: require('../modules/assets/models/spine')
|
|
83
|
+
}
|
|
84
|
+
},
|
|
85
|
+
I18n: {
|
|
86
|
+
Config: require('../modules/i18n/config'),
|
|
87
|
+
Controller: require('../modules/i18n/controller')
|
|
88
|
+
},
|
|
89
|
+
Instances: {
|
|
90
|
+
Controller: require('../modules/instances/controller')
|
|
91
|
+
},
|
|
92
|
+
Logic: {
|
|
93
|
+
Controller: require('../modules/logic/controller'),
|
|
94
|
+
Main: require('../modules/logic/main'),
|
|
95
|
+
Sounds: require('../modules/logic/sounds'),
|
|
96
|
+
Config: {
|
|
97
|
+
Sounds: require('../modules/logic/config/sounds')
|
|
98
|
+
}
|
|
99
|
+
},
|
|
100
|
+
Objects: {
|
|
101
|
+
BaseModel: require('../modules/objects/baseModel'),
|
|
102
|
+
Cache: require('../modules/objects/cache'),
|
|
103
|
+
Controller: require('../modules/objects/controller'),
|
|
104
|
+
Find: require('../modules/objects/find'),
|
|
105
|
+
PropertyAdapter: require('../modules/objects/propertyAdapter'),
|
|
106
|
+
Proxy: require('../modules/objects/proxy'),
|
|
107
|
+
Selector: require('../modules/objects/selector'),
|
|
108
|
+
Service: require('../modules/objects/service'),
|
|
109
|
+
Styles: require('../modules/objects/styles'),
|
|
110
|
+
Models: {
|
|
111
|
+
AtlasImage: require('../modules/objects/models/atlasImage'),
|
|
112
|
+
BitmapText: require('../modules/objects/models/bitmapText'),
|
|
113
|
+
Button: require('../modules/objects/models/button'),
|
|
114
|
+
ButtonComposite: require('../modules/objects/models/buttonComposite'),
|
|
115
|
+
Checkbox: require('../modules/objects/models/checkbox'),
|
|
116
|
+
Collection: require('../modules/objects/models/collection'),
|
|
117
|
+
Component: require('../modules/objects/models/component'),
|
|
118
|
+
Container: require('../modules/objects/models/container'),
|
|
119
|
+
DragContainer: require('../modules/objects/models/dragContainer'),
|
|
120
|
+
Emitter: require('../modules/objects/models/emitter'),
|
|
121
|
+
EmitterFx: require('../modules/objects/models/emitterFx'),
|
|
122
|
+
Graphics: require('../modules/objects/models/graphics'),
|
|
123
|
+
Group: require('../modules/objects/models/group'),
|
|
124
|
+
HitArea: require('../modules/objects/models/hitArea'),
|
|
125
|
+
Image: require('../modules/objects/models/image'),
|
|
126
|
+
ImagesAnimation: require('../modules/objects/models/imagesAnimation'),
|
|
127
|
+
Mask: require('../modules/objects/models/mask'),
|
|
128
|
+
NineSlicePlane: require('../modules/objects/models/nineSlicePlane'),
|
|
129
|
+
Scrollbox: require('../modules/objects/models/scrollbox'),
|
|
130
|
+
Slider: require('../modules/objects/models/slider'),
|
|
131
|
+
Spine: require('../modules/objects/models/spine'),
|
|
132
|
+
Text: require('../modules/objects/models/text'),
|
|
133
|
+
TextInput: require('../modules/objects/models/textInput'),
|
|
134
|
+
Toggle: require('../modules/objects/models/toggle'),
|
|
135
|
+
World: require('../modules/objects/models/world')
|
|
136
|
+
}
|
|
137
|
+
},
|
|
138
|
+
Observer: {
|
|
139
|
+
Controller: require('../modules/observer/controller'),
|
|
140
|
+
Events: require('../modules/observer/events')
|
|
141
|
+
},
|
|
142
|
+
Scenes: {
|
|
143
|
+
Controller: require('../modules/scenes/controller'),
|
|
144
|
+
Model: require('../modules/scenes/model'),
|
|
145
|
+
PixiWrapper: require('../modules/scenes/pixiWrapper'),
|
|
146
|
+
Resolutions: require('../modules/scenes/resolutions'),
|
|
147
|
+
ResolutionsConfig: require('../modules/scenes/resolutionsConfig'),
|
|
148
|
+
Service: require('../modules/scenes/service')
|
|
149
|
+
},
|
|
150
|
+
SoundManager: {
|
|
151
|
+
Controller: require('../modules/soundManager/controller'),
|
|
152
|
+
SoundSprite: require('../modules/soundManager/soundSprite')
|
|
153
|
+
},
|
|
154
|
+
StatesManager: {
|
|
155
|
+
Action: require('../modules/statesManager/action'),
|
|
156
|
+
All: require('../modules/statesManager/all'),
|
|
157
|
+
ConfigStates: require('../modules/statesManager/configStates'),
|
|
158
|
+
Controller: require('../modules/statesManager/controller'),
|
|
159
|
+
FunctionsStorage: require('../modules/statesManager/functionsStorage'),
|
|
160
|
+
Helper: require('../modules/statesManager/helper'),
|
|
161
|
+
Race: require('../modules/statesManager/race'),
|
|
162
|
+
Sequence: require('../modules/statesManager/sequence'),
|
|
163
|
+
Actions: {
|
|
164
|
+
//put your custom actions here
|
|
165
|
+
}
|
|
166
|
+
},
|
|
167
|
+
Template: {
|
|
168
|
+
Controller: require('../modules/template/controller'),
|
|
169
|
+
Model: require('../modules/template/model'),
|
|
170
|
+
Service: require('../modules/template/service'),
|
|
171
|
+
Types: require('../modules/template/types')
|
|
172
|
+
},
|
|
173
|
+
Transport: {
|
|
174
|
+
BaseConnectionType: require('../modules/transport/baseConnectionType'),
|
|
175
|
+
Config: require('../modules/transport/config'),
|
|
176
|
+
Controller: require('../modules/transport/controller'),
|
|
177
|
+
Decorator: require('../modules/transport/decorator'),
|
|
178
|
+
Service: require('../modules/transport/service'),
|
|
179
|
+
ConnectionTypes: {
|
|
180
|
+
Websocket: require('../modules/transport/connectionTypes/websocket'),
|
|
181
|
+
Xhr: require('../modules/transport/connectionTypes/xhr')
|
|
182
|
+
}
|
|
183
|
+
}
|
|
184
|
+
},
|
|
185
|
+
Templates: {
|
|
186
|
+
Groups: {},
|
|
187
|
+
Scenes: {}
|
|
188
|
+
},
|
|
189
|
+
App: require('../app')
|
|
190
|
+
}
|
|
191
|
+
};
|
package/src/js/index.js
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
window.Urso = { Core: {} };
|
|
2
|
-
|
|
3
1
|
require('./config/load.js');
|
|
4
|
-
|
|
5
|
-
|
|
2
|
+
|
|
3
|
+
//main config
|
|
4
|
+
Urso.config = Urso.Core.Config.Main;
|
|
6
5
|
|
|
7
6
|
//function to run game with engine
|
|
8
7
|
Urso.runGame = (new Urso.Core.App()).setup;
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesAssetsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesAssetsModelsAtlas extends ModulesAssetsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
|
|
5
7
|
this.type = Urso.types.assets.ATLAS;
|
|
6
8
|
}
|
|
7
|
-
|
|
9
|
+
|
|
8
10
|
// cacheTextures: if true - add atlas parced textures in Urso textures cache with it's file name as asset key.
|
|
9
11
|
// Example - atlas texture with path 'atlasPath/image/image_01.png' will be saved in cache with a key 'image_01'.
|
|
10
12
|
setupParams(params) {
|
|
11
13
|
super.setupParams(params);
|
|
12
|
-
|
|
14
|
+
|
|
13
15
|
this.cacheTextures = Urso.helper.recursiveGet('cacheTextures', params, false);
|
|
14
16
|
}
|
|
15
17
|
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
const { Howler } = require("howler");
|
|
2
|
+
const ModulesAssetsBaseModel = require('./../baseModel');
|
|
2
3
|
|
|
3
|
-
class ModulesAssetsModelsAudiosprite extends
|
|
4
|
+
class ModulesAssetsModelsAudiosprite extends ModulesAssetsBaseModel {
|
|
4
5
|
constructor(params) {
|
|
5
6
|
super(params);
|
|
6
7
|
|
|
@@ -8,7 +8,10 @@
|
|
|
8
8
|
}
|
|
9
9
|
}*/
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
|
|
12
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
13
|
+
|
|
14
|
+
class ModulesObjectsModelsButton extends ModulesObjectsBaseModel {
|
|
12
15
|
constructor(params) {
|
|
13
16
|
super(params);
|
|
14
17
|
|
|
@@ -8,7 +8,9 @@ buttonModel = {
|
|
|
8
8
|
}
|
|
9
9
|
}*/
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
12
|
+
|
|
13
|
+
class ModulesObjectsModelsButtonComposite extends ModulesObjectsBaseModel {
|
|
12
14
|
constructor(params) {
|
|
13
15
|
super(params);
|
|
14
16
|
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesObjectsModelsEmitterFx extends ModulesObjectsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
|
|
@@ -8,7 +10,7 @@ class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel
|
|
|
8
10
|
this.update = this.update.bind(this);
|
|
9
11
|
|
|
10
12
|
this._addBaseObject();
|
|
11
|
-
this._createBundle();
|
|
13
|
+
this._createBundle();
|
|
12
14
|
}
|
|
13
15
|
|
|
14
16
|
/**
|
|
@@ -55,15 +57,15 @@ class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel
|
|
|
55
57
|
* Stops emitter. If new emitter wasn't inited before particles disappears - clears this._emitter to stop bundle update.
|
|
56
58
|
*/
|
|
57
59
|
stop() {
|
|
58
|
-
if(!this._emitter)
|
|
60
|
+
if (!this._emitter)
|
|
59
61
|
return;
|
|
60
62
|
|
|
61
63
|
this._emitter.stop();
|
|
62
64
|
this._emitter.on.completed.add(() => {
|
|
63
|
-
if(!this._isActive)
|
|
65
|
+
if (!this._isActive)
|
|
64
66
|
this._emitter = null;
|
|
65
67
|
});
|
|
66
|
-
|
|
68
|
+
|
|
67
69
|
this._isActive = false;
|
|
68
70
|
}
|
|
69
71
|
|
|
@@ -75,7 +77,7 @@ class ModulesObjectsModelsEmitterFx extends Urso.Core.Modules.Objects.BaseModel
|
|
|
75
77
|
this._bundle = new PIXI.particlesFx.FX();
|
|
76
78
|
let fx_settings_data = Urso.cache.getJson(this.cfg).data;
|
|
77
79
|
|
|
78
|
-
if(this.spritesheetFilter)
|
|
80
|
+
if (this.spritesheetFilter)
|
|
79
81
|
fx_settings_data.spritesheetFilter = this.spritesheetFilter;
|
|
80
82
|
|
|
81
83
|
this._defaultEmitterName = fx_settings_data.emitters[0].name;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesObjectsModelsHitArea extends ModulesObjectsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
this._isDisabled = false;
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesObjectsModelsImagesAnimation extends ModulesObjectsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesObjectsModelsNineSlicePlane extends ModulesObjectsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesObjectsModelsSlider extends ModulesObjectsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
|
|
@@ -19,7 +21,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
|
|
|
19
21
|
const anchorType = this.sizeKey === 'width' ? 'anchorX' : 'anchorY';
|
|
20
22
|
const anchor = this._sliderHandle[anchorType];
|
|
21
23
|
const handleSize = this._sliderHandle[this.sizeKey];
|
|
22
|
-
return this._sliderBg._baseObject[this.sizeKey] - handleSize + handleSize * anchor * 2;
|
|
24
|
+
return this._sliderBg._baseObject[this.sizeKey] - handleSize + handleSize * anchor * 2;
|
|
23
25
|
}
|
|
24
26
|
|
|
25
27
|
setupParams(params) {
|
|
@@ -47,7 +49,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
|
|
|
47
49
|
position[this.positionKey] = targetPosition;
|
|
48
50
|
|
|
49
51
|
const { coord, value } = this._calculateClosestPoint(position);
|
|
50
|
-
this._setNewValue(
|
|
52
|
+
this._setNewValue(coord, value);
|
|
51
53
|
}
|
|
52
54
|
|
|
53
55
|
/**
|
|
@@ -174,7 +176,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
|
|
|
174
176
|
*/
|
|
175
177
|
_addBaseObject() {
|
|
176
178
|
this._baseObject = new PIXI.Container();
|
|
177
|
-
|
|
179
|
+
|
|
178
180
|
this._setPoints();
|
|
179
181
|
this._setVariables();
|
|
180
182
|
this._createSliderTextures();
|
|
@@ -262,7 +264,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
|
|
|
262
264
|
* Sets given default value or 0.
|
|
263
265
|
*/
|
|
264
266
|
_setDefaultValue() {
|
|
265
|
-
if(!this.defaultValue)
|
|
267
|
+
if (!this.defaultValue)
|
|
266
268
|
this.defaultValue = this._points[0];
|
|
267
269
|
|
|
268
270
|
if (!this._points.includes(this.defaultValue))
|
|
@@ -310,7 +312,7 @@ class ModulesObjectsModelsSlider extends Urso.Core.Modules.Objects.BaseModel {
|
|
|
310
312
|
}
|
|
311
313
|
}
|
|
312
314
|
}
|
|
313
|
-
|
|
315
|
+
|
|
314
316
|
return { coord, value };
|
|
315
317
|
}
|
|
316
318
|
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
-
|
|
1
|
+
const ModulesObjectsBaseModel = require('./../baseModel');
|
|
2
|
+
|
|
3
|
+
class ModulesObjectsModelsTextInput extends ModulesObjectsBaseModel {
|
|
2
4
|
constructor(params) {
|
|
3
5
|
super(params);
|
|
4
6
|
|
|
@@ -23,12 +25,12 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
|
|
|
23
25
|
this._baseObject.restrict = allowedSymbols;
|
|
24
26
|
}
|
|
25
27
|
|
|
26
|
-
disable(){
|
|
27
|
-
this._baseObject.disabled = true
|
|
28
|
+
disable() {
|
|
29
|
+
this._baseObject.disabled = true
|
|
28
30
|
}
|
|
29
31
|
|
|
30
|
-
enable(){
|
|
31
|
-
this._baseObject.disabled = false
|
|
32
|
+
enable() {
|
|
33
|
+
this._baseObject.disabled = false
|
|
32
34
|
}
|
|
33
35
|
|
|
34
36
|
_setRestrictedSymbosl() {
|
|
@@ -40,14 +42,14 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
|
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
44
|
|
|
43
|
-
_onBlur(){
|
|
44
|
-
const data = {name: this.name, class: this.class, id: this.id, text: this.text};
|
|
45
|
+
_onBlur() {
|
|
46
|
+
const data = { name: this.name, class: this.class, id: this.id, text: this.text };
|
|
45
47
|
this.emit(Urso.events.MODULES_OBJECTS_TEXTINPUT_BLUR, data);
|
|
46
48
|
}
|
|
47
49
|
|
|
48
50
|
_onInput() {
|
|
49
51
|
this.text = this._baseObject.text;
|
|
50
|
-
const data = {name: this.name, class: this.class, id: this.id, text: this.text};
|
|
52
|
+
const data = { name: this.name, class: this.class, id: this.id, text: this.text };
|
|
51
53
|
this.emit(Urso.events.MODULES_OBJECTS_TEXTINPUT_INPUT, data);
|
|
52
54
|
}
|
|
53
55
|
|
|
@@ -55,7 +57,7 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
|
|
|
55
57
|
this._baseObject = new PIXI.TextInput({ input: this.input, box: this.box });
|
|
56
58
|
//this._baseObject.substituteText = this.substituteText; //todo remove this string
|
|
57
59
|
|
|
58
|
-
if(this.maxLength)
|
|
60
|
+
if (this.maxLength)
|
|
59
61
|
this._baseObject.maxLength = this.maxLength
|
|
60
62
|
|
|
61
63
|
this._baseObject.on('blur', this._onBlur.bind(this))
|