From 35d549121d6689b2fb4834e5195d63681820e423 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 19 May 2016 15:01:26 -0400
Subject: [PATCH] (js) Fix creation of chip on blur

---
 NEWS                                          |  6 +++
 .../js/Common/sgTransformOnBlur.directive.js  | 38 ++++++++++++++-----
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index acdeb2006..b2bac30bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+3.1.1 (2016-MM-DD)
+------------------
+
+Bug fixes
+ - [web] fix creation of chip on blur (sgTransformOnBlur directive)
+
 3.1.0 (2016-05-18)
 ------------------
 
diff --git a/UI/WebServerResources/js/Common/sgTransformOnBlur.directive.js b/UI/WebServerResources/js/Common/sgTransformOnBlur.directive.js
index 1768146b1..43a8a9a88 100644
--- a/UI/WebServerResources/js/Common/sgTransformOnBlur.directive.js
+++ b/UI/WebServerResources/js/Common/sgTransformOnBlur.directive.js
@@ -1,6 +1,7 @@
 /* -*- Mode: javascript; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
 (function() {
+  /* jshint loopfunc: true */
   'use strict';
 
   /**
@@ -24,7 +25,8 @@
              md-transform-chip="editor.addRecipient($chip, 'to')"
              sg-transform-on-blur>
    */
-  function sgTransformOnBlur() {
+  sgTransformOnBlur.$inject = ['$window', '$timeout'];
+  function sgTransformOnBlur($window, $timeout) {
     return {
       link: link,
       require: 'mdChips', // Extends the original mdChips directive
@@ -32,15 +34,33 @@
     };
 
     function link(scope, element, attributes, mdChipsCtrl) {
-      mdChipsCtrl.onInputBlur = function() {
-        this.inputHasFocus = false;
+      var mouseUpActions = [];
 
-        // ADDED CODE
-        var chipBuffer = this.getChipBuffer();
-        if ((this.hasAutocomplete && this.requireMatch) || !chipBuffer || chipBuffer === "") return;
-        this.appendChip(chipBuffer);
-        this.resetChipBuffer();
-        // - EOF - ADDED CODE
+      mdChipsCtrl.onInputBlur = function() {
+        var appendFcn;
+
+        this.inputHasFocus = false;
+        appendFcn = (function() {
+          var chipBuffer = this.getChipBuffer();
+          if ((this.hasAutocomplete && this.requireMatch) || !chipBuffer || chipBuffer === "") return;
+          this.appendChip(chipBuffer);
+          this.resetChipBuffer();
+        }).bind(this);
+
+        if (this.hasAutocomplete) {
+          mouseUpActions.push(appendFcn);
+          $window.addEventListener('click', function(event){
+            while (mouseUpActions.length > 0) {
+              // Trigger actions after some delay to give time to md-autocomple to clear the input field
+              var action = mouseUpActions.splice(0,1)[0];
+              $timeout(function(){
+                $timeout(action);
+              });
+            }
+          }, false);
+        }
+        else
+          appendFcn();
       };
     }
   }