[open-ils-commits] [GIT] Evergreen ILS branch master updated. 014fc6aa63a1512bd0bf2cf4582ac79fb85e82d0

Evergreen Git git at git.evergreen-ils.org
Tue Mar 21 09:48:33 EDT 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  014fc6aa63a1512bd0bf2cf4582ac79fb85e82d0 (commit)
      from  782803c5dd81ac7547a5011015fe04dd9ad1562e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 014fc6aa63a1512bd0bf2cf4582ac79fb85e82d0
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Mar 7 12:25:32 2017 -0500

    LP#1670512 Apply focus/select model udpates via timeout
    
    Avoid manually invoking scope.$apply() in the midst of an angular
    $digest loop, since this is forbidden by angular.  Wrap the apply()'s in
    a $timeout, so they occur after the currently running digest.
    
    Fixes the focusMe, blurMe, and selectMe directives.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index 5d73487..7328e7d 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -19,7 +19,9 @@ function($timeout , $parse) {
                     $timeout(function() {element[0].focus()});
             });
             element.bind('blur', function() {
-                scope.$apply(model.assign(scope, false));
+                $timeout(function() {
+                    scope.$apply(model.assign(scope, false));
+                });
             })
         }
     };
@@ -41,7 +43,9 @@ function($timeout , $parse) {
                     $timeout(function() {element[0].blur()});
             });
             element.bind('focus', function() {
-                scope.$apply(model.assign(scope, false));
+                $timeout(function() {
+                    scope.$apply(model.assign(scope, false));
+                });
             })
         }
     };
@@ -61,7 +65,9 @@ function($timeout , $parse) {
                     $timeout(function() {element[0].select()});
             });
             element.bind('blur', function() {
-                scope.$apply(model.assign(scope, false));
+                $timeout(function() {
+                    scope.$apply(model.assign(scope, false));
+                });
             })
         }
     };

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/staff/services/ui.js |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list