From 21702608e2bbd768634b71da7e97188f11cf6430 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 7 Dec 2013 15:17:07 -0600
Subject: [PATCH 1/2] Stuff

---
 dist/js/ionic-angular.js                    | 18 +++++++------
 dist/js/ionic.js                            | 29 ++++++++++++++++++---
 js/ext/angular/src/directive/ionicRadio.js  | 13 +++++----
 js/ext/angular/src/directive/ionicToggle.js |  2 +-
 js/ext/angular/src/service/ionicPlatform.js |  3 +++
 js/ext/angular/test/checkbox.html           |  4 ++-
 js/ext/angular/test/radioButton.html        | 16 ++++++++----
 js/utils/poly.js                            | 29 ++++++++++++++++++---
 8 files changed, 84 insertions(+), 30 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 9937bd9e7c..088ed1580e 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -305,6 +305,9 @@ angular.module('ionic.service.platform', [])
     }
   }, 10);
 
+
+
+
   return {
     setPlatform: function(p) {
       platform = p;
@@ -1446,7 +1449,7 @@ angular.module('ionic.ui.radio', [])
       value: '@'
     },
     transclude: true,
-    template: '<label ng-click="tapHandler($event)" class="item item-radio">\
+    template: '<label skip-tap-poly ng-click="tapHandler($event)" class="item item-radio">\
                 <input type="radio" name="group">\
                 <div class="item-content" ng-transclude>\
                 </div>\
@@ -1463,12 +1466,14 @@ angular.module('ionic.ui.radio', [])
       if(!radio.length) { return; }
 
       $scope.tapHandler = function(e) {
+        console.log("RADIOTAP");
         radio[0].checked = true;
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
         e.alreadyHandled = true;
       };
 
       var clickHandler = function(e) {
+        console.log("RADIOCLICK");
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
       };
 
@@ -1544,18 +1549,15 @@ angular.module('ionic.ui.radio', [])
       if(!ngModel || !radioButtons) { return; }
 
       var setIt = function() {
+        console.trace('SET');
         $element.addClass('active');
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
 
         radioButtons.select($element);
       };
 
-      $scope.tapHandler = function(e) {
-        setIt();
-        e.alreadyHandled = true;
-      };
-
       var clickHandler = function(e) {
+        console.log('CLICK');
         setIt();
       };
 
@@ -1565,7 +1567,7 @@ angular.module('ionic.ui.radio', [])
         };
       });
         
-      $element.bind('click', clickHandler);
+      $element.bind('tap', clickHandler);
     }
   }
 });
@@ -2174,7 +2176,7 @@ angular.module('ionic.ui.toggle', [])
     replace: true,
     require: '?ngModel',
     scope: {},
