fix(#3): jqLite.triggerHandler() doesn't accept event objects

- By passing an event string name instead events should resume firing
properly.
- Converted $() to angular.element
- Converted .trigger() to .triggerHandler() in spec
- Added 'ui.event' as a module dependency
- Re-enabled tests
- Regression introduced by d77bfe7

Author: Dean Sofer

src/map.js

@@ -1,15 +1,14 @@
 (function () {
-  var app = angular.module('ui.map', []);
+  var app = angular.module('ui.map', ['ui.event']);
 
   //Setup map events from a google map object to trigger on a given element too,
   //then we just use ui-event to catch events from an element
   function bindMapEvents(scope, eventsStr, googleObject, element) {
     angular.forEach(eventsStr.split(' '), function (eventName) {
       //Prefix all googlemap events with 'map-', so eg 'click' 
       //for the googlemap doesn't interfere with a normal 'click' event
-      var $event = { type: 'map-' + eventName };
-      google.maps.event.addListener(googleObject, eventName, function (evt) {
-        element.triggerHandler(angular.extend({}, $event, evt));
+      google.maps.event.addListener(googleObject, eventName, function (event) {
+        element.triggerHandler('map-' + eventName, event);
         //We create an $apply if it isn't happening. we need better support for this
         //We don't want to use timeout because tons of these events fire at once,
         //and we only need one $apply
@@ -18,7 +17,7 @@
     });
   }
 
-  app.directive('uiMap',
+  app.value('uiMapConfig', {}).directive('uiMap',
     ['uiMapConfig', '$parse', function (uiMapConfig, $parse) {
 
       var mapEvents = 'bounds_changed center_changed click dblclick drag dragend ' +

test/googlemaps.js

@@ -1,4 +1,4 @@
-xdescribe('uiMap', function () {
+describe('uiMap', function () {
   var scope, $rootScope, $compile;
 
   beforeEach(module('ui.map'));
@@ -10,17 +10,17 @@ xdescribe('uiMap', function () {
   function createMap(options, events) {
     scope.gmapOptions = options || {};
     scope.gmapEvents = events || {};
-    $compile("<div ui-map='gmap' ui-options='gmapOptions'" +
-      "' ui-event='gmapEvents'></div>")(scope);
+    $compile("<div><div ui-map='gmap' ui-options='gmapOptions'" +
+      "' ui-event='gmapEvents'></div></div>")(scope);
   }
 
   function createWindow(options, events, inner) {
     scope.gOptions = options || {};
     scope.gEvents = events || {};
-    inner = inner || angular.element('');
-    var elm = angular.element("<div ui-map-info-window='ginfo' " +
-      "ui-options='gOptions' ui-event='gEvents'></div>");
-    elm.append(inner);
+    var elm = angular.element("<div><div ui-map-info-window='ginfo' " +
+      "ui-options='gOptions' ui-event='gEvents'></div></div>");
+    if (inner)
+      elm.children().append(inner);
     $compile(elm)(scope);
   }
 
@@ -67,15 +67,15 @@ xdescribe('uiMap', function () {
     });
 
     it('should create info window with given options & content', function () {
-      var content = $('<h1>Hi</h1>');
+      var content = angular.element('<h1>Hi</h1>');
       createWindow({ zIndex: 5 }, {}, content);
       expect(scope.ginfo.getZIndex()).toBe(5);
       expect(scope.ginfo.getContent().innerHTML)
-        .toBe($('<div>').append(content).html());
+        .toBe(angular.element('<div>').append(content).html());
     });
 
     it('should $compile content and recognize scope changes', function () {
-      var inner = $('<input ng-model="myVal">');
+      var inner = angular.element('<input ng-model="myVal">');
       createWindow({}, {}, inner);
       createMap();
       scope.$apply(function () {
@@ -90,6 +90,7 @@ xdescribe('uiMap', function () {
     });
 
     it('should recognize infowindow events in ui-event as "map-eventname"', function () {
+      expect(scope.closed).toBeUndefined();
       createWindow({}, {
         'map-closeclick': 'closed = true'
       });

test/mapSpec.js

@@ -5,17 +5,19 @@ files = [
   JASMINE_ADAPTER,
   'components/angular/angular.js',
   'components/angular-mocks/angular-mocks.js',
+  'components/angular-ui-utils/modules/event/event.js',
   'src/*.js',
+  'test/googlemaps.js',
   'test/*Spec.js'
 ];
 
-// Avoid including minified version of angular and other libs again
-exclude = [
-  'components/*/*.min.js'
-];
-
 singleRun = true;
 
+// level of logging
+// possible values = karma.LOG_DISABLE || karma.LOG_ERROR || karma.LOG_WARN || karma.LOG_INFO || karma.LOG_DEBUG
+// CLI --log-level debug
+logLevel = LOG_INFO,
+
 reporters = [
 	'dots'
 ];