squash merge open933 into integration-1089, resolve merge conflicts.

2016-10-12 13:47:56 -07:00
parent 7b218c7f02
commit 65043d0ff3
76 changed files with 4955 additions and 358 deletions
--- a/platform/forms/src/MCTControl.js
+++ b/platform/forms/src/MCTControl.js
@@ -71,6 +71,9 @@ define(
                    // Allow controls to trigger blur-like events
                    ngBlur: "&",

+                    // Allow controls to trigger blur-like events
+                    ngMouseup: "&",
+
                    // The state of the form value itself
                    ngModel: "=",