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/commonUI/general/res/templates/controls/datetime-field.html
+++ b/platform/commonUI/general/res/templates/controls/datetime-field.html
@@ -23,6 +23,8 @@
    <input type="text"
           ng-model="textValue"
           ng-blur="restoreTextValue(); ngBlur()"
+           ng-mouseup="ngMouseup()"
+           ng-disabled="ngDisabled"
           ng-class="{
                        error: textInvalid ||
                            (structure.validate &&