38 files changed, 1454 insertions, 1337 deletions

diff --git a/node_modules/montage/ui/application.js b/node_modules/montage/ui/application.js
index c7b3dc73..7cb4bd97 100755
--- a/node_modules/montage/ui/application.js
+++ b/node_modules/montage/ui/application.js
@@ -175,7 +175,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
     _createPopupSlot: {value: function(zIndex) {
         var slotEl = document.createElement('div');
         document.body.appendChild(slotEl);
-        slotEl.style['z-index'] = zIndex;
+        slotEl.style.zIndex = zIndex;
         slotEl.style.position = 'absolute';
 
         var popupSlot = Slot.create();
@@ -221,7 +221,7 @@ var Application = exports.Application = Montage.create(Montage, /** @lends monta
                 }
                 // use the new zIndex for custom popup
                 if(!isSystemPopup) {
-                    popupSlot.element.style['z-index'] = zIndex;
+                    popupSlot.element.style.zIndex = zIndex;
                 }
 
                 popupSlot.content = content;
diff --git a/node_modules/montage/ui/bluemoon/progress.reel/progress.js b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
index 8bc68b05..20c60d94 100644
--- a/node_modules/montage/ui/bluemoon/progress.reel/progress.js
+++ b/node_modules/montage/ui/bluemoon/progress.reel/progress.js
@@ -43,8 +43,8 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
         set: function(val) {
             if(val !== this._value) {
                 this._value = val;
-                if(this._value > this._maximumValue) {
-                    this._value = this._maximumValue;
+                if(this._value > this._max) {
+                    this._value = this._max;
                 }
                 if(this._value < 0) {
                     this._value = 0;
@@ -57,7 +57,7 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
   Description TODO
   @private
 */
-    _maximumValue: {
+    _max: {
         enumerable: false,
         value: 100
     },
@@ -66,15 +66,15 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
         @type {Function}
         @default {Number} 100
     */
-    maximumValue: {
+    max: {
         get: function() {
-            return this._maximumValue;
+            return this._max;
         },
         set: function(val) {
-            if(val !== this._maximumValue) {
-                this._maximumValue = val;
-                if(this._maximumValue <= 0) {
-                    this._maximumValue = 1; // Prevent divide by zero errors
+            if(val !== this._max) {
+                this._max = val;
+                if(this._max <= 0) {
+                    this._max = 1; // Prevent divide by zero errors
                 }
                 this.needsDraw = true;
             }
@@ -120,7 +120,7 @@ exports.Progress = Montage.create(Component,/** @lends module:"montage/ui/bluemo
     draw: {
         enumerable: false,
         value: function() {
-            var ratio = this._value / this._maximumValue;
+            var ratio = this._value / this._max;
             // constrain to interval [0, 1]
             ratio = Math.min(Math.max(ratio, 0), 1);
             // map into [0, 100]
diff --git a/node_modules/montage/ui/check-input.js b/node_modules/montage/ui/check-input.js
index 42538c02..1621eb45 100644
--- a/node_modules/montage/ui/check-input.js
+++ b/node_modules/montage/ui/check-input.js
@@ -69,7 +69,7 @@ var CheckInput = exports.CheckInput =  Montage.create(NativeControl, {
     Stores if we need to fake checking.
 
     When preventDefault is called on touchstart and touchend events (e.g. by
-    the scrollview component) the checkbox doesn't check itself, so we need
+    the scroller component) the checkbox doesn't check itself, so we need
     to fake it later.
 
     @default false
diff --git a/node_modules/montage/ui/checkbox.reel/checkbox.js b/node_modules/montage/ui/checkbox.reel/checkbox.js
index df2995c3..c6364e97 100644
--- a/node_modules/montage/ui/checkbox.reel/checkbox.js
+++ b/node_modules/montage/ui/checkbox.reel/checkbox.js
@@ -9,7 +9,7 @@ var Montage = require("montage").Montage,
 
 var Checkbox = exports.Checkbox = Montage.create(CheckInput, {});
 Checkbox.addAttributes({
-    autofocus: 'off', // on/off
+    autofocus: {value: false, dataType: 'boolean'},
     disabled: {value: false, dataType: 'boolean'},
     checked: {value: false, dataType: 'boolean'},
     form: null,
diff --git a/node_modules/montage/ui/component.js b/node_modules/montage/ui/component.js
index d347f655..69559fc1 100755
--- a/node_modules/montage/ui/component.js
+++ b/node_modules/montage/ui/component.js
@@ -59,7 +59,6 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         value: function() {
             var actionEvent = document.createEvent("CustomEvent");
             actionEvent.initCustomEvent("action", true, true, null);
-            actionEvent.type = "action";
             return actionEvent;
         }
     },
@@ -162,6 +161,15 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         }
     },
 
+    setElementWithParentComponent: {
+        value: function(element, parent) {
+            this._alternateParentComponent = parent;
+            if (this.element != element) {
+                this.element = element;
+            }
+        }
+    },
+
     // access to the Application object
 /**
     Description TODO
@@ -215,6 +223,11 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
             return targetElementController;
         }
     },
+
+    _alternateParentComponent: {
+        value: null
+    },
+
 /**
   Description TODO
   @private
@@ -235,21 +248,27 @@ var Component = exports.Component = Montage.create(Montage,/** @lends module:mon
         get: function() {