From c83086ac7be7ff08dd632ab6705c43ba39ca6867 Mon Sep 17 00:00:00 2001
From: marshall007 <marshall007@mac.com>
Date: Mon, 15 Dec 2014 18:36:51 -0600
Subject: [PATCH] feat(config): always call the global onLoad handler

---
 src/ui-ace.js | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/ui-ace.js b/src/ui-ace.js
index e75651d..3b19c36 100644
--- a/src/ui-ace.js
+++ b/src/ui-ace.js
@@ -79,10 +79,12 @@ angular.module('ui.ace', [])
         ]);
       }
 
-      // onLoad callback
-      if (angular.isFunction(opts.onLoad)) {
-        opts.onLoad(acee);
-      }
+      // onLoad callbacks
+      angular.forEach(opts.callbacks, function (cb) {
+        if (angular.isFunction(cb)) {
+          cb(acee);
+        }
+      });
 
       // Basic options
       if (angular.isString(opts.theme)) {
@@ -272,15 +274,19 @@ angular.module('ui.ace', [])
           };
         }
 
-        // set the options here, even if we try to watch later, if this
-        // line is missing things go wrong (and the tests will also fail)
-        setOptions(acee, session, opts);
-
         // Listen for option updates
-        scope.$watch( attrs.uiAce, function(current, previous) {
+        var updateOptions = function (current, previous) {
           if (current === previous) return;
           opts = angular.extend({}, options, scope.$eval(attrs.uiAce));
 
+          opts.callbacks = [ opts.onLoad ];
+          if (opts.onLoad !== options.onLoad) {
+            // also call the global onLoad handler
+            opts.callbacks.unshift(options.onLoad);
+          }
+
+          // EVENTS
+
           // unbind old change listener
           session.removeListener('change', onChangeListener);
 
@@ -297,14 +303,13 @@ angular.module('ui.ace', [])
           acee.on('blur', onBlurListener);
 
           setOptions(acee, session, opts);
-        }, /* deep watch */ true );
+        };
 
-        // EVENTS
-        onChangeListener = listenerFactory.onChange(opts.onChange);
-        session.on('change', onChangeListener);
+        scope.$watch(attrs.uiAce, updateOptions, /* deep watch */ true);
 
-        onBlurListener = listenerFactory.onBlur(opts.onBlur);
-        acee.on('blur', onBlurListener);
+        // set the options here, even if we try to watch later, if this
+        // line is missing things go wrong (and the tests will also fail)
+        updateOptions(options);
 
         elm.on('$destroy', function () {
           acee.session.$stopWorker();