Merge pull request #34 from elliottregan/touchevents-fix

bug fix: touch start events on iOS devices works
jseppi · Oct 23, 2014 · c97b0dc · c97b0dc
2 parents 138cac1 + 238ddfe
commit c97b0dc
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 9 deletions.
diff --git a/angular-dropdowns.css b/angular-dropdowns.css
@@ -7,6 +7,10 @@
   margin: 0 auto;
   padding: 10px;
 
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  user-select:none;
+
   /* Styles */
   background: #fff;
   border-radius: 7px;
@@ -212,4 +216,4 @@
 .wrap-dd-menu .dropdown.active {
   opacity: 1;
   pointer-events: auto;
-}
+}
diff --git a/angular-dropdowns.js b/angular-dropdowns.js
@@ -29,7 +29,8 @@ dd.directive('dropdownSelect', ['DropdownService', '$window',
           });
         };
 
-        var $clickEvent = ('ontouchstart' in $window ? 'touchend' : 'click');
+        // Does not register touchstart events outside of directive scope
+        var $clickEvent = ('click'||'touchstart' in $window);
         $element.bind($clickEvent, function (event) {
           event.stopPropagation();
           DropdownService.toggleActive($element);
@@ -103,7 +104,8 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window'
       controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
         $scope.labelField = $attrs.dropdownItemLabel || 'text';
 
-        var $clickEvent = ('ontouchstart' in $window ? 'touchend' : 'click');
+        // Does not register touchstart events outside of directive scope.
+        var $clickEvent = ('click'||'touchstart'in $window);
         var $template = angular.element([
           '<ul class="dropdown">',
             '<li ng-repeat="item in dropdownMenu"',
@@ -170,7 +172,6 @@ dd.directive('dropdownMenuItem', [
         '<li ng-class="{divider: dropdownMenuItem.divider}">',
           '<a href="" class="dropdown-item"',
           ' ng-if="!dropdownMenuItem.divider"',
-          ' ng-href="{{dropdownMenuItem.href}}"',
           ' ng-click="selectItem()">',
             '{{dropdownMenuItem[dropdownItemLabel]}}',
           '</a>',

diff --git a/dist/angular-dropdowns.css b/dist/angular-dropdowns.css
@@ -7,6 +7,10 @@
   margin: 0 auto;
   padding: 10px;
 
+  -webkit-user-select:none;
+  -moz-user-select:none;
+  user-select:none;
+
   /* Styles */
   background: #fff;
   border-radius: 7px;
@@ -212,4 +216,4 @@
 .wrap-dd-menu .dropdown.active {
   opacity: 1;
   pointer-events: auto;
-}
+}
diff --git a/dist/angular-dropdowns.js b/dist/angular-dropdowns.js
@@ -29,7 +29,8 @@ dd.directive('dropdownSelect', ['DropdownService', '$window',
           });
         };
 
-        var $clickEvent = ('ontouchstart' in $window ? 'touchend' : 'click');
+        // Does not register touchstart events outside of directive scope
+        var $clickEvent = ('click'||'touchstart' in $window);
         $element.bind($clickEvent, function (event) {
           event.stopPropagation();
           DropdownService.toggleActive($element);
@@ -103,7 +104,8 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window'
       controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
         $scope.labelField = $attrs.dropdownItemLabel || 'text';
 
-        var $clickEvent = ('ontouchstart' in $window ? 'touchend' : 'click');
+        // Does not register touchstart events outside of directive scope.
+        var $clickEvent = ('click'||'touchstart'in $window);
         var $template = angular.element([
           '<ul class="dropdown">',
             '<li ng-repeat="item in dropdownMenu"',
@@ -170,7 +172,6 @@ dd.directive('dropdownMenuItem', [
         '<li ng-class="{divider: dropdownMenuItem.divider}">',
           '<a href="" class="dropdown-item"',
           ' ng-if="!dropdownMenuItem.divider"',
-          ' ng-href="{{dropdownMenuItem.href}}"',
           ' ng-click="selectItem()">',
             '{{dropdownMenuItem[dropdownItemLabel]}}',
           '</a>',

diff --git a/dist/angular-dropdowns.min.js b/dist/angular-dropdowns.min.js