From a2c6b5bcd825780c6d439583b307af548a03f5ef Mon Sep 17 00:00:00 2001
From: Borys Levytskyi <blevtisky@yandex.ru>
Date: Fri, 3 Apr 2015 12:08:07 +0300
Subject: [PATCH] Minor fixes

---
 app/controllers.js      | 3 +--
 components/container.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/controllers.js b/app/controllers.js
index 6d843e0..bf40f9b 100644
--- a/app/controllers.js
+++ b/app/controllers.js
@@ -25,8 +25,7 @@
            if(vw.childNodes.length == 0) {
                vw.appendChild(htmlElement);
            }
-           else
-           {
+           else {
                vw.insertBefore(htmlElement, vw.childNodes[0]);
            }
        }
diff --git a/components/container.js b/components/container.js
index 9739f75..0b0cc47 100644
--- a/components/container.js
+++ b/components/container.js
@@ -31,7 +31,7 @@
 
     Container.prototype.resolveProperties = function (instance) {
         for(var property in instance) {
-            if(property[0] == '$') {
+            if(property[0] == '$' && instance[property] == null) {
                 var name = property.substr(1, property.length - 1);
                 instance[property] = this.resolve(name);