From b55bddf8bac9fa3de7acdffba9382c9eaf42f0e0 Mon Sep 17 00:00:00 2001 From: Svetlana Linuxenko Date: Wed, 29 Mar 2017 16:35:02 +0300 Subject: [PATCH] Injected reference fix --- lib/cream.js | 7 ++++++- package.json | 2 +- tests/cake.test.js | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lib/cream.js b/lib/cream.js index 5d7c7f7..ca61980 100644 --- a/lib/cream.js +++ b/lib/cream.js @@ -44,7 +44,7 @@ Cream.prototype.get = function(name) { * It is property function */ if (ref && typeof ref === 'object' && ref.isProperty === true) { - return ref.fn.call(this); + return ref.fn.call(ref.parent); } return ref; @@ -260,9 +260,14 @@ Cream.extend = function(obj) { F[i] = typeof obj[i] === 'function' && !obj[i].isInjection ? obj[i].bind(F) : obj[i]; + if (F[i] && typeof F[i] === 'object' && F[i].isObserver === true) { F._addObserver(F[i]); } + + if (obj[i] && typeof obj[i] === 'object' && obj[i].isProperty) { + obj[i].parent = F; + } } } diff --git a/package.json b/package.json index 09f11b0..63c5c6e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "cakejs2", - "version": "0.1.0", + "version": "0.1.1", "description": "Lightweight front-end framework with only best parts and features of most awesome frameworks.", "main": "index.js", "files": [ diff --git a/tests/cake.test.js b/tests/cake.test.js index db13f47..5c9b0b7 100644 --- a/tests/cake.test.js +++ b/tests/cake.test.js @@ -246,4 +246,23 @@ describe('Cake', function() { expect(initSpy.calledOnce).to.be.true; }); + + it('should handle injected props', function() { + cake.Cream.extend({ + _namespace: 'routes.store', + getNum: function() { + return this.get('data')[1] * 2; + }.property(), + data: [ 1, 2, 3, 4] + }); + + var Component = cake.Cream.extend({ + store: cake.inject('routes.store'), + test: function() { + return this.get('store.getNum'); + } + }); + + expect(Component.test()).to.be.equal(4); + }); });