@urso/core 0.6.16-dev → 0.6.17

package/src/js/modules/objects/controller.js

@@ -1,131 +1,131 @@
-class ModulesObjectsController {
-    constructor() {
-        this.singleton = true;
-
-        Urso.find = this.find.bind(this);
-        Urso.findOne = this.findOne.bind(this);
-        Urso.findAll = this.findAll.bind(this);
-
-        this._newResolutionHandler = this._newResolutionHandler.bind(this);
-        this._resetWorld = this._resetWorld.bind(this);
-        this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
-    };
-
-    create(objects, parent, doNotRefreshStylesFlag) {
-        let result;
-
-        if (Array.isArray(objects)) {
-            result = [];
-
-            for (const object of objects) {
-                result.push(this._createSingleObject(object, parent, doNotRefreshStylesFlag));
-            }
-        } else
-            result = this._createSingleObject(objects, parent, doNotRefreshStylesFlag);
-
-        if (!doNotRefreshStylesFlag)
-            this.refreshStyles(parent);
-
-        return result;
-    }
-
-    _createSingleObject(object, parent, doNotRefreshStylesFlag) {
-        //parse template for assets and objects (groups, components)  Urso.types.objects.COMPONENT  Urso.types.objects.GROUP
-        if (!object._parsed) { //todo only for objects, contains components && groups in future
-            return Urso.scenes.addObject(object, parent, doNotRefreshStylesFlag);
-        }
-
-        return this.getInstance('Service').add(object, parent);
-    }
-
-    find(selector) {
-        return this.getInstance('Find').do(selector);
-    }
-
-    findOne(selector) {
-        let result = this.getInstance('Find').do(selector, true);
-        return result ? result[0] : false;
-    }
-
-    findAll(selector) {
-        let result = this.getInstance('Find').do(selector);
-        return result ? result : []; //todo make collections
-    }
-
-    addIdToCache(id, object) {
-        this.getInstance('Cache').addId(id, object);
-    }
-
-    removeIdFromCache(id, object) {
-        this.getInstance('Cache').removeId(id, object);
-    }
-
-    addNameToCache(name, object) {
-        this.getInstance('Cache').addName(name, object);
-    }
-
-    removeNameFromCache(name, object) {
-        this.getInstance('Cache').removeName(name, object);
-    }
-
-    addClassToCache(className, object) {
-        this.getInstance('Cache').addClass(className, object);
-    }
-
-    removeClassFromCache(className, object) {
-        this.getInstance('Cache').removeClass(className, object);
-    }
-
-    refreshStyles(parent) {
-        return this.getInstance('Styles').refresh(parent);
-    }
-
-    refreshByChangedClassName(className) {
-        return this.getInstance('Styles').refreshByChangedClassName(className);
-    }
-
-    getWorld() {
-        return this.getInstance('Service').getWorld();
-    }
-
-    addChild(parent, child, doNotRefreshStylesFlag) {
-        this.getInstance('Service').addChild(parent, child, doNotRefreshStylesFlag);
-    }
-
-    removeChild(parent, child, doNotRefreshStylesFlag) {
-        this.getInstance('Service').removeChild(parent, child, doNotRefreshStylesFlag);
-    }
-
-    destroy(object, doNotRefreshStylesFlag) {
-        this.getInstance('Service').destroy(object, doNotRefreshStylesFlag);
-    }
-
-    //do not use outside engine
-    _safeSetValueToTarget(target, key, value) {
-        this.getInstance('Proxy').safeSetValueToTarget(target, key, value);
-    }
-
-    _updateCommonProperties(object) {
-        this.getInstance('Service')._updateCommonProperties(object);
-    }
-
-    _newResolutionHandler(params) {
-        this.getInstance('Service').updateWorldBounds(params);
-    }
-
-    _resetWorld() {
-        this.getInstance('Service').resetWorld();
-    }
-
-    _applyClassesToWorld() {
-        this.getInstance('Service').applyClassesToWorld();
-    }
-
-    _subscribeOnce() {
-        this.addListener(Urso.events.MODULES_SCENES_NEW_RESOLUTION, this._newResolutionHandler, true);
-        this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this._resetWorld, true);
-        this.addListener(Urso.events.MODULES_INSTANCES_MODES_CHANGED, this._applyClassesToWorld, true);
-    }
-}
-
-module.exports = ModulesObjectsController;
+class ModulesObjectsController {
+    constructor() {
+        this.singleton = true;
+
+        Urso.find = this.find.bind(this);
+        Urso.findOne = this.findOne.bind(this);
+        Urso.findAll = this.findAll.bind(this);
+
+        this._newResolutionHandler = this._newResolutionHandler.bind(this);
+        this._resetWorld = this._resetWorld.bind(this);
+        this._applyClassesToWorld = this._applyClassesToWorld.bind(this);
+    };
+
+    create(objects, parent, doNotRefreshStylesFlag) {
+        let result;
+
+        if (Array.isArray(objects)) {
+            result = [];
+
+            for (const object of objects) {
+                result.push(this._createSingleObject(object, parent, doNotRefreshStylesFlag));
+            }
+        } else
+            result = this._createSingleObject(objects, parent, doNotRefreshStylesFlag);
+
+        if (!doNotRefreshStylesFlag)
+            this.refreshStyles(parent);
+
+        return result;
+    }
+
+    _createSingleObject(object, parent, doNotRefreshStylesFlag) {
+        //parse template for assets and objects (groups, components)  Urso.types.objects.COMPONENT  Urso.types.objects.GROUP
+        if (!object._parsed) { //todo only for objects, contains components && groups in future
+            return Urso.scenes.addObject(object, parent, doNotRefreshStylesFlag);
+        }
+
+        return this.getInstance('Service').add(object, parent);
+    }
+
+    find(selector) {
+        return this.getInstance('Find').do(selector);
+    }
+
+    findOne(selector) {
+        let result = this.getInstance('Find').do(selector, true);
+        return result ? result[0] : false;
+    }
+
+    findAll(selector) {
+        let result = this.getInstance('Find').do(selector);
+        return result ? result : []; //todo make collections
+    }
+
+    addIdToCache(id, object) {
+        this.getInstance('Cache').addId(id, object);
+    }
+
+    removeIdFromCache(id, object) {
+        this.getInstance('Cache').removeId(id, object);
+    }
+
+    addNameToCache(name, object) {
+        this.getInstance('Cache').addName(name, object);
+    }
+
+    removeNameFromCache(name, object) {
+        this.getInstance('Cache').removeName(name, object);
+    }
+
+    addClassToCache(className, object) {
+        this.getInstance('Cache').addClass(className, object);
+    }
+
+    removeClassFromCache(className, object) {
+        this.getInstance('Cache').removeClass(className, object);
+    }
+
+    refreshStyles(parent) {
+        return this.getInstance('Styles').refresh(parent);
+    }
+
+    refreshByChangedClassName(className) {
+        return this.getInstance('Styles').refreshByChangedClassName(className);
+    }
+
+    getWorld() {
+        return this.getInstance('Service').getWorld();
+    }
+
+    addChild(parent, child, doNotRefreshStylesFlag) {
+        this.getInstance('Service').addChild(parent, child, doNotRefreshStylesFlag);
+    }
+
+    removeChild(parent, child, doNotRefreshStylesFlag) {
+        this.getInstance('Service').removeChild(parent, child, doNotRefreshStylesFlag);
+    }
+
+    destroy(object, doNotRefreshStylesFlag) {
+        this.getInstance('Service').destroy(object, doNotRefreshStylesFlag);
+    }
+
+    //do not use outside engine
+    _safeSetValueToTarget(target, key, value) {
+        this.getInstance('Proxy').safeSetValueToTarget(target, key, value);
+    }
+
+    _updateCommonProperties(object) {
+        this.getInstance('Service')._updateCommonProperties(object);
+    }
+
+    _newResolutionHandler(params) {
+        this.getInstance('Service').updateWorldBounds(params);
+    }
+
+    _resetWorld() {
+        this.getInstance('Service').resetWorld();
+    }
+
+    _applyClassesToWorld() {
+        this.getInstance('Service').applyClassesToWorld();
+    }
+
+    _subscribeOnce() {
+        this.addListener(Urso.events.MODULES_SCENES_NEW_RESOLUTION, this._newResolutionHandler, true);
+        this.addListener(Urso.events.MODULES_SCENES_NEW_SCENE_INIT, this._resetWorld, true);
+        this.addListener(Urso.events.MODULES_INSTANCES_MODES_CHANGED, this._applyClassesToWorld, true);
+    }
+}
+
+module.exports = ModulesObjectsController;

