Merge pull request #8 from boneskull/master

0.2.4 bump and object reference fix
boneskull · Sep 20, 2013 · 24603d4 · 24603d4
2 parents c1f7784 + 27a38b8
commit 24603d4
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Pure AngularJS tagging widget with typeahead support courtesy of [ui-bootstrap](
 Current Version
 ---------------
 ```
-0.2.3
+0.2.4
 ```
 
 

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

diff --git a/dist/angular-tags-0.2.3-tpls.js → dist/angular-tags-0.2.4-tpls.js b/dist/angular-tags-0.2.3-tpls.js → dist/angular-tags-0.2.4-tpls.js
@@ -521,7 +521,7 @@ angular.module("templates/tag.html", []).run(["$templateCache", function($templa
                    }
                    o = {};
                    if (angular.isObject(obj.value)) {
-                     o = angular.extend(angular.extend(o, obj.value), {
+                     o = angular.extend(obj.value, {
                        name: srcResult.viewMapper(scope.$parent, locals),
                        value: value,
                        group: group
@@ -609,10 +609,10 @@ angular.module("templates/tag.html", []).run(["$templateCache", function($templa
 
            // remove already used tags
            i = scope.tags.length;
-           while(i--) {
+           while (i--) {
              scope._filterSrcTags(scope.tags[i]);
            }
-           
+
            // emit identifier
            scope.$id = ++id;
            scope.$emit('decipher.tags.initialized', {

diff --git a/dist/angular-tags-0.2.3-tpls.map.js → dist/angular-tags-0.2.4-tpls.map.js b/dist/angular-tags-0.2.3-tpls.map.js → dist/angular-tags-0.2.4-tpls.map.js