From e3bd22de8c3eb892408cedfec85e6bc0594bab32 Mon Sep 17 00:00:00 2001
From: Dhrubomoy Das Gupta <dhrubo_moy@yahoo.com>
Date: Wed, 7 Jun 2017 23:01:14 -0400
Subject: [PATCH] [Autocomplete] Minor refactoring

---
 .../clock/src/controllers/ClockController.js  |  4 ++--
 .../res/templates/controls/autocomplete.html  |  4 ++--
 .../src/controllers/AutocompleteController.js | 21 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/platform/features/clock/src/controllers/ClockController.js b/platform/features/clock/src/controllers/ClockController.js
index 945be23f87..02b32cfc4f 100644
--- a/platform/features/clock/src/controllers/ClockController.js
+++ b/platform/features/clock/src/controllers/ClockController.js
@@ -48,7 +48,7 @@ define([
             function update() {
                 var m = zoneName ?
                     moment.utc(lastTimestamp).tz(zoneName) : moment.utc(lastTimestamp);
-                self.zoneAbbr = zoneName ? m.zoneAbbr() : "UTC";
+                self.zoneAbbr = m.zoneAbbr();
                 self.textValue = timeFormat && m.format(timeFormat);
                 self.ampmValue = m.format("A"); // Just the AM or PM part
             }
@@ -69,8 +69,8 @@ define([
                     // If wrong timezone is provided, the UTC will be used
                     zoneName = momentTimezone.tz.names().includes(model.timezone) ? 
                         model.timezone : "UTC";
+                    update();
                 }
-                update();
             }
 
             // Pull in the model (clockFormat and timezone) from the domain object model
diff --git a/platform/forms/res/templates/controls/autocomplete.html b/platform/forms/res/templates/controls/autocomplete.html
index e64085fa4a..9649088848 100644
--- a/platform/forms/res/templates/controls/autocomplete.html
+++ b/platform/forms/res/templates/controls/autocomplete.html
@@ -26,12 +26,12 @@
            type="text"
            ng-model="ngModel[field]"
            ng-change="filterOptions(ngModel[field])"
-           ng-click="inputClicked($event)"
+           ng-click="inputClicked()"
            ng-keydown="keyDown($event)"/>
     <span class="icon-arrow-down"
           ng-click="arrowClicked()"></span>
     <div class="autocompleteOptions"
-         onload="hideOptions = false"
+         ng-init="hideOptions = true"
          ng-hide="hideOptions"
          mct-click-elsewhere="hideOptions = true">
         <ul>  
diff --git a/platform/forms/src/controllers/AutocompleteController.js b/platform/forms/src/controllers/AutocompleteController.js
index fa26788e9d..efba33b742 100644
--- a/platform/forms/src/controllers/AutocompleteController.js
+++ b/platform/forms/src/controllers/AutocompleteController.js
@@ -33,10 +33,11 @@ define(
         function AutocompleteController($scope, $element) {
 
             var key = {
-                    down: 40,
-                    up: 38,
-                    enter: 13
-                }
+                        down: 40,
+                        up: 38,
+                        enter: 13
+                    },
+                autocompleteInputElement = $element[0].getElementsByClassName('autocompleteInput')[0];
 
             if($scope.options[0].name) {
                 // If "options" include name, value pair
@@ -53,6 +54,7 @@ define(
                     $scope.optionIndex = $scope.filteredOptions.length;
                 }
                 $scope.optionIndex--;
+                fillInputWithIndexedOption();
             }
 
             function incrementOptionIndex() {
@@ -60,6 +62,7 @@ define(
                     $scope.optionIndex = -1;
                 }
                 $scope.optionIndex++;
+                fillInputWithIndexedOption();
             }
 
             function fillInputWithString(string) {
@@ -85,12 +88,10 @@ define(
                     switch(keyCode) {
                         case key.down:
                             incrementOptionIndex();
-                            fillInputWithIndexedOption();
                             break;
                         case key.up:
                             $event.preventDefault();    // Prevents cursor jumping back and forth
                             decrementOptionIndex();
-                            fillInputWithIndexedOption();
                             break;
                         case key.enter:
                             if($scope.filteredOptions[$scope.optionIndex]) {
@@ -112,14 +113,12 @@ define(
                 });
             }
 
-            $scope.inputClicked = function($event) {
-                var target = $event.target;
-                target.select();
-                showOptions(target.value);
+            $scope.inputClicked = function() {
+                autocompleteInputElement.select();
+                showOptions(autocompleteInputElement.value);
             }
 
             $scope.arrowClicked = function() {
-                var autocompleteInputElement = $element[0].getElementsByClassName('autocompleteInput')[0];
                 autocompleteInputElement.select();
                 showOptions('');
             }