package/src/js/modules/objects/find.js

@@ -1,58 +1,58 @@
-class ModulesObjectsFind {
-
-    constructor() {
-        this.singleton = true;
-        this._selector = this.getInstance('Selector');
-    };
-
-    /**
-     * find object(s) by selector  (find, findOne, findAll)
-     * @param {String} selector
-     * @param {Boolean} findOneFlag
-     * @returns {mixed}
-     */
-    do(selector, findOneFlag) {
-        let result = [];
-        let selectorsPartsParsed = this._selector.parse(selector);
-        let lastRule = selectorsPartsParsed[selectorsPartsParsed.length - 1][0];
-
-        //get elements by last rule
-        let testObjects = this.getInstance('Cache')[
-            'get' + Urso.helper.capitaliseFirstLetter(lastRule.type)
-        ](lastRule.value);
-
-        //if its name or id we will transform one element to array of elements to test
-        if (lastRule.type !== 'class' && testObjects)
-            testObjects = [testObjects];
-
-        //no objects found to test --> return false
-        if (!testObjects || testObjects.length === 0)
-            return false;
-
-        //return findOneFlag with simple selector (selector with one rule)
-        if (
-            findOneFlag &&
-            selectorsPartsParsed.length === 1 &&
-            selectorsPartsParsed[0].length === 1
-        )
-            return testObjects;
-
-        //check test objects for all selectors parts conformity
-        for (let testObject of testObjects) {
-            let testResult = this._selector.testObjectWithParsedSelector(
-                testObject,
-                selectorsPartsParsed
-            );
-
-            if (testResult)
-                result.push(testObject);
-
-            if (testResult && findOneFlag)
-                return result;
-        }
-
-        return result;
-    };
-}
-
-module.exports = ModulesObjectsFind;
+class ModulesObjectsFind {
+
+    constructor() {
+        this.singleton = true;
+        this._selector = this.getInstance('Selector');
+    };
+
+    /**
+     * find object(s) by selector  (find, findOne, findAll)
+     * @param {String} selector
+     * @param {Boolean} findOneFlag
+     * @returns {mixed}
+     */
+    do(selector, findOneFlag) {
+        let result = [];
+        let selectorsPartsParsed = this._selector.parse(selector);
+        let lastRule = selectorsPartsParsed[selectorsPartsParsed.length - 1][0];
+
+        //get elements by last rule
+        let testObjects = this.getInstance('Cache')[
+            'get' + Urso.helper.capitaliseFirstLetter(lastRule.type)
+        ](lastRule.value);
+
+        //if its name or id we will transform one element to array of elements to test
+        if (lastRule.type !== 'class' && testObjects)
+            testObjects = [testObjects];
+
+        //no objects found to test --> return false
+        if (!testObjects || testObjects.length === 0)
+            return false;
+
+        //return findOneFlag with simple selector (selector with one rule)
+        if (
+            findOneFlag &&
+            selectorsPartsParsed.length === 1 &&
+            selectorsPartsParsed[0].length === 1
+        )
+            return testObjects;
+
+        //check test objects for all selectors parts conformity
+        for (let testObject of testObjects) {
+            let testResult = this._selector.testObjectWithParsedSelector(
+                testObject,
+                selectorsPartsParsed
+            );
+
+            if (testResult)
+                result.push(testObject);
+
+            if (testResult && findOneFlag)
+                return result;
+        }
+
+        return result;
+    };
+}
+
+module.exports = ModulesObjectsFind;

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

