Skip to content
This repository was archived by the owner on Aug 24, 2017. It is now read-only.

Commit 954560e

Browse files
author
Christopher Hiller
committed
upping to 2.6 after fixing recursive error. updating docs a bit
1 parent 1c6c337 commit 954560e

14 files changed

+42
-49
lines changed

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ Pure AngularJS tagging widget with typeahead support courtesy of [ui-bootstrap](
66
Current Version
77
---------------
88
```
9-
0.2.5
9+
0.2.6
1010
```
1111

12-
1312
Installation
1413
------------
15-
1614
```
1715
bower install angular-tags
1816
```
@@ -22,6 +20,8 @@ Requirements
2220

2321
- [AngularJS](http://angularjs.org)
2422
- [ui-bootstrap](http://angular-ui.github.io/bootstrap) (ui.bootstrap.typeahead module)
23+
- [Bootstrap CSS](http://getbootstrap.com) (optional)
24+
- [Font Awesome](http://fortawesome.github.io/Font-Awesome/) (optional)
2525

2626
Running Tests
2727
-------------

bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-tags",
3-
"version": "0.2.5",
4-
"main": "dist/angular-tags-0.2.4.js",
3+
"version": "0.2.6",
4+
"main": "dist/angular-tags-0.2.6.js",
55
"dependencies": {
66
"angular-ui-bootstrap-bower": "~0.6.0",
77
"angular": "1.2.0-rc.2",

dist/angular-tags-0.2.5-tpls.min.js

-2
This file was deleted.

dist/angular-tags-0.2.5-tpls.js renamed to dist/angular-tags-0.2.6-tpls.js

+5-12
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,6 @@ angular.module("templates/tag.html", []).run(["$templateCache", function($templa
403403
source,
404404
tags,
405405
group,
406-
value,
407406
i,
408407
srcWatch,
409408
model,
@@ -512,24 +511,18 @@ angular.module("templates/tag.html", []).run(["$templateCache", function($templa
512511
locals[srcResult.itemName] = source[i];
513512
obj = {};
514513
obj.value = srcResult.modelMapper(scope.$parent, locals);
515-
if (obj.value.group || obj.value.value) {
516-
group = obj.value.group;
517-
value = obj.value.value;
518-
}
519-
else {
520-
value = obj.value;
521-
}
522514
o = {};
523515
if (angular.isObject(obj.value)) {
524516
o = angular.extend(obj.value, {
525517
name: srcResult.viewMapper(scope.$parent, locals),
526-
value: value,
527-
group: group
518+
value: obj.value.value,
519+
group: obj.value.group
528520
});
529-
} else {
521+
}
522+
else {
530523
o = {
531524
name: srcResult.viewMapper(scope.$parent, locals),
532-
value: value,
525+
value: obj.value,
533526
group: group
534527
};
535528
}

0 commit comments

Comments
 (0)