@urso/core 0.3.2 → 0.3.6

package/src/js/modules/objects/proxy.js

@@ -1,179 +1,182 @@
-class ModulesObjectsProxy {
-    constructor() {
-        this.singleton = true;
-        this._safeFlag = false;
-
-        this._customSetLogic = this._customSetLogic.bind(this);
-        this._customGetLogic = this._customGetLogic.bind(this);
-
-        this._propertyAdapter = this.getInstance('PropertyAdapter');
-    };
-
-    get(model) {
-        const _this = this;
-
-        let proxy = new Proxy(model, {
-            get(target, key, receiver) {
-                const rv = Reflect.get(target, key, receiver);
-                return _this._customGetLogic({ target: target, proxy: receiver }, key, rv);
-            },
-
-            set(target, key, value, receiver) {
-                const rv = Reflect.set(target, key, value, receiver);
-                _this._customSetLogic(target, key, value, proxy);
-                return rv;
-            }
-        });
-
-        return proxy;
-    }
-
-    /* targetObject - object from models
-     * propertyName - property to adapt for PIXI object 
-     * value - value to set
-     */
-    _setProperty(target, propertyName, value) {
-        const isAdaptiveProperty = this._propertyAdapter.isAdaptiveProperty(propertyName);
-
-        if (isAdaptiveProperty)
-            this._propertyAdapter.propertyChangeHandler(target, propertyName);
-        else
-            Urso.helper.recursiveSet(propertyName, value, target._baseObject);
-    }
-
-    safeSetValueToTarget(target, key, value) {
-        this._safeFlag = true;
-
-        const originalValue = target._originalModel[key];
-        target[key] = value;
-        target._originalModel[key] = originalValue;
-
-        this._safeFlag = false;
-    }
-
-    //returns reflectValue = value that would be used when target[key] is called
-    _customGetLogic(object, key, reflectValue) {
-        const target = object.target;
-        const wrapKey = this._getAliases()[key];
-        const isReflectValueObject = typeof reflectValue !== 'undefined'; //&& typeof reflectValue !== 'boolean'; //it was for getting width and height
-
-        if ((isReflectValueObject && (typeof wrapKey != 'undefined')) || !wrapKey)
-            return reflectValue;
-
-        return Urso.helper.recursiveGet(wrapKey, target._baseObject, reflectValue);
-    }
-
-    _customSetLogic(target, key, value, proxy) {
-        if (!this._getOriginalModelExceptions().includes(key))
-            target._originalModel[key] = value;
-
-        //apply to pixi
-        const propertyName = this._getAliases()[key];
-
-        if (!propertyName)
-            return false;
-
-        if (propertyName.startsWith('function.')) {
-            this._runCustomFunction(propertyName, target);
-            return true;
-        }
-
-        this._checkSelectorProperties(key);
-
-        this._setProperty(target, propertyName, value);
-
-        //setup dirty to recalc params
-        if (typeof target._baseObject.dirty !== 'undefined')
-            target._baseObject.dirty = true;
-
-        return true;
-    };
-
-    _runCustomFunction(property, target) {
-        const funcName = property.replace('function.', '');
-        if (target[funcName])
-            target[funcName]();
-    }
-
-    _checkSelectorProperties(key) {
-        if (!this._safeFlag && this._getSelectorProperties().includes(key)) {
-            Urso.logger.error('ModulesObjectsProxy error: you are trying to change selector propertie: ' + key);
-            Urso.logger.error('Notice: use functions addClass, removeClass, setId, setName');
-        }
-    }
-
-    _getSelectorProperties() {
-        return [
-            'id', 'name', 'class'
-        ];
-    }
-
-    _getOriginalModelExceptions() {
-        return [
-            'parent', 'contents'
-        ];
-    }
-
-    _getAliases() {
-        return {
-            'id': 'id',
-            'name': 'name',
-            'class': 'class',
-            'x': 'x',
-            'y': 'y',
-            'z': 'z',
-            'angle': 'angle',
-            'anchorX': 'anchor.x', //'anchor.x',
-            'anchorY': 'anchor.y', //'anchor.y',
-            'width': 'width', //'width',
-            'height': 'height', //'height',
-            'stretchingType': 'stretchingType',
-            'scaleX': 'scale.x', //'scale.x',
-            'scaleY': 'scale.y', //'scale.y',
-            'alignX': 'alignX', //'alignX',
-            'alignY': 'alignY', //'alignY',
-            'parent': 'parent',
-            'rightOffset': 'rightOffset',
-            'bottomOffset': 'bottomOffset',
-            'alpha': 'alpha',
-            'visible': 'visible',
-            'text': 'text',
-            //'assetKey': 'function.setAssetKey', /todo
-            'frame': 'frame',
-            'blendMode': 'blendMode',
-            'tint': 'tint',
-            'action': 'events.onInputUp._bindings.0._listener', //todo
-            'btnFrames.over': 'frames.over',
-            'btnFrames.out': 'frames.out',
-            'btnFrames.down': 'frames.down',
-            'btnFrames.up': 'frames.up',
-            'align': 'align',
-            'filters': 'filters',
-            'lineSpacing': 'lineSpacing',
-            'maxWidth': 'maxWidth',
-            'maxHeight': 'maxHeight',
-            'lineHeight': 'style.lineHeight',
-            'fontFamily': 'style.fontFamily',
-            'fontSize': 'style.fontSize',
-            'fontStyle': 'style.fontStyle',
-            'fontWeight': 'style.fontWeight',
-            'fill': 'style.fill',
-            'stroke': 'style.stroke',
-            'strokeThickness': 'style.strokeThickness',
-            'dropShadow': 'style.dropShadow',
-            'dropShadowColor': 'style.dropShadowColor',
-            'dropShadowBlur': 'style.dropShadowBlur',
-            'dropShadowAngle': 'style.dropShadowAngle',
-            'dropShadowDistance': 'style.dropShadowDistance',
-            'wordWrap': 'style.wordWrap',
-            'wordWrapWidth': 'style.wordWrapWidth',
-            'enabled': 'input.enabled',
-            'cacheAsBitmap': 'cacheAsBitmap',
-
-            //baseObject functions
-            'toGlobal': 'toGlobal'
-        };
-    }
-}
-
-module.exports = ModulesObjectsProxy;
+class ModulesObjectsProxy {
+    constructor() {
+        this.singleton = true;
+        this._safeFlag = false;
+
+        this._customSetLogic = this._customSetLogic.bind(this);
+        this._customGetLogic = this._customGetLogic.bind(this);
+
+        this._propertyAdapter = this.getInstance('PropertyAdapter');
+    };
+
+    get(model) {
+        const _this = this;
+
+        let proxy = new Proxy(model, {
+            get(target, key, receiver) {
+                const rv = Reflect.get(target, key, receiver);
+                return _this._customGetLogic({ target: target, proxy: receiver }, key, rv);
+            },
+
+            set(target, key, value, receiver) {
+                const rv = Reflect.set(target, key, value, receiver);
+                _this._customSetLogic(target, key, value, proxy);
+                return rv;
+            }
+        });
+
+        return proxy;
+    }
+
+    /* targetObject - object from models
+     * propertyName - property to adapt for PIXI object 
+     * value - value to set
+     */
+    _setProperty(target, propertyName, value) {
+        const isAdaptiveProperty = this._propertyAdapter.isAdaptiveProperty(propertyName);
+
+        if (isAdaptiveProperty)
+            this._propertyAdapter.propertyChangeHandler(target, propertyName);
+        else
+            Urso.helper.recursiveSet(propertyName, value, target._baseObject);
+    }
+
+    safeSetValueToTarget(target, key, value) {
+        this._safeFlag = true;
+
+        const originalValue = target._originalModel[key]; // we need to save original value in the end
+
+        //setting value
+        target[key] = value;
+
+        target._originalModel[key] = originalValue;
+
+        this._safeFlag = false;
+    }
+
+    //returns reflectValue = value that would be used when target[key] is called
+    _customGetLogic(object, key, reflectValue) {
+        const target = object.target;
+        const wrapKey = this._getAliases()[key];
+        const isReflectValueObject = typeof reflectValue !== 'undefined'; //&& typeof reflectValue !== 'boolean'; //it was for getting width and height
+
+        if ((isReflectValueObject && (typeof wrapKey != 'undefined')) || !wrapKey)
+            return reflectValue;
+
+        return Urso.helper.recursiveGet(wrapKey, target._baseObject, reflectValue);
+    }
+
+    _customSetLogic(target, key, value, proxy) {
+        if (!this._getOriginalModelExceptions().includes(key))
+            target._originalModel[key] = value;
+
+        //apply to pixi
+        const propertyName = this._getAliases()[key];
+
+        if (!propertyName)
+            return false;
+
+        if (propertyName.startsWith('function.')) {
+            this._runCustomFunction(propertyName, target);
+            return true;
+        }
+
+        this._checkSelectorProperties(key);
+
+        this._setProperty(target, propertyName, value);
+
+        //setup dirty to recalc params
+        if (typeof target._baseObject.dirty !== 'undefined')
+            target._baseObject.dirty = true;
+
+        return true;
+    };
+
+    _runCustomFunction(property, target) {
+        const funcName = property.replace('function.', '');
+        if (target[funcName])
+            target[funcName]();
+    }
+
+    _checkSelectorProperties(key) {
+        if (!this._safeFlag && this._getSelectorProperties().includes(key)) {
+            Urso.logger.error('ModulesObjectsProxy error: you are trying to change selector propertie: ' + key);
+            Urso.logger.error('Notice: use functions addClass, removeClass, setId, setName');
+        }
+    }
+
+    _getSelectorProperties() {
+        return [
+            'id', 'name', 'class'
+        ];
+    }
+
+    _getOriginalModelExceptions() {
+        return [
+            'parent', 'contents'
+        ];
+    }
+
+    _getAliases() {
+        return {
+            'id': 'id',
+            'name': 'name',
+            'class': 'class',
+            'x': 'x',
+            'y': 'y',
+            'z': 'z',
+            'angle': 'angle',
+            'anchorX': 'anchor.x', //'anchor.x',
+            'anchorY': 'anchor.y', //'anchor.y',
+            'width': 'width', //'width',
+            'height': 'height', //'height',
+            'stretchingType': 'stretchingType',
+            'scaleX': 'scale.x', //'scale.x',
+            'scaleY': 'scale.y', //'scale.y',
+            'alignX': 'alignX', //'alignX',
+            'alignY': 'alignY', //'alignY',
+            'parent': 'parent',
+            'rightOffset': 'rightOffset',
+            'bottomOffset': 'bottomOffset',
+            'alpha': 'alpha',
+            'visible': 'visible',
+            'text': 'text',
+            //'assetKey': 'function.setAssetKey', /todo
+            'frame': 'frame',
+            'blendMode': 'blendMode',
+            'tint': 'tint',
+            'action': 'events.onInputUp._bindings.0._listener', //todo
+            'btnFrames.over': 'frames.over',
+            'btnFrames.out': 'frames.out',
+            'btnFrames.down': 'frames.down',
+            'btnFrames.up': 'frames.up',
+            'align': 'align',
+            'filters': 'filters',
+            'lineSpacing': 'lineSpacing',
+            'maxWidth': 'maxWidth',
+            'maxHeight': 'maxHeight',
+            'lineHeight': 'style.lineHeight',
+            'fontFamily': 'style.fontFamily',
+            'fontSize': 'style.fontSize',
+            'fontStyle': 'style.fontStyle',
+            'fontWeight': 'style.fontWeight',
+            'fill': 'style.fill',
+            'stroke': 'style.stroke',
+            'strokeThickness': 'style.strokeThickness',
+            'dropShadow': 'style.dropShadow',
+            'dropShadowColor': 'style.dropShadowColor',
+            'dropShadowBlur': 'style.dropShadowBlur',
+            'dropShadowAngle': 'style.dropShadowAngle',
+            'dropShadowDistance': 'style.dropShadowDistance',
+            'wordWrap': 'style.wordWrap',
+            'wordWrapWidth': 'style.wordWrapWidth',
+            'enabled': 'input.enabled',
+            'cacheAsBitmap': 'cacheAsBitmap',
+
+            //baseObject functions
+            'toGlobal': 'toGlobal'
+        };
+    }
+}
+
+module.exports = ModulesObjectsProxy;

