hack fixed of on select event

fraserxu · Apr 6, 2014 · 260c8ea · 260c8ea
1 parent 925fe66
commit 260c8ea
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 16 deletions.
diff --git a/example/scripts/app.js b/example/scripts/app.js
@@ -31,17 +31,19 @@ angular.module('textcompleteApp', ['ngTextcomplete'])
               }
             ]);
 
-            textcomplete.on({
-                'textComplete:select': function (e, value) {
-                    alert(value);
-                },
-                'textComplete:show': function (e) {
-                    $(this).data('autocompleting', true);
-                },
-                'textComplete:hide': function (e) {
-                    $(this).data('autocompleting', false);
-                }
-            })
+            $(textcomplete).on({
+              'textComplete:select': function (e, value) {
+                scope.$apply(function() {
+                  scope.message = value
+                })
+              },
+              'textComplete:show': function (e) {
+                $(this).data('autocompleting', true);
+              },
+              'textComplete:hide': function (e) {
+                $(this).data('autocompleting', false);
+              }
+            });
         }
     }
 }])

diff --git a/ng-textcomplete.js b/ng-textcomplete.js
@@ -271,9 +271,11 @@ angular.module('ngTextcomplete', [])
         //   this.el.innerHTML = pre + post;
         //   this.placeCaretAtEnd();
         // } else {
-        this.$el.val(pre + post)
-                .trigger('change')
-                .trigger('textComplete:select', value);
+
+        this.$el.val(pre + post);
+        $(this).trigger('change')
+          .trigger('textComplete:select', this.$el.val());
+
         this.el.focus();
         this.el.selectionStart = this.el.selectionEnd = pre.length;
         // }
@@ -465,7 +467,8 @@ function(utils) {
     activate: function() {
       if (!this.shown) {
         this.$el.show();
-        this.completer.$el.trigger('textComplete:show');
+        $(this).trigger('textComplete:show');
+        // this.completer.$el.trigger('textComplete:show');
         this.shown = true;
       }
       return this;
@@ -474,7 +477,8 @@ function(utils) {
     deactivate: function() {
       if (this.shown) {
         this.$el.hide();
-        this.completer.$el.trigger('textComplete:hide');
+        $(this).trigger('textComplete:show');
+        // this.completer.$el.trigger('textComplete:hide');
         this.shown = false;
         this.data = [];
         this.index = null;