@urso/core 0.8.20-dev → 0.9.0-dev

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

@@ -1,209 +1,208 @@
-/*buttonModel = {
-    name: 'someButton',
-    buttonFrames:{
-        over: 'over.png', //asset key or container object
-        out: 'out.png',
-        pressed: 'pressed.png',
-        disabled: 'disabled.png'
-    }
-}*/
-
-
-const ModulesObjectsBaseModel = require('./../baseModel');
-
-class ModulesObjectsModelsButton extends ModulesObjectsBaseModel {
-    constructor(params) {
-        super(params);
-
-        this._isOver = false;
-        this._isDown = false;
-        this._isDisabled = false;
-        this._textures;
-
-        this.type = Urso.types.objects.BUTTON;
-        this._addBaseObject();
-
-        this.enable = this.enable.bind(this);
-        this.disable = this.disable.bind(this);
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.action = Urso.helper.recursiveGet('action', params, () => { this.emit(Urso.events.MODULES_OBJECTS_BUTTON_PRESS, { name: this.name, class: this.class }) });
-        this.disableRightClick = Urso.helper.recursiveGet('disableRightClick', params, false);
-        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, this._checkIsDesktop());
-        this.handlePointerUpOutside = Urso.helper.recursiveGet('handlePointerUpOutside', params, true);
-
-        this.buttonFrames = {
-            over: Urso.helper.recursiveGet('buttonFrames.over', params, false),
-            out: Urso.helper.recursiveGet('buttonFrames.out', params, false),
-            pressed: Urso.helper.recursiveGet('buttonFrames.pressed', params, false),
-            disabled: Urso.helper.recursiveGet('buttonFrames.disabled', params, false),
-        }
-
-        this.pixelPerfectOver = Urso.helper.recursiveGet('pixelPerfectOver', params, true);
-        this.pixelPerfectClick = Urso.helper.recursiveGet('pixelPerfectClick', params, true);
-    }
-
-    _checkIsDesktop() {
-        return Urso.device.desktop && !Urso.helper.isIpadOS();
-    }
-
-    setButtonFrame(key, assetKey) {
-        this.buttonFrames[key] = assetKey;
-
-        if (this._isOver)
-            this._changeTexture('over');
-        else if (this._isDown)
-            this._changeTexture('pressed');
-        else if (this._isDisabled)
-            this._changeTexture('disabled');
-        else
-            this._changeTexture('out');
-    }
-
-    enable() {
-        if (!this._isDisabled)
-            return false;
-
-        if (this._isOver)
-            this._changeTexture('over');
-        else
-            this._changeTexture('out');
-
-        this._isDisabled = false;
-        this._baseObject.buttonMode = true;
-        this._baseObject.interactive = true;
-    }
-
-    disable() {
-        if (this._isDisabled)
-            return false;
-
-        this._changeTexture('disabled');
-        this._isDisabled = true;
-        this._baseObject.buttonMode = false;
-        this._baseObject.interactive = false;
-    }
-
-    _addBaseObject() {
-        this._baseObject = new PIXI.Sprite();
-        this._changeTexture('out');
-
-        this._baseObject.interactive = true;
-        this._baseObject.buttonMode = true;
-
-        if (this.pixelPerfectOver) {
-            //todo
-        }
-
-        if (this.pixelPerfectClick) {
-            //todo
-        }
-
-        this._baseObject
-            .on('pointerdown', this._onButtonDown.bind(this))
-            .on('pointerup', this._onButtonUp.bind(this))
-            .on('pointerover', this._onButtonOver.bind(this))
-            .on('pointerout', this._onButtonOut.bind(this));
-
-        if (this.handlePointerUpOutside) {
-            this._baseObject.on('pointerupoutside', this._onButtonUp.bind(this))
-        }
-
-    };
-
-    _onButtonDown(event) {
-        if (this._isDisabled)
-            return false;
-
-        if (this.disableRightClick && event.data.button !== 0)
-            return;
-
-        this._isDown = true;
-
-        if (this.keyDownAction)
-            this.keyDownAction();
-
-        if (this._isDisabled) //can be disabled after keyDownAction
-            return false;
-
-        this._changeTexture('pressed');
-    }
-
-    _onButtonUp(event) {
-        if (this._isDisabled || !this._isDown)
-            return false;
-
-        if (this.disableRightClick && event.data.button !== 0)
-            return;
-
-        this._isDown = false;
-
-        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;
-
-        if (this._isOver)
-            this._changeTexture('over');
-        else
-            this._changeTexture('out');
-    }
-
-    _onButtonOver() {
-        this._isOver = true;
-
-        if (this._isDisabled)
-            return false;
-
-        if (this._isDown)
-            return;
-
-        if (this.mouseOverAction)
-            this.mouseOverAction();
-
-        this._changeTexture('over');
-    }
-
-    _onButtonOut() {
-        this._isOver = false;
-
-        if (this._isDisabled)
-            return false;
-
-        if (this._isDown)
-            return;
-
-        if (this.mouseOutAction)
-            this.mouseOutAction();
-
-        this._changeTexture('out');
-    }
-
-    _changeTexture(key) {
-        let texture = Urso.cache.getTexture(this.buttonFrames[key]);
-
-        if (!texture) {
-            if (key === 'out') {
-                Urso.logger.error('ModulesObjectsModelsButton assets error: no out image ' + this.buttonFrames.out);
-                return false;
-            }
-
-            this._changeTexture('out'); // load default texture for this key
-            return false;
-        }
-
-        this._baseObject.texture = texture;
-        return true;
-    }
-}
-
-module.exports = ModulesObjectsModelsButton;
+/*buttonModel = {
+    name: 'someButton',
+    buttonFrames:{
+        over: 'over.png', //asset key or container object
+        out: 'out.png',
+        pressed: 'pressed.png',
+        disabled: 'disabled.png'
+    }
+}*/
+
+import ModulesObjectsBaseModel from './../baseModel';
+
+class ModulesObjectsModelsButton extends ModulesObjectsBaseModel {
+    constructor(params) {
+        super(params);
+
+        this._isOver = false;
+        this._isDown = false;
+        this._isDisabled = false;
+        this._textures;
+
+        this.type = Urso.types.objects.BUTTON;
+        this._addBaseObject();
+
+        this.enable = this.enable.bind(this);
+        this.disable = this.disable.bind(this);
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.action = Urso.helper.recursiveGet('action', params, () => { this.emit(Urso.events.MODULES_OBJECTS_BUTTON_PRESS, { name: this.name, class: this.class }) });
+        this.disableRightClick = Urso.helper.recursiveGet('disableRightClick', params, false);
+        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, this._checkIsDesktop());
+        this.handlePointerUpOutside = Urso.helper.recursiveGet('handlePointerUpOutside', params, true);
+
+        this.buttonFrames = {
+            over: Urso.helper.recursiveGet('buttonFrames.over', params, false),
+            out: Urso.helper.recursiveGet('buttonFrames.out', params, false),
+            pressed: Urso.helper.recursiveGet('buttonFrames.pressed', params, false),
+            disabled: Urso.helper.recursiveGet('buttonFrames.disabled', params, false),
+        }
+
+        this.pixelPerfectOver = Urso.helper.recursiveGet('pixelPerfectOver', params, true);
+        this.pixelPerfectClick = Urso.helper.recursiveGet('pixelPerfectClick', params, true);
+    }
+
+    _checkIsDesktop() {
+        return Urso.device.desktop && !Urso.helper.isIpadOS();
+    }
+
+    setButtonFrame(key, assetKey) {
+        this.buttonFrames[key] = assetKey;
+
+        if (this._isOver)
+            this._changeTexture('over');
+        else if (this._isDown)
+            this._changeTexture('pressed');
+        else if (this._isDisabled)
+            this._changeTexture('disabled');
+        else
+            this._changeTexture('out');
+    }
+
+    enable() {
+        if (!this._isDisabled)
+            return false;
+
+        if (this._isOver)
+            this._changeTexture('over');
+        else
+            this._changeTexture('out');
+
+        this._isDisabled = false;
+        this._baseObject.eventMode = 'static';
+        this._baseObject.cursor = 'pointer';
+    }
+
+    disable() {
+        if (this._isDisabled)
+            return false;
+
+        this._changeTexture('disabled');
+        this._isDisabled = true;
+        this._baseObject.eventMode = 'passive';
+        delete this._baseObject.cursor;
+    }
+
+    _addBaseObject() {
+        this._baseObject = new PIXI.Sprite();
+        this._changeTexture('out');
+
+        this._baseObject.eventMode = 'static';
+        this._baseObject.cursor = 'pointer';
+
+        if (this.pixelPerfectOver) {
+            //todo
+        }
+
+        if (this.pixelPerfectClick) {
+            //todo
+        }
+
+        this._baseObject
+            .on('pointerdown', this._onButtonDown.bind(this))
+            .on('pointerup', this._onButtonUp.bind(this))
+            .on('pointerover', this._onButtonOver.bind(this))
+            .on('pointerout', this._onButtonOut.bind(this));
+
+        if (this.handlePointerUpOutside) {
+            this._baseObject.on('pointerupoutside', this._onButtonUp.bind(this))
+        }
+
+    };
+
+    _onButtonDown(event) {
+        if (this._isDisabled)
+            return false;
+
+        if (this.disableRightClick && event.data.button !== 0)
+            return;
+
+        this._isDown = true;
+
+        if (this.keyDownAction)
+            this.keyDownAction();
+
+        if (this._isDisabled) //can be disabled after keyDownAction
+            return false;
+
+        this._changeTexture('pressed');
+    }
+
+    _onButtonUp(event) {
+        if (this._isDisabled || !this._isDown)
+            return false;
+
+        if (this.disableRightClick && event.data.button !== 0)
+            return;
+
+        this._isDown = false;
+
+        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;
+
+        if (this._isOver)
+            this._changeTexture('over');
+        else
+            this._changeTexture('out');
+    }
+
+    _onButtonOver() {
+        this._isOver = true;
+
+        if (this._isDisabled)
+            return false;
+
+        if (this._isDown)
+            return;
+
+        if (this.mouseOverAction)
+            this.mouseOverAction();
+
+        this._changeTexture('over');
+    }
+
+    _onButtonOut() {
+        this._isOver = false;
+
+        if (this._isDisabled)
+            return false;
+
+        if (this._isDown)
+            return;
+
+        if (this.mouseOutAction)
+            this.mouseOutAction();
+
+        this._changeTexture('out');
+    }
+
+    _changeTexture(key) {
+        let texture = Urso.cache.getTexture(this.buttonFrames[key]);
+
+        if (!texture) {
+            if (key === 'out') {
+                Urso.logger.error('ModulesObjectsModelsButton assets error: no out image ' + this.buttonFrames.out);
+                return false;
+            }
+
+            this._changeTexture('out'); // load default texture for this key
+            return false;
+        }
+
+        this._baseObject.texture = texture;
+        return true;
+    }
+}
+
+export default ModulesObjectsModelsButton;

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

