v0.0.6

Dean Sofer · Dean Sofer · commit a369fb6e5783 · 2015-10-19T15:53:42.000-07:00
- autogrow fix during programmatic changes - named controllers more concisely (sorry @kasperlewau)
diff --git a/README.md b/README.md
@@ -46,17 +46,17 @@ You have to build the HTML yourself:
 <div class="ui-mention-container">
 
   <textarea ng-model="data" ui-mention my-mention></textarea>
-  
+
   <div class="ui-mention-highlight"></div>
-  
+
   <ul class="dropdown" ng-if="$mention.choices.length">
     <li ng-repeat="choice in $mention.choices"
       ng-class="{active:$mention.activeChoice==choice}"
       ng-click="$mention.select(choice)">
       {{::choice.first_name}} {{::choice.last_name}}
     </li>
   </ul>
-  
+
 </div>
 ```
 And the CSS:
@@ -117,7 +117,7 @@ mention.findChoices = _.throttle(function(match) {
 }, 300);
 ```
 
-Hate redundancy? De-dupe that shiz:
+Hate redundancy? De-dupe that shiznizzle:
 ```js
 mention.findChoices = function(match, mentions) {
   return [ /* choices */ ]
@@ -138,9 +138,8 @@ Your servers are slow? Bitch please.
 mention.findChoices = function(match) {
   mention.loading = true;
   return $http.get(...)
-    .then( response => {
+    .finally( response => {
       mention.loading = false;
-      return response.data;
     });
 }
 ```
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-mention",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "homepage": "https://github.com/angular-ui/ui-mention",
   "authors": [
     "AngularUI Team"
diff --git a/dist/mention.js b/dist/mention.js
@@ -5,7 +5,7 @@ var _slicedToArray = (function () { function sliceIterator(arr, i) { var _arr =
 angular.module('ui.mention', []).directive('uiMention', function () {
   return {
     require: ['ngModel', 'uiMention'],
-    controller: 'uiMentionController',
+    controller: 'uiMention',
     controllerAs: '$mention',
     link: function link($scope, $element, $attrs, _ref) {
       var _ref2 = _slicedToArray(_ref, 2);
@@ -19,7 +19,7 @@ angular.module('ui.mention', []).directive('uiMention', function () {
 });
 'use strict';
 
-angular.module('ui.mention').controller('uiMentionController', function ($element, $scope, $attrs, $q, $timeout, $document) {
+angular.module('ui.mention').controller('uiMention', function ($element, $scope, $attrs, $q, $timeout, $document) {
   var _this2 = this;
 
   // Beginning of input or preceeded by spaces: @sometext
@@ -76,6 +76,7 @@ angular.module('ui.mention').controller('uiMentionController', function ($elemen
 
     ngModel.$render = function () {
       $element.val(ngModel.$viewValue || '');
+      $timeout(_this.autogrow, true);
       _this.render();
     };
   };
diff --git a/dist/mention.min.js b/dist/mention.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-mention",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Facebook-like @mentions for text inputs built around composability",
   "main": "src/mention.js",
   "scripts": {
diff --git a/src/mention.es6.js b/src/mention.es6.js
@@ -2,7 +2,7 @@ angular.module('ui.mention', [])
 .directive('uiMention', function() {
   return {
     require: ['ngModel', 'uiMention'],
-    controller: 'uiMentionController',
+    controller: 'uiMention',
     controllerAs: '$mention',
     link: function($scope, $element, $attrs, [ngModel, uiMention]) {
       uiMention.init(ngModel);
diff --git a/src/mentionController.es6.js b/src/mentionController.es6.js
@@ -1,7 +1,7 @@
 angular.module('ui.mention')
-.controller('uiMentionController', function (
+.controller('uiMention', function (
   $element, $scope, $attrs, $q, $timeout, $document
-  ) {
+) {
 
   // Beginning of input or preceeded by spaces: @sometext
   this.pattern = this.pattern || /(?:\s+|^)@(\w+(?: \w+)?)$/;
@@ -54,6 +54,7 @@ angular.module('ui.mention')
 
     ngModel.$render = () => {
       $element.val(ngModel.$viewValue || '');
+      $timeout(this.autogrow, true);
       this.render();
     };
   };
diff --git a/test/uiMentionController.spec.js b/test/uiMentionController.spec.js
@@ -1,4 +1,4 @@
-describe('uiMentionController', () => {
+describe('uiMention', () => {
   let $scope, $attrs, $q, $timeout, $document, createController, ngModelController;
 
   beforeEach(() => {
@@ -12,7 +12,7 @@ describe('uiMentionController', () => {
       $attrs    = {};
 
       createController = (el) => {
-        return $controller('uiMentionController', {
+        return $controller('uiMention', {
           $scope:    $scope,
           $attrs:    $attrs,
           $element:  el,
diff --git a/test/uiMentionDirective.spec.js b/test/uiMentionDirective.spec.js
@@ -1,13 +1,13 @@
 describe('uiMentionDirective', () => {
-  let Subject, $scope, compileDir, uiMentionController;
+  let Subject, $scope, compileDir, ctrlInstance;
 
   beforeEach(() => {
-    uiMentionController = function () {
-      uiMentionController.init = this.init = sinon.stub();
+    ctrlInstance = function () {
+      ctrlInstance.init = this.init = sinon.stub();
     };
 
     module('ui.mention', ($controllerProvider) => {
-      $controllerProvider.register('uiMentionController', uiMentionController);
+      $controllerProvider.register('uiMention', ctrlInstance);
     });
 
     inject(($injector) => {
@@ -57,10 +57,9 @@ describe('uiMentionDirective', () => {
       $scope.model = 'wat';
       compileDir('<span ui-mention ng-model="model"></span>');
       $scope.$digest();
-      expect(uiMentionController.init).to.have.been.calledOnce.and.calledWithMatch({
+      expect(ctrlInstance.init).to.have.been.calledOnce.and.calledWithMatch({
         $modelValue: 'wat'
       });
     });
   });
 });
-

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "angular-ui-mention",`
`3`		`- "version": "0.0.5",`
	`3`	`+ "version": "0.0.6",`
`4`	`4`	`"homepage": "https://github.com/angular-ui/ui-mention",`
`5`	`5`	`"authors": [`
`6`	`6`	`"AngularUI Team"`