@@ -1,27 +1,27 @@
-Urso.Core.Modules.Objects.Models = {
-    AtlasImage: require('./atlasImage.js'),
-    BitmapText: require('./bitmapText.js'),
-    Button: require('./button.js'),
-    ButtonComposite: require('./buttonComposite.js'),
-    Checkbox: require('./checkbox.js'),
-    Collection: require('./collection.js'),
-    Component: require('./component.js'),
-    Container: require('./container.js'),
-    DragContainer: require('./dragContainer.js'),
-    Emitter: require('./emitter.js'),
-    EmitterFx: require('./emitterFx.js'),
-    Graphics: require('./graphics.js'),
-    Group: require('./group.js'),
-    HitArea: require('./hitArea.js'),
-    Image: require('./image.js'),
-    ImagesAnimation: require('./imagesAnimation.js'),
-    Mask: require('./mask.js'),
-    NineSlicePlane: require('./nineSlicePlane.js'),
-    Scrollbox: require('./scrollbox.js'),
-    Slider: require('./slider.js'),
-    Spine: require('./spine.js'),
-    Text: require('./text.js'),
-    TextInput: require('./textInput.js'),
-    Toggle: require('./toggle.js'),
-    World: require('./world.js')
-};
+Urso.Core.Modules.Objects.Models = {
+    AtlasImage: require('./atlasImage.js'),
+    BitmapText: require('./bitmapText.js'),
+    Button: require('./button.js'),
+    ButtonComposite: require('./buttonComposite.js'),
+    Checkbox: require('./checkbox.js'),
+    Collection: require('./collection.js'),
+    Component: require('./component.js'),
+    Container: require('./container.js'),
+    DragContainer: require('./dragContainer.js'),
+    Emitter: require('./emitter.js'),
+    EmitterFx: require('./emitterFx.js'),
+    Graphics: require('./graphics.js'),
+    Group: require('./group.js'),
+    HitArea: require('./hitArea.js'),
+    Image: require('./image.js'),
+    ImagesAnimation: require('./imagesAnimation.js'),
+    Mask: require('./mask.js'),
+    NineSlicePlane: require('./nineSlicePlane.js'),
+    Scrollbox: require('./scrollbox.js'),
+    Slider: require('./slider.js'),
+    Spine: require('./spine.js'),
+    Text: require('./text.js'),
+    TextInput: require('./textInput.js'),
+    Toggle: require('./toggle.js'),
+    World: require('./world.js')
+};

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

