in some cases, there's no selection

Need to protect against no selection in the browser.
jeff-collins · Nov 26, 2014 · a17f3d4 · a17f3d4
1 parent 9c0239e
commit a17f3d4
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 27 deletions.
diff --git a/dist/mentio.js b/dist/mentio.js
@@ -222,6 +222,7 @@ angular.module('mentio', [])
             }],
             link: function (scope, element, attrs) {
                 scope.triggerCharMap = {};
+
                 scope.targetElement = element;
                 attrs.$set('autocomplete','off');
 
@@ -300,9 +301,11 @@ angular.module('mentio', [])
                             ) 
                         {
                             /** save selection info about the target control for later re-selection */
-                            scope.targetElement = mentionInfo.mentionSelectedElement;
-                            scope.targetElementPath = mentionInfo.mentionSelectedPath;
-                            scope.targetElementSelectedOffset = mentionInfo.mentionSelectedOffset;
+                            if (mentionInfo.mentionSelectedElement) {
+                                scope.targetElement = mentionInfo.mentionSelectedElement;
+                                scope.targetElementPath = mentionInfo.mentionSelectedPath;
+                                scope.targetElementSelectedOffset = mentionInfo.mentionSelectedOffset;
+                            }
 
                             /* publish to external ngModel */
                             scope.setTriggerText(mentionInfo.mentionText);
@@ -603,14 +606,16 @@ angular.module('mentio')
         function selectElement (targetElement, path, offset) {
             var range;
             var elem = targetElement;
-            for (var i = 0; i < path.length; i++) {
-                elem = elem.childNodes[path[i]];
-                if (elem === undefined) {
-                    return;
-                }
-                while (elem.length < offset) {
-                    offset -= elem.length;
-                    elem = elem.nextSibling;
+            if (path) {
+                for (var i = 0; i < path.length; i++) {
+                    elem = elem.childNodes[path[i]];
+                    if (elem === undefined) {
+                        return;
+                    }
+                    while (elem.length < offset) {
+                        offset -= elem.length;
+                        elem = elem.nextSibling;
+                    }
                 }
             }
             if (document.selection && document.selection.createRange) {

diff --git a/dist/mentio.min.js b/dist/mentio.min.js
diff --git a/gulpfile.js b/gulpfile.js
@@ -49,7 +49,6 @@ gulp.task('site', ['dist'], function () {
 
 gulp.task('dist', ['tpl'], function () {
     return gulp.src([
-//        'bower_components/textarea-caret-position/index.js',
         'src/mentio.directive.js',
         'src/mentio.service.js',
         'src/templates.js'
@@ -58,9 +57,6 @@ gulp.task('dist', ['tpl'], function () {
     .pipe(gjshint.reporter(stylish))
     .pipe(ngAnnotate())
     .pipe(concat('mentio.js'))
-//    // hack to make componentjs libs to work
-//    .pipe(wrap('(function () {\n\n\'use strict\';\n\nvar Package = \'\';' +
-//        '\n\nvar getCaretCoordinates ;\n\n<%= contents %>\n\n})();'))
     .pipe(gulp.dest('dist'))
     .pipe(uglify())
     .pipe(concat('mentio.min.js'))

diff --git a/src/mentio.directive.js b/src/mentio.directive.js
@@ -222,6 +222,7 @@ angular.module('mentio', [])
             },
             link: function (scope, element, attrs) {
                 scope.triggerCharMap = {};
+
                 scope.targetElement = element;
                 attrs.$set('autocomplete','off');
 
@@ -300,9 +301,11 @@ angular.module('mentio', [])
                             ) 
                         {
                             /** save selection info about the target control for later re-selection */
-                            scope.targetElement = mentionInfo.mentionSelectedElement;
-                            scope.targetElementPath = mentionInfo.mentionSelectedPath;
-                            scope.targetElementSelectedOffset = mentionInfo.mentionSelectedOffset;
+                            if (mentionInfo.mentionSelectedElement) {
+                                scope.targetElement = mentionInfo.mentionSelectedElement;
+                                scope.targetElementPath = mentionInfo.mentionSelectedPath;
+                                scope.targetElementSelectedOffset = mentionInfo.mentionSelectedOffset;
+                            }
 
                             /* publish to external ngModel */
                             scope.setTriggerText(mentionInfo.mentionText);

diff --git a/src/mentio.service.js b/src/mentio.service.js
@@ -82,14 +82,16 @@ angular.module('mentio')
         function selectElement (targetElement, path, offset) {
             var range;
             var elem = targetElement;
-            for (var i = 0; i < path.length; i++) {
-                elem = elem.childNodes[path[i]];
-                if (elem === undefined) {
-                    return;
-                }
-                while (elem.length < offset) {
-                    offset -= elem.length;
-                    elem = elem.nextSibling;
+            if (path) {
+                for (var i = 0; i < path.length; i++) {
+                    elem = elem.childNodes[path[i]];
+                    if (elem === undefined) {
+                        return;
+                    }
+                    while (elem.length < offset) {
+                        offset -= elem.length;
+                        elem = elem.nextSibling;
+                    }
                 }
             }
             if (document.selection && document.selection.createRange) {