Skip to content
This repository was archived by the owner on Sep 20, 2019. It is now read-only.

Commit 49039f0

Browse files
committed
Merge branch 'master' of github.com:elesdoar/ui-leaflet into leaflet-1.X
2 parents 80ba62f + b551246 commit 49039f0

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ This branch is the current development for ui-leaflet library on it will be curr
3737
[AngularJS](http://angularjs.org/) directive for the [Leaflet](http://www.leafletjs.com/) Javascript
3838
Library. This software aims to easily embed maps managed by Leaflet on your project.
3939

40-
[![Join the chat at https://gitter.im/angular-ui/ui-leaflet](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-leaflet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
40+
[![Join the chat at https://gitter.im/angular-ui/ui-leaflet](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular-ui/ui-leaflet?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![CDNJS](https://img.shields.io/cdnjs/v/ui-leaflet.svg)](https://cdnjs.com/libraries/ui-leaflet)
4141

4242
[![Build Status](https://travis-ci.org/angular-ui/ui-leaflet.png?branch=leaflet-1.X)](https://travis-ci.org/angular-ui/ui-leaflet?branch=leaflet-1.X) [![Dependencies](https://david-dm.org/angular-ui/ui-leaflet.svg)](https://david-dm.org/angular-ui/ui-leaflet) 
4343
[![Dependencies](https://david-dm.org/angular-ui/ui-leaflet/dev-status.svg)](https://david-dm.org/angular-ui/ui-leaflet) [![Coverage

src/services/events/leafletEventsHelpers.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,12 @@ angular.module('ui-leaflet')
9292
// Event propadation logic
9393
if (isDefined(leafletScope.eventBroadcast[this.lObjectType].logic)) {
9494
// We take care of possible propagation logic
95-
if (leafletScope.eventBroadcast[_this.lObjectType].logic !== "emit" &&
96-
leafletScope.eventBroadcast[_this.lObjectType].logic !== "broadcast")
97-
$log.warn(errorHeader + "Available event propagation logic are: 'emit' or 'broadcast'.");
95+
var configuredLogic = leafletScope.eventBroadcast[_this.lObjectType].logic;
96+
if (configuredLogic !== "emit" && configuredLogic !== "broadcast"){
97+
$log.warn(errorHeader + "Available event propagation logic are: 'emit' or 'broadcast'.");
98+
}else{
99+
logic = configuredLogic;
100+
}
98101
}
99102
// Enable / Disable
100103
var eventsEnable = false, eventsDisable = false;

0 commit comments

Comments
 (0)