@@ -1,50 +1,50 @@
-class ModulesObjectsModelsAtlasImage extends Urso.Core.Modules.Objects.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.objects.ATLASIMAGE;
-        this._addBaseObject();
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.assetKey = Urso.helper.recursiveGet('assetKey', params, false);
-        this.filenameKey = Urso.helper.recursiveGet('filenameKey', params, false);
-    }
-
-    changeTexture(filenameKey, assetKey) {
-        if (assetKey)
-            this.assetKey = assetKey;
-
-        if (filenameKey)
-            this.filenameKey = filenameKey;
-
-        this._addBaseObject();
-    }
-
-    _addBaseObject() {
-        const sheet = Urso.cache.getAtlas(this.assetKey)
-
-        if (!sheet)
-            Urso.logger.error('ModulesObjectsModelsImage assets error: no atlas ' + this.assetKey);
-
-        let textureKey = this.filenameKey;
-
-        if (!sheet.textures[textureKey] && typeof this.filenameKey === 'string') {
-            let keyIndex = sheet.data.frames.findIndex((el) => { return el.filename === this.filenameKey });
-
-            if (keyIndex !== -1)
-                textureKey = keyIndex;
-        }
-
-        const texture = sheet.textures[textureKey];
-
-        if (!this._baseObject)
-            this._baseObject = new PIXI.Sprite(texture);
-        else
-            this._baseObject.texture = texture;
-    };
-}
-
-module.exports = ModulesObjectsModelsAtlasImage;
+class ModulesObjectsModelsAtlasImage extends Urso.Core.Modules.Objects.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.objects.ATLASIMAGE;
+        this._addBaseObject();
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.assetKey = Urso.helper.recursiveGet('assetKey', params, false);
+        this.filenameKey = Urso.helper.recursiveGet('filenameKey', params, false);
+    }
+
+    changeTexture(filenameKey, assetKey) {
+        if (assetKey)
+            this.assetKey = assetKey;
+
+        if (filenameKey)
+            this.filenameKey = filenameKey;
+
+        this._addBaseObject();
+    }
+
+    _addBaseObject() {
+        const sheet = Urso.cache.getAtlas(this.assetKey)
+
+        if (!sheet)
+            Urso.logger.error('ModulesObjectsModelsImage assets error: no atlas ' + this.assetKey);
+
+        let textureKey = this.filenameKey;
+
+        if (!sheet.textures[textureKey] && typeof this.filenameKey === 'string') {
+            let keyIndex = sheet.data.frames.findIndex((el) => { return el.filename === this.filenameKey });
+
+            if (keyIndex !== -1)
+                textureKey = keyIndex;
+        }
+
+        const texture = sheet.textures[textureKey];
+
+        if (!this._baseObject)
+            this._baseObject = new PIXI.Sprite(texture);
+        else
+            this._baseObject.texture = texture;
+    };
+}
+
+module.exports = ModulesObjectsModelsAtlasImage;

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

