Skip to content

Commit 605074b

Browse files
committed
chore: Bump version to 2.3.1
1 parent 6fd0368 commit 605074b

File tree

5 files changed

+22
-28
lines changed

5 files changed

+22
-28
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-permission",
3-
"version": "2.3.0",
3+
"version": "2.3.1",
44
"authors": [
55
"Rafael Vidaurre <narzerus@gmail.com> (http://www.rafaelvidaurre.com)",
66
"Blazej Krysiak <blazej.krysiak@gmail.com>"

dist/angular-permission.js

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/**
22
* angular-permission
33
* Route permission and access control as simple as it can get
4-
* @version v2.3.0 - 2016-03-30
5-
* @link http://www.rafaelvidaurre.com
6-
* @author Rafael Vidaurre <narzerus@gmail.com>, Blazej Krysiak <blazej.krysiak@gmail.com>
4+
* @version v2.3.1 - 2016-04-01
5+
* @link https://github.com/Narzerus/angular-permission
6+
* @author Rafael Vidaurre <narzerus@gmail.com> (http://www.rafaelvidaurre.com), Blazej Krysiak <blazej.krysiak@gmail.com>
77
* @license MIT License, http://www.opensource.org/licenses/MIT
88
*/
99

@@ -207,20 +207,19 @@
207207
.module('permission')
208208
.decorator('$q',
209209
/**
210-
* Extends $q implementation by A+ *only* method
210+
* Extends $q implementation by A+ *any* method
211211
* @class $q
212212
* @memberOf permission
213213
*
214214
* @param $delegate {Object} Angular promise implementation
215215
*/
216216
['$delegate', function ($delegate) {
217217

218-
$delegate.only = only;
218+
$delegate.any = any;
219219

220220
/**
221-
* Implementation of missing $q `only` method that wits for first resolution of provided promise set
221+
* Implementation of missing $q `any` method that wits for first resolution of provided promise set
222222
* @method
223-
* @private
224223
*
225224
* @param promises {Array|promise} Single or set of promises
226225
*
@@ -229,24 +228,19 @@
229228
* If any of the promises is resolved, this resulting promise will be returned
230229
* with the same resolution value.
231230
*/
232-
function only(promises) {
231+
function any(promises) {
233232
var deferred = $delegate.defer(),
234233
counter = 0,
235234
results = angular.isArray(promises) ? [] : {};
236235

237236
angular.forEach(promises, function (promise, key) {
238237
counter++;
239-
$delegate.when(promise)
238+
$delegate
239+
.when(promise)
240240
.then(function (value) {
241-
if (results.hasOwnProperty(key)) {
242-
return;
243-
}
244241
deferred.resolve(value);
245242
})
246243
.catch(function (reason) {
247-
if (results.hasOwnProperty(key)) {
248-
return;
249-
}
250244
results[key] = reason;
251245
if (!(--counter)) {
252246
deferred.reject(reason);
@@ -578,7 +572,7 @@
578572
*/
579573
Role.prototype.validateRole = function (toParams) {
580574

581-
// When set permissions is provided check each of them
575+
// When permission set is provided check each of them
582576
if (this.permissionNames.length) {
583577
var promises = this.permissionNames.map(function (permissionName) {
584578
if (PermissionStore.hasPermissionDefinition(permissionName)) {
@@ -592,7 +586,7 @@
592586
return validationResult;
593587
}
594588

595-
return $q.reject(null);
589+
return $q.reject();
596590
});
597591

598592
return $q.all(promises);
@@ -898,7 +892,7 @@
898892
function permissionDirective($log, Authorization, PermissionMap, PermissionStrategies) {
899893
return {
900894
restrict: 'A',
901-
scope: true,
895+
scope: false,
902896
bindToController: {
903897
only: '=?permissionOnly',
904898
except: '=?permissionExcept',
@@ -1113,7 +1107,7 @@
11131107
function resolveFlatExceptPrivilegeMap(permissionMap, deferred) {
11141108
var exceptPromises = resolvePrivilegeMap(permissionMap.except);
11151109

1116-
$q.only(exceptPromises)
1110+
$q.any(exceptPromises)
11171111
.then(function (rejectedPermissions) {
11181112
deferred.reject(rejectedPermissions);
11191113
})
@@ -1137,7 +1131,7 @@
11371131
}
11381132

11391133
var onlyPromises = resolvePrivilegeMap(permissionMap.only);
1140-
$q.only(onlyPromises)
1134+
$q.any(onlyPromises)
11411135
.then(function (resolvedPermissions) {
11421136
deferred.resolve(resolvedPermissions);
11431137
})
@@ -1162,7 +1156,7 @@
11621156

11631157
return privilegesNames.map(function (statePrivileges) {
11641158
var resolvedStatePrivileges = resolvePrivilegeMap(statePrivileges);
1165-
return $q.only(resolvedStatePrivileges);
1159+
return $q.any(resolvedStatePrivileges);
11661160
});
11671161
}
11681162

0 commit comments

Comments
 (0)