1.0.3

mrsteele · Jan 31, 2016 · 3d6ceea · 3d6ceea
1 parent 9a3a001
commit 3d6ceea
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 16 deletions.
diff --git a/dist/ng-alerts.js b/dist/ng-alerts.js
@@ -1,4 +1,4 @@
-/*! ng-alerts 2016-01-21 */
+/*! ng-alerts 2016-01-30 */
 'use strict';
 
 angular.module('ngAlerts', ['ui.bootstrap'])
@@ -82,7 +82,8 @@ angular.module('ngAlerts').directive('ngAlertsList', [
                     $scope.alerts = ngAlertsMngr.get();
                 }
 
-                $scope.remove = function (id) {
+                $scope.remove = function (id, $event) {
+                    $event.stopImmediatePropagation();
                     ngAlertsMngr.remove(id);
                 };
 
@@ -163,9 +164,9 @@ angular.module('ngAlerts').directive('ngAlertsPopover', [
                 $element.removeAttr('ng-alerts-popover');
 
                 // @todo - Update this to not close when clicking on the window...
-//                if (!$attrs.popoverTrigger) {
-//                    $element.attr('popover-trigger', 'outsideClick');
-//                }
+                if (!$attrs.popoverTrigger) {
+                    $element.attr('popover-trigger', 'outsideClick');
+                }
 
                 // Custom classes not available yet
                 $element.attr('popover-class', 'ng-alerts-popover-list');
@@ -406,7 +407,7 @@ angular.module('ngAlerts').run(['$templateCache', function($templateCache) {
     "                        {{alert.msg}}\n" +
     "                    </td>\n" +
     "                    <td>\n" +
-    "                        <button ng-click=\"remove(alert.id)\" type=\"button\" class=\"close\" aria-label=\"Close\">\n" +
+    "                        <button ng-click=\"remove(alert.id, $event)\" type=\"button\" class=\"close\" aria-label=\"Close\">\n" +
     "                            <span aria-hidden=\"true\">&times;</span>\n" +
     "                        </button>\n" +
     "                    </td>\n" +

diff --git a/dist/ng-alerts.min.js b/dist/ng-alerts.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ng-alerts",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "",
   "main": "Gruntfile.js",
   "scripts": {

diff --git a/src/directives/ng-alerts-list.js b/src/directives/ng-alerts-list.js
@@ -16,7 +16,8 @@ angular.module('ngAlerts').directive('ngAlertsList', [
                     $scope.alerts = ngAlertsMngr.get();
                 }
 
-                $scope.remove = function (id) {
+                $scope.remove = function (id, $event) {
+                    $event.stopImmediatePropagation();
                     ngAlertsMngr.remove(id);
                 };
 

diff --git a/src/directives/ng-alerts-popover.js b/src/directives/ng-alerts-popover.js
@@ -22,9 +22,9 @@ angular.module('ngAlerts').directive('ngAlertsPopover', [
                 $element.removeAttr('ng-alerts-popover');
 
                 // @todo - Update this to not close when clicking on the window...
-//                if (!$attrs.popoverTrigger) {
-//                    $element.attr('popover-trigger', 'outsideClick');
-//                }
+                if (!$attrs.popoverTrigger) {
+                    $element.attr('popover-trigger', 'outsideClick');
+                }
 
                 // Custom classes not available yet
                 $element.attr('popover-class', 'ng-alerts-popover-list');

diff --git a/src/tpls/list.html b/src/tpls/list.html
@@ -12,7 +12,7 @@
                         {{alert.msg}}
                     </td>
                     <td>
-                        <button ng-click="remove(alert.id)" type="button" class="close" aria-label="Close">
+                        <button ng-click="remove(alert.id, $event)" type="button" class="close" aria-label="Close">
                             <span aria-hidden="true">&times;</span>
                         </button>
                     </td>

diff --git a/test/index.html b/test/index.html
@@ -11,13 +11,13 @@
     <script src="../bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
 
     <!-- JS: ng-alerts -->
-    <script src="../dist/ng-alerts.min.js"></script>
+    <script src="../dist/ng-alerts.js"></script>
 
     <!-- CSS: Dependencies -->
     <link rel="stylesheet" href="../bower_components/bootstrap/dist/css/bootstrap.css">
 
     <!-- CSS: ng-alerts -->
-    <link rel="stylesheet" href="../dist/ng-alerts.min.css">
+    <link rel="stylesheet" href="../dist/ng-alerts.css">
 
     <!--[if lt IE 9]>
     <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -70,7 +70,7 @@
             <div class="container">
                 <ul class="nav navbar-nav navbar-right">
                     <li>
-                        <a class="t" href="#" ng-alerts-popover popover-placement="bottom">
+                        <a class="t" href="#" ng-alerts-popover popover-placement="bottom-right">
                             <ng-alerts-count badge="true" hide-empty="true"></ng-alerts-count> messages
                         </a>
                     </li>