@urso/core 0.4.11 → 0.4.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@urso/core",
-  "version": "0.4.11",
+  "version": "0.4.15",
   "description": "HTML5 game engine",
   "main": "build/js/index.js",
   "author": "Megbrimef",

package/src/js/modules/objects/models/button.js

@@ -31,6 +31,7 @@ class ModulesObjectsModelsButton extends Urso.Core.Modules.Objects.BaseModel {
         this.keyDownAction = Urso.helper.recursiveGet('keyDownAction', params, false);
         this.mouseOverAction = Urso.helper.recursiveGet('mouseOverAction', params, false);
         this.mouseOutAction = Urso.helper.recursiveGet('mouseOutAction', params, false);
+        this.noActionOnMouseOut = Urso.helper.recursiveGet('noActionOnMouseOut', params, Urso.device.desktop ? true : false);
 
         this.buttonFrames = {
             over: Urso.helper.recursiveGet('buttonFrames.over', params, false),
@@ -48,9 +49,9 @@ class ModulesObjectsModelsButton extends Urso.Core.Modules.Objects.BaseModel {
 
         if (this._isOver)
             this._changeTexture('over');
-        else if(this._isDown)
+        else if (this._isDown)
             this._changeTexture('pressed');
-        else if(this._isDisabled)
+        else if (this._isDisabled)
             this._changeTexture('disabled');
         else
             this._changeTexture('out');
@@ -66,6 +67,7 @@ class ModulesObjectsModelsButton extends Urso.Core.Modules.Objects.BaseModel {
             this._changeTexture('out');
 
         this._isDisabled = false;
+        this._baseObject.buttonMode = true;
     }
 
     disable() {
@@ -74,6 +76,7 @@ class ModulesObjectsModelsButton extends Urso.Core.Modules.Objects.BaseModel {
 
         this._changeTexture('disabled');
         this._isDisabled = true;
+        this._baseObject.buttonMode = false;
     }
 
     _addBaseObject() {
@@ -121,8 +124,10 @@ class ModulesObjectsModelsButton extends Urso.Core.Modules.Objects.BaseModel {
 
         this._isDown = false;
 
-        if (this.action)
-            this.action();
+        if (this.action) {
+            if (!this.noActionOnMouseOut || this._isOver) //if noActionOnMouseOut && mouse is out of button -> do nothing
+                this.action();
+        }
 
         if (this._isDisabled) //can be disabled after action
             return false;

package/src/js/modules/objects/models/textInput.js

@@ -15,7 +15,7 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
         this.box = Urso.helper.recursiveGet('box', params, false);
         this.numbersOnly = Urso.helper.recursiveGet('numbersOnly', params, false);
         this.allowedSymbols = Urso.helper.recursiveGet('allowedSymbols', params, false);
-        this.substituteText = Urso.helper.recursiveGet('substituteText', params, false);
+        //this.substituteText = Urso.helper.recursiveGet('substituteText', params, false); //todo remove this string
         this.maxLength = Urso.helper.recursiveGet('maxLength', params, false);
     }
 
@@ -53,7 +53,7 @@ class ModulesObjectsModelsTextInput extends Urso.Core.Modules.Objects.BaseModel
 
     _addBaseObject() {
         this._baseObject = new PIXI.TextInput({ input: this.input, box: this.box });
-        this._baseObject.substituteText = this.substituteText;
+        //this._baseObject.substituteText = this.substituteText;  //todo remove this string
 
         if(this.maxLength)
             this._baseObject.maxLength = this.maxLength

package/src/js/modules/objects/models/toggle.js

@@ -56,6 +56,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
             this._changeTexture(`${this.status}Out`);
 
         this._isDisabled = false;
+        this._baseObject.buttonMode = true;
     }
 
     disable() {
@@ -64,6 +65,7 @@ class ModulesObjectsModelsToggle extends UrsoCoreModulesObjectsModelsButton {
 
         this._changeTexture(`${this.status}Disabled`);
         this._isDisabled = true;
+        this._baseObject.buttonMode = false;
     }
 
     _addBaseObject() {