From 75b914678ada3d4ffbc8c0f3dc8044db491ffd42 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 19 Nov 2013 18:00:58 -0600 Subject: [PATCH] Fixed #160 --- dist/js/ionic.js | 37 ------------------------------------- js/utils/events.js | 37 ------------------------------------- 2 files changed, 74 deletions(-) diff --git a/dist/js/ionic.js b/dist/js/ionic.js index 176ccafe98..13408e40ad 100644 --- a/dist/js/ionic.js +++ b/dist/js/ionic.js @@ -249,39 +249,6 @@ window.ionic = { gesture.off(type, callback); }, - // // With a click event, we need to check the target - // // and if it's an internal target that doesn't want - // // a click, cancel it - // handleClick: function(e) { - // var target = e.target; - - // if(ionic.Gestures.HAS_TOUCHEVENTS) { - // // We don't allow any clicks on mobile - // e.preventDefault(); - // return false; - // } - - // if ( - // ! target - // || e.which > 1 - // || e.metaKey - // || e.ctrlKey - // //|| isScrolling - // // || location.protocol !== target.protocol - // // || location.host !== target.host - // // // Not sure abotu this one - // // //|| !target.hash && /#/.test(target.href) - // // || target.hash && target.href.replace(target.hash, '') === location.href.replace(location.hash, '') - // //|| target.getAttribute('data-ignore') == 'push' - // ) { - // // Allow it - // return; - // } - // // We need to cancel this one - // e.preventDefault(); - - // }, - handlePopState: function(event) { }, }; @@ -294,10 +261,6 @@ window.ionic = { ionic.onGesture = function() { return ionic.EventController.onGesture.apply(ionic.EventController.onGesture, arguments); }; ionic.offGesture = function() { return ionic.EventController.offGesture.apply(ionic.EventController.offGesture, arguments); }; - // DISABLING FOR NOW. THE TAP CODE AT THE EXT LEVEL SHOULD BE DOING THIS - // Set up various listeners - //window.addEventListener('click', ionic.EventController.handleClick); - })(window.ionic); ; /** diff --git a/js/utils/events.js b/js/utils/events.js index d7d9d6a878..ee7192ce96 100644 --- a/js/utils/events.js +++ b/js/utils/events.js @@ -56,39 +56,6 @@ gesture.off(type, callback); }, - // // With a click event, we need to check the target - // // and if it's an internal target that doesn't want - // // a click, cancel it - // handleClick: function(e) { - // var target = e.target; - - // if(ionic.Gestures.HAS_TOUCHEVENTS) { - // // We don't allow any clicks on mobile - // e.preventDefault(); - // return false; - // } - - // if ( - // ! target - // || e.which > 1 - // || e.metaKey - // || e.ctrlKey - // //|| isScrolling - // // || location.protocol !== target.protocol - // // || location.host !== target.host - // // // Not sure abotu this one - // // //|| !target.hash && /#/.test(target.href) - // // || target.hash && target.href.replace(target.hash, '') === location.href.replace(location.hash, '') - // //|| target.getAttribute('data-ignore') == 'push' - // ) { - // // Allow it - // return; - // } - // // We need to cancel this one - // e.preventDefault(); - - // }, - handlePopState: function(event) { }, }; @@ -101,8 +68,4 @@ ionic.onGesture = function() { return ionic.EventController.onGesture.apply(ionic.EventController.onGesture, arguments); }; ionic.offGesture = function() { return ionic.EventController.offGesture.apply(ionic.EventController.offGesture, arguments); }; - // DISABLING FOR NOW. THE TAP CODE AT THE EXT LEVEL SHOULD BE DOING THIS - // Set up various listeners - //window.addEventListener('click', ionic.EventController.handleClick); - })(window.ionic);