Merge branch 'marshall007-global-load'

Author: douglasduteil

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();

test/ace.spec.js

@@ -167,14 +167,37 @@ describe('uiAce', function () {
         });
       });
       describe('onLoad', function () {
-        it('runs the onLoad callback', function () {
-          scope.aceLoaded = function () {
-          };
-          spyOn(scope, 'aceLoaded');
+        it('should call the local onLoad callback', function () {
+          scope.aceLoaded = jasmine.createSpy('scope.aceLoaded');
           $compile('<div ui-ace="{onLoad: aceLoaded}">')(scope);
           expect(scope.aceLoaded).toHaveBeenCalled();
           expect(scope.aceLoaded).toHaveBeenCalledWith(_ace);
         });
+
+        it('should call the global onLoad callback', function () {
+          uiConfig.ace.onLoad = jasmine.createSpy('uiConfig.ace.onLoad');
+          $compile('<div ui-ace>')(scope);
+          expect(uiConfig.ace.onLoad).toHaveBeenCalled();
+          expect(uiConfig.ace.onLoad).toHaveBeenCalledWith(_ace);
+        });
+
+        it('should call both local/global onLoad callbacks', function () {
+          scope.aceLoaded = jasmine.createSpy('scope.aceLoaded');
+          uiConfig.ace.onLoad = jasmine.createSpy('uiConfig.ace.onLoad');
+          $compile('<div ui-ace="{onLoad: aceLoaded}">')(scope);
+          expect(uiConfig.ace.onLoad).toHaveBeenCalled();
+          expect(uiConfig.ace.onLoad).toHaveBeenCalledWith(_ace);
+          expect(scope.aceLoaded).toHaveBeenCalled();
+          expect(scope.aceLoaded).toHaveBeenCalledWith(_ace);
+        });
+
+        it('should detect same local/global onLoad callback', function () {
+          uiConfig.ace.onLoad = jasmine.createSpy('uiConfig.ace.onLoad');
+          scope.aceLoaded = uiConfig.ace.onLoad;
+          $compile('<div ui-ace="{onLoad: aceLoaded}">')(scope);
+          expect(uiConfig.ace.onLoad.calls.count()).toBe(1);
+          expect(uiConfig.ace.onLoad).toHaveBeenCalledWith(_ace);
+        });
       });
     });