@urso/core 0.2.4-dev → 0.2.8

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

@@ -1,140 +1,140 @@
-class ModulesObjectsFind {
-    constructor() {
-        this.singleton = true;
-    };
-
-    do(selector, findOneFlag) {
-        let result = [];
-        let selectorsPartsParsed = this._parseSelector(selector);
-        let lastRule = selectorsPartsParsed[selectorsPartsParsed.length - 1][0];
-
-        //get elements
-        let testObjects = this.getInstance('Cache')[
-            'get' + Urso.helper.capitaliseFirstLetter(lastRule.type)
-        ](lastRule.value);
-
-        if (lastRule.type !== 'class')
-            testObjects = [testObjects];
-
-        if (!testObjects || testObjects.length === 0)
-            return false;
-
-        //return findOneFlag with simple selector
-        if (
-            findOneFlag &&
-            selectorsPartsParsed.length === 1 &&
-            selectorsPartsParsed[0].length === 1
-        )
-            return testObjects;
-
-        //check test objects all selectors parts
-        for (let testObject of testObjects) {
-            let testResult = this._testObjectsForSelector(
-                testObject,
-                selectorsPartsParsed
-            );
-
-            if (testResult)
-                result.push(testObject);
-
-            if (testResult && findOneFlag)
-                return result;
-        }
-
-        return result;
-    };
-
-    _testObjectsForSelector(testObject, selectorsPartsParsed) {
-        let properties = selectorsPartsParsed[
-            selectorsPartsParsed.length - 1
-        ];
-
-        if (!this._testObjectsProperties(testObject, properties))
-            return false;
-
-        if (selectorsPartsParsed.length === 1)
-            return true;
-
-        //now we will check objects parents (for complex selectors)
-        let parent = testObject.parent;
-
-        for (let i = selectorsPartsParsed.length - 2; i >= 0; i--) {
-            let parentProperties = selectorsPartsParsed[i];
-            let expectedParentFoundFlag = 0;
-
-            while (expectedParentFoundFlag !== 1 && parent) {
-                if (this._testObjectsProperties(parent, parentProperties))
-                    expectedParentFoundFlag = 1;
-
-                parent = parent.parent;
-            }
-
-            if (expectedParentFoundFlag === 1 && i === 0) //last propertie from selector and all is good
-                return true;
-
-            if (expectedParentFoundFlag === 0)
-                return false;
-        }
-    }
-
-    _testObjectsProperties(object, properties) {
-        for (let propertie of properties) {
-            if (propertie.type === 'class') {
-                if (
-                    !object[propertie.type] ||
-                    object[propertie.type].split(' ').indexOf(propertie.value) === -1
-                )
-                    return false;
-
-            } else if (object[propertie.type] !== propertie.value)
-                return false;
-        }
-
-        return true;
-    };
-
-    _parseSelector(selector) {
-        let selectorsParts = selector.split(' ');
-        let selectorsPartsParsed = [];
-
-        for (let selectorsPart of selectorsParts) {
-            let selectorPartParsed = this._parseSelectorPart(selectorsPart);
-
-            if (!selectorPartParsed)
-                Urso.logger.error('ModulesObjectsService error, cannot parse selector part: ' + selectorsPart);
-
-            selectorsPartsParsed.push(selectorPartParsed);
-        }
-
-        return selectorsPartsParsed;
-    };
-
-    _parseSelectorPart(selectorPart) {
-        const characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+";
-        const matchExpr = {
-            "id": new RegExp("^#(" + characterEncoding + ")"),
-            "name": new RegExp("^\\^(" + characterEncoding + ")"),
-            "class": new RegExp("^\\.(" + characterEncoding + ")")
-        };
-
-        let result = [];
-
-        for (let type in matchExpr) {
-            let foundItem = matchExpr[type].exec(selectorPart);
-
-            if (foundItem) {
-                result.push({ type: type, value: foundItem[1] });
-
-                let restSelectorPart = Urso.helper.stringReplace(foundItem[0], '', selectorPart);
-                let restItems = this._parseSelectorPart(restSelectorPart);
-
-                if (restItems)
-                    return Urso.helper.mergeArrays(result, restItems);
-            }
-        }
-
-        return (result && result.length > 0) ? result : false;
-    };
-}
-
-module.exports = ModulesObjectsFind;
+class ModulesObjectsFind {
+    constructor() {
+        this.singleton = true;
+    };
+
+    do(selector, findOneFlag) {
+        let result = [];
+        let selectorsPartsParsed = this._parseSelector(selector);
+        let lastRule = selectorsPartsParsed[selectorsPartsParsed.length - 1][0];
+
+        //get elements
+        let testObjects = this.getInstance('Cache')[
+            'get' + Urso.helper.capitaliseFirstLetter(lastRule.type)
+        ](lastRule.value);
+
+        if (lastRule.type !== 'class')
+            testObjects = [testObjects];
+
+        if (!testObjects || testObjects.length === 0)
+            return false;
+
+        //return findOneFlag with simple selector
+        if (
+            findOneFlag &&
+            selectorsPartsParsed.length === 1 &&
+            selectorsPartsParsed[0].length === 1
+        )
+            return testObjects;
+
+        //check test objects all selectors parts
+        for (let testObject of testObjects) {
+            let testResult = this._testObjectsForSelector(
+                testObject,
+                selectorsPartsParsed
+            );
+
+            if (testResult)
+                result.push(testObject);
+
+            if (testResult && findOneFlag)
+                return result;
+        }
+
+        return result;
+    };
+
+    _testObjectsForSelector(testObject, selectorsPartsParsed) {
+        let properties = selectorsPartsParsed[
+            selectorsPartsParsed.length - 1
+        ];
+
+        if (!this._testObjectsProperties(testObject, properties))
+            return false;
+
+        if (selectorsPartsParsed.length === 1)
+            return true;
+
+        //now we will check objects parents (for complex selectors)
+        let parent = testObject.parent;
+
+        for (let i = selectorsPartsParsed.length - 2; i >= 0; i--) {
+            let parentProperties = selectorsPartsParsed[i];
+            let expectedParentFoundFlag = 0;
+
+            while (expectedParentFoundFlag !== 1 && parent) {
+                if (this._testObjectsProperties(parent, parentProperties))
+                    expectedParentFoundFlag = 1;
+
+                parent = parent.parent;
+            }
+
+            if (expectedParentFoundFlag === 1 && i === 0) //last propertie from selector and all is good
+                return true;
+
+            if (expectedParentFoundFlag === 0)
+                return false;
+        }
+    }
+
+    _testObjectsProperties(object, properties) {
+        for (let propertie of properties) {
+            if (propertie.type === 'class') {
+                if (
+                    !object[propertie.type] ||
+                    object[propertie.type].split(' ').indexOf(propertie.value) === -1
+                )
+                    return false;
+
+            } else if (object[propertie.type] !== propertie.value)
+                return false;
+        }
+
+        return true;
+    };
+
+    _parseSelector(selector) {
+        let selectorsParts = selector.split(' ');
+        let selectorsPartsParsed = [];
+
+        for (let selectorsPart of selectorsParts) {
+            let selectorPartParsed = this._parseSelectorPart(selectorsPart);
+
+            if (!selectorPartParsed)
+                Urso.logger.error('ModulesObjectsService error, cannot parse selector part: ' + selectorsPart);
+
+            selectorsPartsParsed.push(selectorPartParsed);
+        }
+
+        return selectorsPartsParsed;
+    };
+
+    _parseSelectorPart(selectorPart) {
+        const characterEncoding = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+";
+        const matchExpr = {
+            "id": new RegExp("^#(" + characterEncoding + ")"),
+            "name": new RegExp("^\\^(" + characterEncoding + ")"),
+            "class": new RegExp("^\\.(" + characterEncoding + ")")
+        };
+
+        let result = [];
+
+        for (let type in matchExpr) {
+            let foundItem = matchExpr[type].exec(selectorPart);
+
+            if (foundItem) {
+                result.push({ type: type, value: foundItem[1] });
+
+                let restSelectorPart = Urso.helper.stringReplace(foundItem[0], '', selectorPart);
+                let restItems = this._parseSelectorPart(restSelectorPart);
+
+                if (restItems)
+                    return Urso.helper.mergeArrays(result, restItems);
+            }
+        }
+
+        return (result && result.length > 0) ? result : false;
+    };
+}
+
+module.exports = ModulesObjectsFind;

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

