Skip to content

Commit bf5f9d7

Browse files
author
Jan Stevens
committed
Merge pull request marcorinck#20 from vik-singh/master
Fix for Angular 1.3 http interceptor api change
2 parents 0f71446 + 8cf8fad commit bf5f9d7

File tree

6 files changed

+53
-44
lines changed

6 files changed

+53
-44
lines changed

build/angular-growl.css

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/angular-growl.js

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* angular-growl-v2 - v0.6.1 - 2014-05-25
2+
* angular-growl-v2 - v0.6.1 - 2014-06-19
33
* http://janstevens.github.io/angular-growl-2
44
* Copyright (c) 2014 Marco Rinck,Jan Stevens; Licensed MIT
55
*/
@@ -29,7 +29,11 @@ angular.module('angular-growl').directive('growl', [
2929
function addMessage(message) {
3030
$timeout(function () {
3131
message.text = $sce.trustAsHtml(String(message.text));
32-
$scope.messages.push(message);
32+
if (growl.reverseOrder()) {
33+
$scope.messages.unshift(message);
34+
} else {
35+
$scope.messages.push(message);
36+
}
3337
if (message.ttl && message.ttl !== -1) {
3438
$timeout(function () {
3539
$scope.deleteMessage(message);
@@ -107,7 +111,7 @@ angular.module('angular-growl').provider('growl', function () {
107111
error: null,
108112
warning: null,
109113
info: null
110-
}, _messagesKey = 'messages', _messageTextKey = 'text', _messageTitleKey = 'title', _messageSeverityKey = 'severity', _onlyUniqueMessages = true, _messageVariableKey = 'variables', _referenceId = 0, _inline = false, _position = 'top-right', _disableCloseButton = false, _disableIcons = false;
114+
}, _messagesKey = 'messages', _messageTextKey = 'text', _messageTitleKey = 'title', _messageSeverityKey = 'severity', _onlyUniqueMessages = true, _messageVariableKey = 'variables', _referenceId = 0, _inline = false, _position = 'top-right', _disableCloseButton = false, _disableIcons = false, _reverseOrder = false;
111115
this.globalTimeToLive = function (ttl) {
112116
if (typeof ttl === 'object') {
113117
for (var k in ttl) {
@@ -129,6 +133,9 @@ angular.module('angular-growl').provider('growl', function () {
129133
this.globalDisableIcons = function (disableIcons) {
130134
_disableIcons = disableIcons;
131135
};
136+
this.globalReversedOrder = function (reverseOrder) {
137+
_reverseOrder = reverseOrder;
138+
};
132139
this.messageVariableKey = function (messageVariableKey) {
133140
_messageVariableKey = messageVariableKey;
134141
};
@@ -162,16 +169,15 @@ angular.module('angular-growl').provider('growl', function () {
162169
growl.addServerMessages(response.data[_messagesKey]);
163170
}
164171
}
165-
function success(response) {
166-
checkResponse(response);
167-
return response;
168-
}
169-
function error(response) {
170-
checkResponse(response);
171-
return $q.reject(response);
172-
}
173-
return function (promise) {
174-
return promise.then(success, error);
172+
return {
173+
'response': function (response) {
174+
checkResponse(response);
175+
return response;
176+
},
177+
'responseError': function (rejection) {
178+
checkResponse(rejection);
179+
return $q.reject(rejection);
180+
}
175181
};
176182
}
177183
];
@@ -238,6 +244,9 @@ angular.module('angular-growl').provider('growl', function () {
238244
function onlyUnique() {
239245
return _onlyUniqueMessages;
240246
}
247+
function reverseOrder() {
248+
return _reverseOrder;
249+
}
241250
function inlineMessages() {
242251
return _inline;
243252
}
@@ -251,6 +260,7 @@ angular.module('angular-growl').provider('growl', function () {
251260
success: success,
252261
addServerMessages: addServerMessages,
253262
onlyUnique: onlyUnique,
263+
reverseOrder: reverseOrder,
254264
inlineMessages: inlineMessages,
255265
position: position
256266
};

0 commit comments

Comments
 (0)