Merge branch 'canary'

Author: knalli

bower.json

@@ -2,7 +2,7 @@
   "author": "Jan Philipp",
   "name": "angular-vertxbus",
   "description": "Seed for reusable Angular components.",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "repository": {
     "type": "git",

dist/angular-vertxbus-0.4.0.js dist/angular-vertxbus-0.4.1.jsdist/angular-vertxbus-0.4.0.js renamed to dist/angular-vertxbus-0.4.1.js

@@ -204,7 +204,7 @@
           }
         },
         getConnectionState: function (immediate) {
-          if (enabled && vertxEventBus) {
+          if (enabled && (vertxEventBus != null ? vertxEventBus.EventBus : void 0)) {
             if (immediate) {
               connectionState = vertxEventBus.readyState();
             }

dist/angular-vertxbus-0.4.0.min.js dist/angular-vertxbus-0.4.1.min.jsdist/angular-vertxbus-0.4.0.min.js renamed to dist/angular-vertxbus-0.4.1.min.js

@@ -205,7 +205,7 @@ define(['vertxbus'], function () {
             }
           },
           getConnectionState: function (immediate) {
-            if (enabled && vertxEventBus) {
+            if (enabled && (vertxEventBus != null ? vertxEventBus.EventBus : void 0)) {
               if (immediate) {
                 connectionState = vertxEventBus.readyState();
               }

dist/requirejs/angular-vertxbus.js

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Seed for reusable Angular components.",
   "main": "dist/angular-vertxbus.min.js",
   "scripts": {

package.json

@@ -180,7 +180,7 @@ module.service('vertxEventBusService', ($rootScope, $q, $interval, $timeout, ver
     # Get the current connection state of the event bus.
     # @param immediate if true the state will be re-fetched from the event bus
     getConnectionState : (immediate) ->
-      if enabled and vertxEventBus
+      if enabled and vertxEventBus?.EventBus
         connectionState = vertxEventBus.readyState() if immediate
       else
         connectionState = vertxEventBus.EventBus.CLOSED