Commit c383458c authored by dmacfarlane's avatar dmacfarlane
Browse files

fix for #59

parent af97a041
Loading
Loading
Loading
Loading
+10 −0
Original line number Original line Diff line number Diff line
@@ -52,6 +52,16 @@ describe('angular-mentions App', function() {
      el.click();
      el.click();
      expect(getValue(el, tagName)).toEqual('');
      expect(getValue(el, tagName)).toEqual('');


      // test for git issue #59
      el.sendKeys('@');
      expect(menu.isDisplayed()).toBe(true);
      el.sendKeys(protractor.Key.BACK_SPACE);
      expect(menu.isDisplayed()).toBe(false);
      el.sendKeys('xa');
      expect(menu.isDisplayed()).toBe(false);
      el.sendKeys(protractor.Key.BACK_SPACE, protractor.Key.BACK_SPACE);
      expect(getValue(el, tagName)).toEqual('');

      // popup menu
      // popup menu
      el.sendKeys('Hello @');
      el.sendKeys('Hello @');
      expect(menu.isDisplayed()).toBe(true);
      expect(menu.isDisplayed()).toBe(true);
+4 −1
Original line number Original line Diff line number Diff line
@@ -175,8 +175,11 @@ export class MentionDirective implements OnInit, OnChanges {
          this.startPos = -1;
          this.startPos = -1;
        }
        }
        else if (event.keyCode === KEY_BACKSPACE && pos > 0) {
        else if (event.keyCode === KEY_BACKSPACE && pos > 0) {
          this.searchList.hidden = this.stopSearch;
          pos--;
          pos--;
          if (pos==0) {
            this.stopSearch = true;
          }
          this.searchList.hidden = this.stopSearch;
        }
        }
        else if (!this.searchList.hidden) {
        else if (!this.searchList.hidden) {
          if (event.keyCode === KEY_TAB || event.keyCode === KEY_ENTER) {
          if (event.keyCode === KEY_TAB || event.keyCode === KEY_ENTER) {