package/src/js/modules/objects/styles.js

@@ -1,116 +1,116 @@
-class ModulesObjectsStyles {
-    constructor() {
-        this.singleton = true;
-
-        this._cache = {};
-        this._tempObject = this.getInstance('BaseModel', {})
-    }
-
-    refresh(parent) {
-        if (!parent)
-            parent = this.getInstance('Controller').getWorld();
-
-        let template = Urso.template.get();
-        let styles = template.styles;
-
-        this._globalResetStyles();
-
-        //todo consider parent
-
-        for (let [selector, style] of Object.entries(styles))
-            this._apply(selector, style);
-    }
-
-    refreshByChangedClassName(className) {
-        let template = Urso.template.get();
-        let styles = template.styles;
-
-        this._restoreDefaultsByCache(className);
-
-        for (let [selector, style] of Object.entries(styles))
-            if (selector.indexOf('.' + className) !== -1)
-                this._apply(selector, style);
-    }
-
-    removeFromCache(object) {
-        for (let selector in this._cache) {
-            if (this._cache[selector][object._uid]) {
-                delete this._cache[selector][object._uid];
-
-                if (!Object.keys(this._cache[selector]).length)
-                    delete this._cache[selector];
-            }
-        }
-
-    }
-
-    _apply(selector, style) {
-        let objectsArray = this.getInstance('Controller').findAll(selector);
-
-        for (let object of objectsArray) {
-            this._addObjectToCache(selector, object);
-            object._styles[selector] = style;
-
-            for (let [key, value] of Object.entries(style))
-                if (typeof object._originalModel[key] === 'undefined')
-                    Urso.objects._safeSetValueToTarget(object, key, value);
-        }
-    }
-
-    _addObjectToCache(selector, object) {
-        if (!this._cache[selector])
-            this._cache[selector] = {};
-
-        this._cache[selector][object._uid] = object;
-    }
-
-    _globalResetStyles() {
-        for (let [selector, selectorCache] of Object.entries(this._cache)) {
-            for (let [uid, object] of Object.entries(selectorCache))
-                this._removeSelectorStyles(object, selector);
-
-            delete this._cache[selector];
-        }
-    }
-
-    _restoreDefaultsByCache(className) {
-        for (let [selector, selectorCache] of Object.entries(this._cache))
-            if (selector.indexOf('.' + className) !== -1) {
-                for (let [uid, object] of Object.entries(selectorCache))
-                    this._removeSelectorStyles(object, selector);
-
-                delete this._cache[selector];
-            }
-    }
-
-    _removeSelectorStyles(object, selector) {
-        delete object._styles[selector];
-        let template = Urso.template.get();
-        let styles = template.styles[selector];
-
-        if(!styles){
-            return;
-        }
-
-        for (let [key, value] of Object.entries(styles)) {
-            this._restoreValueByKey(key, object);
-        }
-
-    }
-
-    _restoreValueByKey(key, object) {
-        //check own
-        if (object._originalModel[key])
-            return;
-
-        //restore defaults
-        Urso.objects._safeSetValueToTarget(object, key, this._tempObject[key]);
-
-        //check other styles
-        for (let [selector, style] of Object.entries(object._styles))
-            if (typeof style[key] !== 'undefined')
-                Urso.objects._safeSetValueToTarget(object, key, style[key]);
-    }
-}
-
-module.exports = ModulesObjectsStyles;
+class ModulesObjectsStyles {
+    constructor() {
+        this.singleton = true;
+
+        this._cache = {};
+        this._tempObject = this.getInstance('BaseModel', {})
+    }
+
+    refresh(parent) {
+        if (!parent)
+            parent = this.getInstance('Controller').getWorld();
+
+        let template = Urso.template.get();
+        let styles = template.styles;
+
+        this._globalResetStyles();
+
+        //todo consider parent
+
+        for (let [selector, style] of Object.entries(styles))
+            this._apply(selector, style);
+    }
+
+    refreshByChangedClassName(className) {
+        let template = Urso.template.get();
+        let styles = template.styles;
+
+        this._restoreDefaultsByCache(className);
+
+        for (let [selector, style] of Object.entries(styles))
+            if (selector.indexOf('.' + className) !== -1)
+                this._apply(selector, style);
+    }
+
+    removeFromCache(object) {
+        for (let selector in this._cache) {
+            if (this._cache[selector][object._uid]) {
+                delete this._cache[selector][object._uid];
+
+                if (!Object.keys(this._cache[selector]).length)
+                    delete this._cache[selector];
+            }
+        }
+
+    }
+
+    _apply(selector, style) {
+        let objectsArray = this.getInstance('Controller').findAll(selector);
+
+        for (let object of objectsArray) {
+            this._addObjectToCache(selector, object);
+            object._styles[selector] = style;
+
+            for (let [key, value] of Object.entries(style))
+                if (typeof object._originalModel[key] === 'undefined')
+                    Urso.objects._safeSetValueToTarget(object, key, value);
+        }
+    }
+
+    _addObjectToCache(selector, object) {
+        if (!this._cache[selector])
+            this._cache[selector] = {};
+
+        this._cache[selector][object._uid] = object;
+    }
+
+    _globalResetStyles() {
+        for (let [selector, selectorCache] of Object.entries(this._cache)) {
+            for (let [uid, object] of Object.entries(selectorCache))
+                this._removeSelectorStyles(object, selector);
+
+            delete this._cache[selector];
+        }
+    }
+
+    _restoreDefaultsByCache(className) {
+        for (let [selector, selectorCache] of Object.entries(this._cache))
+            if (selector.indexOf('.' + className) !== -1) {
+                for (let [uid, object] of Object.entries(selectorCache))
+                    this._removeSelectorStyles(object, selector);
+
+                delete this._cache[selector];
+            }
+    }
+
+    _removeSelectorStyles(object, selector) {
+        delete object._styles[selector];
+        let template = Urso.template.get();
+        let styles = template.styles[selector];
+
+        if(!styles){
+            return;
+        }
+
+        for (let [key, value] of Object.entries(styles)) {
+            this._restoreValueByKey(key, object);
+        }
+
+    }
+
+    _restoreValueByKey(key, object) {
+        //check own
+        if (object._originalModel[key])
+            return;
+
+        //restore defaults
+        Urso.objects._safeSetValueToTarget(object, key, this._tempObject[key]);
+
+        //check other styles
+        for (let [selector, style] of Object.entries(object._styles))
+            if (typeof style[key] !== 'undefined')
+                Urso.objects._safeSetValueToTarget(object, key, style[key]);
+    }
+}
+
+module.exports = ModulesObjectsStyles;

package/src/js/modules/observer/_info.js

@@ -1,4 +1,4 @@
-Urso.Core.Modules.Observer = {
-    Controller: require('./controller.js'),
-    Events: require('./events.js')
-};
+Urso.Core.Modules.Observer = {
+    Controller: require('./controller.js'),
+    Events: require('./events.js')
+};