@@ -1,38 +1,38 @@
-class ModulesObjectsModelsBitmapText extends Urso.Core.Modules.Objects.BaseModel {
-    constructor(params) {
-        super(params);
-
-        this.type = Urso.types.objects.BITMAPTEXT;
-        this._addBaseObject();
-    }
-
-    setupParams(params) {
-        super.setupParams(params);
-
-        this.text = Urso.helper.recursiveGet('text', params, false);
-        this.localeId = Urso.helper.recursiveGet('localeId', params, false); //you can use this instead text for localization
-
-        this.localeVariables = Urso.helper.recursiveGet('localeVariables', params, {}); //optional variables for localization by localeId
-
-        this.fontName = Urso.helper.recursiveGet('fontName', params, false);
-        this.fontSize = Urso.helper.recursiveGet('fontSize', params, false);
-    }
-
-    _addBaseObject() {
-        if (this.localeId)
-            this._originalModel.text = this.text = Urso.i18n.get(this.localeId, this.localeVariables);
-
-        this._baseObject = new PIXI.BitmapText(this.text, { fontName: this.fontName, fontSize: this.fontSize });
-    };
-
-    _newLocaleHandler() {
-        this.text = this._baseObject.text = Urso.i18n.get(this.localeId, this.localeVariables);
-    }
-
-    _subscribeOnce() {
-        if (this.localeId)
-            this.addListener(Urso.events.MODULES_I18N_NEW_LOCALE_WAS_SET, this._newLocaleHandler.bind(this));
-    }
-}
-
+class ModulesObjectsModelsBitmapText extends Urso.Core.Modules.Objects.BaseModel {
+    constructor(params) {
+        super(params);
+
+        this.type = Urso.types.objects.BITMAPTEXT;
+        this._addBaseObject();
+    }
+
+    setupParams(params) {
+        super.setupParams(params);
+
+        this.text = Urso.helper.recursiveGet('text', params, false);
+        this.localeId = Urso.helper.recursiveGet('localeId', params, false); //you can use this instead text for localization
+
+        this.localeVariables = Urso.helper.recursiveGet('localeVariables', params, {}); //optional variables for localization by localeId
+
+        this.fontName = Urso.helper.recursiveGet('fontName', params, false);
+        this.fontSize = Urso.helper.recursiveGet('fontSize', params, false);
+    }
+
+    _addBaseObject() {
+        if (this.localeId)
+            this._originalModel.text = this.text = Urso.i18n.get(this.localeId, this.localeVariables);
+
+        this._baseObject = new PIXI.BitmapText(this.text, { fontName: this.fontName, fontSize: this.fontSize });
+    };
+
+    _newLocaleHandler() {
+        this.text = this._baseObject.text = Urso.i18n.get(this.localeId, this.localeVariables);
+    }
+
+    _subscribeOnce() {
+        if (this.localeId)
+            this.addListener(Urso.events.MODULES_I18N_NEW_LOCALE_WAS_SET, this._newLocaleHandler.bind(this));
+    }
+}
+
 module.exports = ModulesObjectsModelsBitmapText;