@@ -1,38 +1,38 @@
-/*
-buttonModel = {
-    buttonFrames:{
-        over: {type:'container', contents[...]},
-        out: {type:'container', contents[...]},
-        pressed: {type:'container', contents[...]},
-        disabled: {type:'container', contents[...]}
-    }
-}*/
-
-const ModulesObjectsBaseModel = require('./../baseModel');
-
-class ModulesObjectsModelsButtonComposite extends ModulesObjectsBaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.objects.BUTTONCOMPOSITE;
-        this._addBaseObject();
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.action = Urso.helper.recursiveGet('action', params, () => { console.log(123321), this.emit('buttonPressed') });
-        this.buttonFrames = {
-            over: Urso.helper.recursiveGet('buttonFrames.over', params, false),
-            out: Urso.helper.recursiveGet('buttonFrames.out', params, false),
-            pressed: Urso.helper.recursiveGet('buttonFrames.pressed', params, false),
-            disabled: Urso.helper.recursiveGet('buttonFrames.disabled', params, false),
-        }
-    }
-
-    _addBaseObject() {
-
-    }
-}
-
-module.exports = ModulesObjectsModelsButtonComposite;
+/*
+buttonModel = {
+    buttonFrames:{
+        over: {type:'container', contents[...]},
+        out: {type:'container', contents[...]},
+        pressed: {type:'container', contents[...]},
+        disabled: {type:'container', contents[...]}
+    }
+}*/
+
+import ModulesObjectsBaseModel from './../baseModel';
+
+class ModulesObjectsModelsButtonComposite extends ModulesObjectsBaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.objects.BUTTONCOMPOSITE;
+        this._addBaseObject();
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.action = Urso.helper.recursiveGet('action', params, () => { console.log(123321), this.emit('buttonPressed') });
+        this.buttonFrames = {
+            over: Urso.helper.recursiveGet('buttonFrames.over', params, false),
+            out: Urso.helper.recursiveGet('buttonFrames.out', params, false),
+            pressed: Urso.helper.recursiveGet('buttonFrames.pressed', params, false),
+            disabled: Urso.helper.recursiveGet('buttonFrames.disabled', params, false),
+        }
+    }
+
+    _addBaseObject() {
+
+    }
+}
+
+export default ModulesObjectsModelsButtonComposite;