Merge pull request #11 from boneskull/master

upping to 2.6 after fixing recursive error. updating docs a bit
boneskull · Sep 20, 2013 · b8cf323 · b8cf323
2 parents b1ac21e + 954560e
commit b8cf323
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,11 @@ Pure AngularJS tagging widget with typeahead support courtesy of [ui-bootstrap](
 Current Version
 ---------------
 ```
-0.2.5
+0.2.6
 ```
 
-
 Installation
 ------------
-
 ```
 bower install angular-tags
 ```
@@ -22,6 +20,8 @@ Requirements
 
 - [AngularJS](http://angularjs.org)
 - [ui-bootstrap](http://angular-ui.github.io/bootstrap) (ui.bootstrap.typeahead module)
+- [Bootstrap CSS](http://getbootstrap.com) (optional)
+- [Font Awesome](http://fortawesome.github.io/Font-Awesome/) (optional)
 
 Running Tests
 -------------

diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "angular-tags",
-  "version": "0.2.5",
-  "main": "dist/angular-tags-0.2.4.js",
+  "version": "0.2.6",
+  "main": "dist/angular-tags-0.2.6.js",
   "dependencies": {
     "angular-ui-bootstrap-bower": "~0.6.0",
     "angular": "1.2.0-rc.2",

diff --git a/dist/angular-tags-0.2.5-tpls.min.js b/dist/angular-tags-0.2.5-tpls.min.js
diff --git a/dist/angular-tags-0.2.5-tpls.js → dist/angular-tags-0.2.6-tpls.js b/dist/angular-tags-0.2.5-tpls.js → dist/angular-tags-0.2.6-tpls.js
@@ -403,7 +403,6 @@ angular.module("templates/tag.html", []).run(["$templateCache", function($templa
              source,
              tags,
              group,
-             value,
              i,
              srcWatch,
              model,
@@ -512,24 +511,18 @@ angular.module("templates/tag.html", []).run(["$templateCache", function($templa
                    locals[srcResult.itemName] = source[i];
                    obj = {};
                    obj.value = srcResult.modelMapper(scope.$parent, locals);
-                   if (obj.value.group || obj.value.value) {
-                     group = obj.value.group;
-                     value = obj.value.value;
-                   }
-                   else {
-                     value = obj.value;
-                   }
                    o = {};
                    if (angular.isObject(obj.value)) {
                      o = angular.extend(obj.value, {
                        name: srcResult.viewMapper(scope.$parent, locals),
-                       value: value,
-                       group: group
+                       value: obj.value.value,
+                       group: obj.value.group
                      });
-                   } else {
+                   }
+                   else {
                      o = {
                        name: srcResult.viewMapper(scope.$parent, locals),
-                       value: value,
+                       value: obj.value,
                        group: group
                      };
                    }