just bind to click, other events weren't doing anything

jseppi · Oct 28, 2014 · c5c1bf6 · c5c1bf6
1 parent c09121b
commit c5c1bf6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/angular-dropdowns.js b/angular-dropdowns.js
@@ -54,8 +54,8 @@ dd.run(['$templateCache', function ($templateCache) {
 
 }]);
 
-dd.directive('dropdownSelect', ['DropdownService', '$window',
-  function (DropdownService, $window) {
+dd.directive('dropdownSelect', ['DropdownService',
+  function (DropdownService) {
     return {
       restrict: 'A',
       replace: true,
@@ -79,9 +79,7 @@ dd.directive('dropdownSelect', ['DropdownService', '$window',
           });
         };
 
-        // Does not register touchstart events outside of directive scope
-        var $clickEvent = ('click'||'touchstart' in $window);
-        $element.bind($clickEvent, function (event) {
+        $element.bind('click', function (event) {
           event.stopPropagation();
           DropdownService.toggleActive($element);
         });
@@ -119,8 +117,8 @@ dd.directive('dropdownSelectItem', [
   }
 ]);
 
-dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window', '$templateCache',
-  function ($parse, $compile, DropdownService, $window, $templateCache) {
+dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$templateCache',
+  function ($parse, $compile, DropdownService, $templateCache) {
     return {
       restrict: 'A',
       replace: false,
@@ -133,8 +131,6 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window'
       controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
         $scope.labelField = $attrs.dropdownItemLabel || 'text';
 
-        // Does not register touchstart events outside of directive scope.
-        var $clickEvent = ('click'||'touchstart' in $window);
         var $template = angular.element($templateCache.get('ngDropdowns/templates/dropdownMenu.html'));
         // Attach this controller to the element's data
         $template.data('$dropdownMenuController', this);
@@ -157,7 +153,7 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window'
           });
         };
 
-        $element.bind($clickEvent, function (event) {
+        $element.bind('click', function (event) {
           event.stopPropagation();
           DropdownService.toggleActive(tpl);
         });

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-dropdowns",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "homepage": "https://github.com/jseppi/angular-dropdowns",
   "authors": [
     "James Seppi <[email protected]> (http://github.com/jseppi)",

diff --git a/dist/angular-dropdowns.js b/dist/angular-dropdowns.js
@@ -54,8 +54,8 @@ dd.run(['$templateCache', function ($templateCache) {
 
 }]);
 
-dd.directive('dropdownSelect', ['DropdownService', '$window',
-  function (DropdownService, $window) {
+dd.directive('dropdownSelect', ['DropdownService',
+  function (DropdownService) {
     return {
       restrict: 'A',
       replace: true,
@@ -79,9 +79,7 @@ dd.directive('dropdownSelect', ['DropdownService', '$window',
           });
         };
 
-        // Does not register touchstart events outside of directive scope
-        var $clickEvent = ('click'||'touchstart' in $window);
-        $element.bind($clickEvent, function (event) {
+        $element.bind('click', function (event) {
           event.stopPropagation();
           DropdownService.toggleActive($element);
         });
@@ -119,8 +117,8 @@ dd.directive('dropdownSelectItem', [
   }
 ]);
 
-dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window', '$templateCache',
-  function ($parse, $compile, DropdownService, $window, $templateCache) {
+dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$templateCache',
+  function ($parse, $compile, DropdownService, $templateCache) {
     return {
       restrict: 'A',
       replace: false,
@@ -133,8 +131,6 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window'
       controller: ['$scope', '$element', '$attrs', function ($scope, $element, $attrs) {
         $scope.labelField = $attrs.dropdownItemLabel || 'text';
 
-        // Does not register touchstart events outside of directive scope.
-        var $clickEvent = ('click'||'touchstart' in $window);
         var $template = angular.element($templateCache.get('ngDropdowns/templates/dropdownMenu.html'));
         // Attach this controller to the element's data
         $template.data('$dropdownMenuController', this);
@@ -157,7 +153,7 @@ dd.directive('dropdownMenu', ['$parse', '$compile', 'DropdownService', '$window'
           });
         };
 
-        $element.bind($clickEvent, function (event) {
+        $element.bind('click', function (event) {
           event.stopPropagation();
           DropdownService.toggleActive(tpl);
         });

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