-    template: '<div ng-click="toggleIt($event)" class="toggle"><input type="checkbox"><div class="track"><div class="handle"></div></div></div>',
+    template: '<div ng-click="toggleIt($event)" class="toggle" skip-tap-poly><input type="checkbox"><div class="track"><div class="handle"></div></div></div>',
 
     link: function($scope, $element, $attr, ngModel) {
       var checkbox, handle;
diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index c22f1bce4e..29c22c573b 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -1825,7 +1825,7 @@ window.ionic = {
   // polyfill use to simulate native "tap"
   function inputTapPolyfill(ele, e) {
     if(ele.type === "radio" || ele.type === "checkbox") {
-      //ele.checked = !ele.checked;
+      ele.checked = !ele.checked;
     } else if(ele.type === "submit" || ele.type === "button") {
       ionic.trigger('click', {
         target: ele
@@ -1839,6 +1839,7 @@ window.ionic = {
   }
 
   function tapPolyfill(e) {
+    console.log('TAP POLY');
     // if the source event wasn't from a touch event then don't use this polyfill
     if(!e.gesture || e.gesture.pointerType !== "touch" || !e.gesture.srcEvent) return;
 
@@ -1848,6 +1849,7 @@ window.ionic = {
     // the tap stuff itself). This is in contrast to preventDefault which will
     // mess up other operations like change events and such
     if(e.alreadyHandled) {
+      console.log('POLY HANDLED');
       return;
     }
 
@@ -1855,17 +1857,35 @@ window.ionic = {
 
     var ele = e.target;
 
+    console.log('TARGET', ele);
+
     while(ele) {
+      // Skip ones that have the poly skip
+      if(ele.getAttribute('skip-tap-poly')) { 
+        ele = ele.parentElement;
+        continue;
+      }
+
       if( ele.tagName === "INPUT" || ele.tagName === "TEXTAREA" || ele.tagName === "SELECT" ) {
+        console.log('INPUT POLY');
         return inputTapPolyfill(ele, e);
       } else if( ele.tagName === "LABEL" ) {
+        console.log('LABEL POLY');
         if(ele.control) {
           return inputTapPolyfill(ele.control, e);
         }
       } else if( ele.tagName === "A" || ele.tagName === "BUTTON" ) {
-        ionic.trigger('click', {
-          target: ele
-        });
+        if(ele.getAttribute('href')) {
+          console.log('HREF POLY', ele);
+          ionic.trigger('click', {
+            target: ele
+          });
+        } else {
+          console.log('BUTTON POLY', ele);
+          ionic.trigger('tap', {
+            target: ele
+          });
+        }
         e.stopPropagation();
         e.preventDefault();
         return false;
@@ -1873,6 +1893,7 @@ window.ionic = {
       ele = ele.parentElement;
     }
 
+    console.log('NEITHER POLY');
     // they didn't tap one of the above elements
     // if the currently active element is an input, and they tapped outside
     // of the current input, then unset its focus (blur) so the keyboard goes away
diff --git a/js/ext/angular/src/directive/ionicRadio.js b/js/ext/angular/src/directive/ionicRadio.js
index c46911d8d7..13a0672f99 100644
--- a/js/ext/angular/src/directive/ionicRadio.js
+++ b/js/ext/angular/src/directive/ionicRadio.js
@@ -14,7 +14,7 @@ angular.module('ionic.ui.radio', [])
       value: '@'
     },
     transclude: true,
-    template: '<label ng-click="tapHandler($event)" class="item item-radio">\
+    template: '<label skip-tap-poly ng-click="tapHandler($event)" class="item item-radio">\
                 <input type="radio" name="group">\
                 <div class="item-content" ng-transclude>\
                 </div>\
@@ -31,12 +31,14 @@ angular.module('ionic.ui.radio', [])
       if(!radio.length) { return; }
 
       $scope.tapHandler = function(e) {
+        console.log("RADIOTAP");
         radio[0].checked = true;
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
         e.alreadyHandled = true;
       };
 
       var clickHandler = function(e) {
+        console.log("RADIOCLICK");
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
       };
 
@@ -112,18 +114,15 @@ angular.module('ionic.ui.radio', [])
       if(!ngModel || !radioButtons) { return; }
 
       var setIt = function() {
+        console.trace('SET');
         $element.addClass('active');
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
 
         radioButtons.select($element);
       };
 
-      $scope.tapHandler = function(e) {
-        setIt();
-        e.alreadyHandled = true;
-      };
-
       var clickHandler = function(e) {
+        console.log('CLICK');
         setIt();
       };
 
@@ -133,7 +132,7 @@ angular.module('ionic.ui.radio', [])
         };
       });
         
-      $element.bind('click', clickHandler);
+      $element.bind('tap', clickHandler);
     }
   }
 });
diff --git a/js/ext/angular/src/directive/ionicToggle.js b/js/ext/angular/src/directive/ionicToggle.js
index f9ccad9e89..c9e5e1b2b2 100644
--- a/js/ext/angular/src/directive/ionicToggle.js
+++ b/js/ext/angular/src/directive/ionicToggle.js
@@ -11,7 +11,7 @@ angular.module('ionic.ui.toggle', [])
     replace: true,
     require: '?ngModel',
     scope: {},
-    template: '<div ng-click="toggleIt($event)" class="toggle"><input type="checkbox"><div class="track"><div class="handle"></div></div></div>',
+    template: '<div ng-click="toggleIt($event)" class="toggle" skip-tap-poly><input type="checkbox"><div class="track"><div class="handle"></div></div></div>',
 
     link: function($scope, $element, $attr, ngModel) {
       var checkbox, handle;
diff --git a/js/ext/angular/src/service/ionicPlatform.js b/js/ext/angular/src/service/ionicPlatform.js
index f8974c9105..f1210e46f5 100644
--- a/js/ext/angular/src/service/ionicPlatform.js
+++ b/js/ext/angular/src/service/ionicPlatform.js
@@ -35,6 +35,9 @@ angular.module('ionic.service.platform', [])
     }
   }, 10);
 
+
+
+
   return {
     setPlatform: function(p) {
       platform = p;
diff --git a/js/ext/angular/test/checkbox.html b/js/ext/angular/test/checkbox.html
index 15b4fe5600..541fe5bc2a 100644
--- a/js/ext/angular/test/checkbox.html
+++ b/js/ext/angular/test/checkbox.html
@@ -11,7 +11,9 @@
 
     <div ng-controller="TestCtrl">
       <content has-header="true" class="reveal-animation">
-        <p><checkbox ng-model="data.isLovely"></checkbox></p>
+        <div class="list">
+          <checkbox ng-model="data.isLovely">Thing</checkbox>
+        </div>
         <button type="submit" class="button button-danger" ng-click="setToTrue()">Set to true</button>
         <button type="submit" class="button button-danger" ng-click="setToFalse()">Set to false</button>
         <button type="submit" class="button button-danger" ng-click="getValue()">Get Value</button>
diff --git a/js/ext/angular/test/radioButton.html b/js/ext/angular/test/radioButton.html
index be968cbf4e..8202f73d88 100644
--- a/js/ext/angular/test/radioButton.html
+++ b/js/ext/angular/test/radioButton.html
@@ -22,11 +22,17 @@
     <content has-header="true"class="reveal-animation">
       <div ng-controller="TestCtrl">
 
-        <radio-buttons ng-model="data.isLovely">
-          <button class="button button-assertive button-radio" ng-value="'magical'">Magical</button>
-          <button class="button button-assertive button-radio" ng-value="'black'">Black</button>
-          <button class="button button-assertive button-radio" ng-value="'pinto'">Pinto</button>
-        </radio-buttons>
+        <div class="list">
+          <label class="item item-input">
+            <span class="input-label">Units</span>
+            
+            <radio-buttons ng-model="data.isLovely">
+              <button class="button button-assertive button-radio" ng-value="'magical'">Magical</button>
+              <button class="button button-assertive button-radio" ng-value="'black'">Black</button>
+              <button class="button button-assertive button-radio" ng-value="'pinto'">Pinto</button>
+            </radio-buttons>
+          </label>
+        </div>
 
         <form>
           <button ng-click="cycle()" class="button button-warning">Cycle</button>
diff --git a/js/utils/poly.js b/js/utils/poly.js
index 38929c76c7..0197b96fbf 100644
--- a/js/utils/poly.js
+++ b/js/utils/poly.js
@@ -31,7 +31,7 @@
   // polyfill use to simulate native "tap"
   function inputTapPolyfill(ele, e) {
     if(ele.type === "radio" || ele.type === "checkbox") {
-      //ele.checked = !ele.checked;
+      ele.checked = !ele.checked;
     } else if(ele.type === "submit" || ele.type === "button") {
       ionic.trigger('click', {
         target: ele
@@ -45,6 +45,7 @@
   }
 
   function tapPolyfill(e) {
+    console.log('TAP POLY');
     // if the source event wasn't from a touch event then don't use this polyfill
     if(!e.gesture || e.gesture.pointerType !== "touch" || !e.gesture.srcEvent) return;
 
@@ -54,6 +55,7 @@
     // the tap stuff itself). This is in contrast to preventDefault which will
     // mess up other operations like change events and such
     if(e.alreadyHandled) {
+      console.log('POLY HANDLED');
       return;
     }
 
@@ -61,17 +63,35 @@
 
     var ele = e.target;
 
+    console.log('TARGET', ele);
+
     while(ele) {
+      // Skip ones that have the poly skip
+      if(ele.getAttribute('skip-tap-poly')) { 
+        ele = ele.parentElement;
+        continue;
+      }
+
       if( ele.tagName === "INPUT" || ele.tagName === "TEXTAREA" || ele.tagName === "SELECT" ) {
+        console.log('INPUT POLY');
         return inputTapPolyfill(ele, e);
       } else if( ele.tagName === "LABEL" ) {
+        console.log('LABEL POLY');
         if(ele.control) {
           return inputTapPolyfill(ele.control, e);
         }
       } else if( ele.tagName === "A" || ele.tagName === "BUTTON" ) {
-        ionic.trigger('click', {
-          target: ele
-        });
+        if(ele.getAttribute('href')) {
+          console.log('HREF POLY', ele);
+          ionic.trigger('click', {
+            target: ele
+          });
+        } else {
+          console.log('BUTTON POLY', ele);
+          ionic.trigger('tap', {
+            target: ele
+          });
+        }
         e.stopPropagation();
         e.preventDefault();
         return false;
@@ -79,6 +99,7 @@
       ele = ele.parentElement;
     }
 
+    console.log('NEITHER POLY');
     // they didn't tap one of the above elements
     // if the currently active element is an input, and they tapped outside
     // of the current input, then unset its focus (blur) so the keyboard goes away

From 1826f455c5bd85cd60552121a3ec26ca87aa3fc8 Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Sat, 7 Dec 2013 18:00:42 -0600
Subject: [PATCH 2/2] Fixed #272

---
 dist/js/ionic-angular.js                      | 63 +++++++++----------
 dist/js/ionic.js                              | 37 ++++-------
 js/ext/angular/src/directive/ionicCheckbox.js | 25 ++++----
 .../angular/src/directive/ionicNavRouter.js   |  9 ++-
 js/ext/angular/src/directive/ionicRadio.js    | 29 ++++-----
 js/utils/poly.js                              | 37 ++++-------
 6 files changed, 80 insertions(+), 120 deletions(-)

diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 088ed1580e..1dee297b0f 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -587,32 +587,29 @@ angular.module('ionic.ui.checkbox', [])
     require: '?ngModel',
     scope: {},
     transclude: true,
-    template: '<label ng-click="tapHandler($event)" class="checkbox"><input type="checkbox"><div ng-transclude></div></label>',
-  
+    template: '<li class="item item-checkbox">\
+                <label class="checkbox">\
+                  <input type="checkbox">\
+                </label>\
+                <div class="item-content" ng-transclude>\
+                </div>\
+              </li>',
 
     link: function($scope, $element, $attr, ngModel) {
       var checkbox;
 
       if(!ngModel) { return; }
 
-      checkbox = $element.children().eq(0);
+      checkbox = angular.element($element[0].querySelector('input[type="checkbox"]'));
 
       if(!checkbox.length) { return; }
 
-      $scope.tapHandler = function(e) {
-        if(e.type != 'click') {
-          checkbox[0].checked = !checkbox[0].checked;
-        }
+      checkbox.bind('change', function(e) {
         ngModel.$setViewValue(checkbox[0].checked);
-        e.alreadyHandled = true;
-      };
-
-      var clickHandler = function(e) {
-        checkbox[0].checked = !checkbox[0].checked;
         $scope.$apply(function() {
-          ngModel.$setViewValue(checkbox[0].checked);
+          e.alreadyHandled = true;
         });
-      };
+      });
 
       if(ngModel) {
         ngModel.$render = function() {
@@ -1083,7 +1080,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
       };
     }],
 
-    link: function($scope, $element, $attr) {
+    link: function($scope, $element, $attr, ctrl) {
       if(!$element.length) return;
 
       $scope.animation = $attr.animation;
@@ -1142,6 +1139,10 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
         }
       });  
 
+      $scope.$on('navRouter.goBack', function(e) {
+        ctrl.goBack();
+      });
+
 
       // Keep track of location changes and update a stack pointer that tracks whether we are
       // going forwards or back
@@ -1413,7 +1414,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
 .directive('navBack', ['$window', '$rootScope', 'Gesture', function($window, $rootScope, Gesture) {
   return {
     restrict: 'AC',
-    require: '^?navRouter',
     link: function($scope, $element, $attr, navCtrl) {
       var goBack = function(e) {
         // Only trigger back if the stack is greater than zero
@@ -1421,7 +1421,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
           $window.history.back();
 
           // Fallback for bad history supporting devices
-          navCtrl.goBack();
+          $scope.$emit('navRouter.goBack');
         }
         e.alreadyHandled = true;
         return false;
@@ -1449,8 +1449,8 @@ angular.module('ionic.ui.radio', [])
       value: '@'
     },
     transclude: true,
-    template: '<label skip-tap-poly ng-click="tapHandler($event)" class="item item-radio">\
-                <input type="radio" name="group">\
+    template: '<label class="item item-radio">\
+                <input type="radio" name="radio-group">\
                 <div class="item-content" ng-transclude>\
                 </div>\
                 <i class="radio-icon icon ion-checkmark"></i>\
@@ -1465,21 +1465,14 @@ angular.module('ionic.ui.radio', [])
 
       if(!radio.length) { return; }
 
-      $scope.tapHandler = function(e) {
-        console.log("RADIOTAP");
-        radio[0].checked = true;
-        ngModel.$setViewValue($scope.$eval($attr.ngValue));
-        e.alreadyHandled = true;
-      };
-
-      var clickHandler = function(e) {
-        console.log("RADIOCLICK");
-        ngModel.$setViewValue($scope.$eval($attr.ngValue));
-      };
-
       if(ngModel) {
-        //$element.bind('tap', tapHandler);
-        $element.bind('click', clickHandler);
+        radio.bind('click', function(e) {
+          console.log('RADIO CLICK');
+          $scope.$apply(function() {
+            ngModel.$setViewValue($scope.$eval($attr.ngValue));
+          });
+          e.alreadyHandled = true;
+        });
 
         ngModel.$render = function() {
           var val = $scope.$eval($attr.ngValue);
@@ -1549,7 +1542,7 @@ angular.module('ionic.ui.radio', [])
       if(!ngModel || !radioButtons) { return; }
 
       var setIt = function() {
-        console.trace('SET');
+        console.log('SET');
         $element.addClass('active');
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
 
@@ -1567,7 +1560,7 @@ angular.module('ionic.ui.radio', [])
         };
       });
         
-      $element.bind('tap', clickHandler);
+      $element.bind('click', clickHandler);
     }
   }
 });
diff --git a/dist/js/ionic.js b/dist/js/ionic.js
index 29c22c573b..f8d6134280 100644
--- a/dist/js/ionic.js
+++ b/dist/js/ionic.js
@@ -1824,8 +1824,16 @@ window.ionic = {
 
   // polyfill use to simulate native "tap"
   function inputTapPolyfill(ele, e) {
-    if(ele.type === "radio" || ele.type === "checkbox") {
+    if(ele.type === "radio") {
       ele.checked = !ele.checked;
+      ionic.trigger('click', {
+        target: ele
+      });
+    } else if(ele.type === "checkbox") {
+      ele.checked = !ele.checked;
+      ionic.trigger('change', {
+        target: ele
+      });
     } else if(ele.type === "submit" || ele.type === "button") {
       ionic.trigger('click', {
         target: ele
@@ -1839,7 +1847,6 @@ window.ionic = {
   }
 
   function tapPolyfill(e) {
-    console.log('TAP POLY');
     // if the source event wasn't from a touch event then don't use this polyfill
     if(!e.gesture || e.gesture.pointerType !== "touch" || !e.gesture.srcEvent) return;
 
@@ -1849,7 +1856,6 @@ window.ionic = {
     // the tap stuff itself). This is in contrast to preventDefault which will
     // mess up other operations like change events and such
     if(e.alreadyHandled) {
-      console.log('POLY HANDLED');
       return;
     }
 
@@ -1857,35 +1863,17 @@ window.ionic = {
 
     var ele = e.target;
 
-    console.log('TARGET', ele);
-
     while(ele) {
-      // Skip ones that have the poly skip
-      if(ele.getAttribute('skip-tap-poly')) { 
-        ele = ele.parentElement;
-        continue;
-      }
-
       if( ele.tagName === "INPUT" || ele.tagName === "TEXTAREA" || ele.tagName === "SELECT" ) {
-        console.log('INPUT POLY');
         return inputTapPolyfill(ele, e);
       } else if( ele.tagName === "LABEL" ) {
-        console.log('LABEL POLY');
         if(ele.control) {
           return inputTapPolyfill(ele.control, e);
         }
       } else if( ele.tagName === "A" || ele.tagName === "BUTTON" ) {
-        if(ele.getAttribute('href')) {
-          console.log('HREF POLY', ele);
-          ionic.trigger('click', {
-            target: ele
-          });
-        } else {
-          console.log('BUTTON POLY', ele);
-          ionic.trigger('tap', {
-            target: ele
-          });
-        }
+        ionic.trigger('click', {
+          target: ele
+        });
         e.stopPropagation();
         e.preventDefault();
         return false;
@@ -1893,7 +1881,6 @@ window.ionic = {
       ele = ele.parentElement;
     }
 
-    console.log('NEITHER POLY');
     // they didn't tap one of the above elements
     // if the currently active element is an input, and they tapped outside
     // of the current input, then unset its focus (blur) so the keyboard goes away
diff --git a/js/ext/angular/src/directive/ionicCheckbox.js b/js/ext/angular/src/directive/ionicCheckbox.js
index cf12151fb1..fb47b2b0fc 100644
--- a/js/ext/angular/src/directive/ionicCheckbox.js
+++ b/js/ext/angular/src/directive/ionicCheckbox.js
@@ -11,32 +11,29 @@ angular.module('ionic.ui.checkbox', [])
     require: '?ngModel',
     scope: {},
     transclude: true,
-    template: '<label ng-click="tapHandler($event)" class="checkbox"><input type="checkbox"><div ng-transclude></div></label>',
-  
+    template: '<li class="item item-checkbox">\
+                <label class="checkbox">\
+                  <input type="checkbox">\
+                </label>\
+                <div class="item-content" ng-transclude>\
+                </div>\
+              </li>',
 
     link: function($scope, $element, $attr, ngModel) {
       var checkbox;
 
       if(!ngModel) { return; }
 
-      checkbox = $element.children().eq(0);
+      checkbox = angular.element($element[0].querySelector('input[type="checkbox"]'));
 
       if(!checkbox.length) { return; }
 
-      $scope.tapHandler = function(e) {
-        if(e.type != 'click') {
-          checkbox[0].checked = !checkbox[0].checked;
-        }
+      checkbox.bind('change', function(e) {
         ngModel.$setViewValue(checkbox[0].checked);
-        e.alreadyHandled = true;
-      };
-
-      var clickHandler = function(e) {
-        checkbox[0].checked = !checkbox[0].checked;
         $scope.$apply(function() {
-          ngModel.$setViewValue(checkbox[0].checked);
+          e.alreadyHandled = true;
         });
-      };
+      });
 
       if(ngModel) {
         ngModel.$render = function() {
diff --git a/js/ext/angular/src/directive/ionicNavRouter.js b/js/ext/angular/src/directive/ionicNavRouter.js
index 1cb7dd61f8..5293335986 100644
--- a/js/ext/angular/src/directive/ionicNavRouter.js
+++ b/js/ext/angular/src/directive/ionicNavRouter.js
@@ -40,7 +40,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
       };
     }],
 
-    link: function($scope, $element, $attr) {
+    link: function($scope, $element, $attr, ctrl) {
       if(!$element.length) return;
 
       $scope.animation = $attr.animation;
@@ -99,6 +99,10 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
         }
       });  
 
+      $scope.$on('navRouter.goBack', function(e) {
+        ctrl.goBack();
+      });
+
 
       // Keep track of location changes and update a stack pointer that tracks whether we are
       // going forwards or back
@@ -370,7 +374,6 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
 .directive('navBack', ['$window', '$rootScope', 'Gesture', function($window, $rootScope, Gesture) {
   return {
     restrict: 'AC',
-    require: '^?navRouter',
     link: function($scope, $element, $attr, navCtrl) {
       var goBack = function(e) {
         // Only trigger back if the stack is greater than zero
@@ -378,7 +381,7 @@ angular.module('ionic.ui.navRouter', ['ionic.service.gesture'])
           $window.history.back();
 
           // Fallback for bad history supporting devices
-          navCtrl.goBack();
+          $scope.$emit('navRouter.goBack');
         }
         e.alreadyHandled = true;
         return false;
diff --git a/js/ext/angular/src/directive/ionicRadio.js b/js/ext/angular/src/directive/ionicRadio.js
index 13a0672f99..76b7776392 100644
--- a/js/ext/angular/src/directive/ionicRadio.js
+++ b/js/ext/angular/src/directive/ionicRadio.js
@@ -14,8 +14,8 @@ angular.module('ionic.ui.radio', [])
       value: '@'
     },
     transclude: true,
-    template: '<label skip-tap-poly ng-click="tapHandler($event)" class="item item-radio">\
-                <input type="radio" name="group">\
+    template: '<label class="item item-radio">\
+                <input type="radio" name="radio-group">\
                 <div class="item-content" ng-transclude>\
                 </div>\
                 <i class="radio-icon icon ion-checkmark"></i>\
@@ -30,21 +30,14 @@ angular.module('ionic.ui.radio', [])
 
       if(!radio.length) { return; }
 
-      $scope.tapHandler = function(e) {
-        console.log("RADIOTAP");
-        radio[0].checked = true;
-        ngModel.$setViewValue($scope.$eval($attr.ngValue));
-        e.alreadyHandled = true;
-      };
-
-      var clickHandler = function(e) {
-        console.log("RADIOCLICK");
-        ngModel.$setViewValue($scope.$eval($attr.ngValue));
-      };
-
       if(ngModel) {
-        //$element.bind('tap', tapHandler);
-        $element.bind('click', clickHandler);
+        radio.bind('click', function(e) {
+          console.log('RADIO CLICK');
+          $scope.$apply(function() {
+            ngModel.$setViewValue($scope.$eval($attr.ngValue));
+          });
+          e.alreadyHandled = true;
+        });
 
         ngModel.$render = function() {
           var val = $scope.$eval($attr.ngValue);
@@ -114,7 +107,7 @@ angular.module('ionic.ui.radio', [])
       if(!ngModel || !radioButtons) { return; }
 
       var setIt = function() {
-        console.trace('SET');
+        console.log('SET');
         $element.addClass('active');
         ngModel.$setViewValue($scope.$eval($attr.ngValue));
 
@@ -132,7 +125,7 @@ angular.module('ionic.ui.radio', [])
         };
       });
         
-      $element.bind('tap', clickHandler);
+      $element.bind('click', clickHandler);
     }
   }
 });
diff --git a/js/utils/poly.js b/js/utils/poly.js
index 0197b96fbf..42565f4227 100644
--- a/js/utils/poly.js
+++ b/js/utils/poly.js
@@ -30,8 +30,16 @@
 
   // polyfill use to simulate native "tap"
   function inputTapPolyfill(ele, e) {
-    if(ele.type === "radio" || ele.type === "checkbox") {
+    if(ele.type === "radio") {
       ele.checked = !ele.checked;
+      ionic.trigger('click', {
+        target: ele
+      });
+    } else if(ele.type === "checkbox") {
+      ele.checked = !ele.checked;
+      ionic.trigger('change', {
+        target: ele
+      });
     } else if(ele.type === "submit" || ele.type === "button") {
       ionic.trigger('click', {
         target: ele
@@ -45,7 +53,6 @@
   }
 
   function tapPolyfill(e) {
-    console.log('TAP POLY');
     // if the source event wasn't from a touch event then don't use this polyfill
     if(!e.gesture || e.gesture.pointerType !== "touch" || !e.gesture.srcEvent) return;
 
@@ -55,7 +62,6 @@
     // the tap stuff itself). This is in contrast to preventDefault which will
     // mess up other operations like change events and such
     if(e.alreadyHandled) {
-      console.log('POLY HANDLED');
       return;
     }
 
@@ -63,35 +69,17 @@
 
     var ele = e.target;
 
-    console.log('TARGET', ele);
-
     while(ele) {
-      // Skip ones that have the poly skip
-      if(ele.getAttribute('skip-tap-poly')) { 
-        ele = ele.parentElement;
-        continue;
-      }
-
       if( ele.tagName === "INPUT" || ele.tagName === "TEXTAREA" || ele.tagName === "SELECT" ) {
-        console.log('INPUT POLY');
         return inputTapPolyfill(ele, e);
       } else if( ele.tagName === "LABEL" ) {
-        console.log('LABEL POLY');
         if(ele.control) {
           return inputTapPolyfill(ele.control, e);
         }
       } else if( ele.tagName === "A" || ele.tagName === "BUTTON" ) {
-        if(ele.getAttribute('href')) {
-          console.log('HREF POLY', ele);
-          ionic.trigger('click', {
-            target: ele
-          });
-        } else {
-          console.log('BUTTON POLY', ele);
-          ionic.trigger('tap', {
-            target: ele
-          });
-        }
+        ionic.trigger('click', {
+          target: ele
+        });
         e.stopPropagation();
         e.preventDefault();
         return false;
@@ -99,7 +87,6 @@
       ele = ele.parentElement;
     }
 
-    console.log('NEITHER POLY');
     // they didn't tap one of the above elements
     // if the currently active element is an input, and they tapped outside
     // of the current input, then unset its focus (blur) so the keyboard goes away