@@ -1,25 +1,25 @@
-Urso.Core.Modules.Objects.Models = {
-    AtlasImage: require('./atlasImage.js'),
-    BitmapText: require('./bitmapText.js'),
-    Button: require('./button.js'),
-    ButtonComposite: require('./buttonComposite.js'),
-    Collection: require('./collection.js'),
-    Component: require('./component.js'),
-    Container: require('./container.js'),
-    DragonBones: require('./dragonBones.js'),
-    Emitter: require('./emitter.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'),
-    Spine: require('./spine.js'),
-    Text: require('./text.js'),
-    Slider: require('./slider.js'),
-    Toggle: require('./toggle.js'),
-    Checkbox: require('./checkbox.js'),
-    Scrollbox: require('./scrollbox.js'),
-    TextInput: require('./textInput.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'),
+    Collection: require('./collection.js'),
+    Component: require('./component.js'),
+    Container: require('./container.js'),
+    DragonBones: require('./dragonBones.js'),
+    Emitter: require('./emitter.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'),
+    Spine: require('./spine.js'),
+    Text: require('./text.js'),
+    Slider: require('./slider.js'),
+    Toggle: require('./toggle.js'),
+    Checkbox: require('./checkbox.js'),
+    Scrollbox: require('./scrollbox.js'),
+    TextInput: require('./textInput.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,24 +1,24 @@
-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.fontName = Urso.helper.recursiveGet('fontName', params, false);
-        this.fontSize = Urso.helper.recursiveGet('fontSize', params, false);
-
-        this.maxWidth = Urso.helper.recursiveGet('maxWidth', params, false); //todo
-    }
-
-    _addBaseObject() {
-        this._baseObject = new PIXI.BitmapText(this.text, { fontName: this.fontName, fontSize: this.fontSize });
-    };
-}
-
+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.fontName = Urso.helper.recursiveGet('fontName', params, false);
+        this.fontSize = Urso.helper.recursiveGet('fontSize', params, false);
+
+        this.maxWidth = Urso.helper.recursiveGet('maxWidth', params, false); //todo
+    }
+
+    _addBaseObject() {
+        this._baseObject = new PIXI.BitmapText(this.text, { fontName: this.fontName, fontSize: this.fontSize });
+    };
+}
+
 module.exports = ModulesObjectsModelsBitmapText;