fix preventDefault for events

3 files changed, 9 insertions, 15 deletions

diff --git a/src/directives.js b/src/directives.js
index ffe37890..9aadbd11 100644
--- a/src/directives.js
+++ b/src/directives.js
@@ -199,10 +199,10 @@ angularWidget("@ng:repeat", function(expression, element){
 angularDirective("ng:click", function(expression, element){
   return function(element){
     var self = this;
-    element.bind('click', function(){
+    element.bind('click', function(event){
       self.$tryEval(expression, element);
       self.$root.$eval();
-      return false;
+      event.preventDefault();
     });
   };
 });
diff --git a/src/jqLite.js b/src/jqLite.js
index cff9ae00..26ca6dea 100644
--- a/src/jqLite.js
+++ b/src/jqLite.js
@@ -104,19 +104,12 @@ JQLite.prototype = {
       eventHandler = bind[type];
       if (!eventHandler) {
         bind[type] = eventHandler = function(event) {
-          var bubbleEvent = false;
+          if (!event.preventDefault) {
+            event.returnValue = false;
+          }
           foreach(eventHandler.fns, function(fn){
-            bubbleEvent = bubbleEvent || fn.call(self, event);
+            fn.call(self, event);
           });
-          if (!bubbleEvent) {
-            if (msie) {
-              event.returnValue = false;
-              event.cancelBubble = true;
-            } else {
-              event.preventDefault();
-              event.stopPropagation();
-            }
-          }
         };
         eventHandler.fns = [];
         addEventListener(element, type, eventHandler);
diff --git a/src/widgets.js b/src/widgets.js
index 5f0fcf7c..87a302fa 100644
--- a/src/widgets.js
+++ b/src/widgets.js
@@ -198,14 +198,15 @@ function inputWidget(events, modelAccessor, viewAccessor, initFn) {
     this.$eval(element.attr('ng:init')||'');
     // Don't register a handler if we are a button (noopAccessor) and there is no action
     if (action || modelAccessor !== noopAccessor) {
-      element.bind(events, function(){
+      element.bind(events, function(event){
         model.set(view.get());
         lastValue = model.get();
         scope.$tryEval(action, element);
         scope.$root.$eval();
         // if we have noop initFn than we are just a button,
         // therefore we want to prevent default action
-        return initFn != noop;
+        if(initFn == noop)
+          event.preventDefault();
       });
     }
     view.set(lastValue = model.get());