Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/jeff-collins/ment.io
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Collins committed Aug 24, 2014
2 parents d400b8b + 0394ec0 commit 4b5a22c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/mentio.directive.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ angular.module('mentio', [])
ngModel: '='
},
controller: function($scope, $timeout, $attrs) {

$scope.query = function (triggerChar, triggerText) {
var remoteScope = $scope.triggerCharMap[triggerChar];
remoteScope.showMenu();
Expand Down Expand Up @@ -177,6 +177,7 @@ angular.module('mentio', [])
var activeMenuScope = $scope.getActiveMenuScope();
if (activeMenuScope) {
if (event.which === 9) {
event.preventDefault();
activeMenuScope.selectActive();
}

Expand Down Expand Up @@ -372,7 +373,7 @@ angular.module('mentio', [])
if (mentioAttr !== undefined) {
// send own scope to mentio directive so that the menu
// becomes attached
$rootScope.$broadcast('menuCreated',
$rootScope.$broadcast('menuCreated',
{
targetElement : scope.forElem,
scope : scope
Expand Down

0 comments on commit 4b5a22c

Please sign in to comment.