Squashed commit of the following:

commit 2054551bfb01a0f4ca2e138b9d724835462d45cd
Merge: 765c2da 616a853
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 18 13:48:21 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit 765c2da8e1aa03550caf42b2bd5f367555ad2843
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:29:41 2012 -0700

    updating the picasa carousel

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 9484f1c82b81e27edf2dc0a1bcc1fa3b12077406
Merge: d27f2df cacb4a2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 17 15:03:50 2012 -0700

    Merge branch 'refs/heads/master' into integration

commit d27f2df4d846064444263d7832d213535962abe7
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Apr 11 10:39:36 2012 -0700

    integrating new picasa carousel component

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 6f98384c9ecbc8abe55ccfe1fc25a0c7ce22c493
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Tue Apr 10 14:33:00 2012 -0700

    fixed the text area case issue

    Text area was renamed from TextArea to Textarea

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

commit 1e83e26652266136802bc7af930379c1ecd631a6
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Mon Apr 9 22:10:45 2012 -0700

    integrating montage v0.8 into ninja.

    Signed-off-by: Valerio Virgillito <valerio@motorola.com>

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 6 insertions, 8 deletions

diff --git a/node_modules/montage/ui/native-control.js b/node_modules/montage/ui/native-control.js
index 907711e2..7cf65bd5 100644
--- a/node_modules/montage/ui/native-control.js
+++ b/node_modules/montage/ui/native-control.js
@@ -28,10 +28,11 @@ var NativeControl = exports.NativeControl = Montage.create(Component, {
             return this._element;
         },
         set: function(value) {
-            //var component = Object.getPrototypeOf(NativeControl);
-            // call super set
             Object.getPropertyDescriptor(Component, "element").set.call(this, value);
-            this.didSetElement();
+
+            if (value) {
+                this.didSetElement();
+            }
         }
     },
 
@@ -188,7 +189,7 @@ var NativeControl = exports.NativeControl = Montage.create(Component, {
                     this["_"+attributeName] = this._elementAttributeDescriptors[attributeName].value;
                 }
             }
-
+            this.needsDraw = true;
         }
     },
 
@@ -221,12 +222,9 @@ var NativeControl = exports.NativeControl = Montage.create(Component, {
 
                         }
                     }
-
+                    delete this._elementAttributeValues[attributeName];
                 }
             }
-            // the values have been flushed to the DOM.
-            this._elementAttributeValues = {};
-
         }
     }
 });