Merge branch 'master' into pentool

Conflicts:
	js/helper-classes/3D/view-utils.js

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 = {};
-
         }
     }
 });