[fix] jQueryExtends: opabind a bit more error prone

MLstate · Dec 8, 2011 · c1246dd · c1246dd
1 parent 45be11d
commit c1246dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/opabsl/jsbsl/bslDom.js b/opabsl/jsbsl/bslDom.js
@@ -540,7 +540,7 @@
 ##register bind: Dom.private.element, string, (Dom.event -> void) -> Dom.event_handler
 ##args(dom, event, f)
 {
-    return dom.opabind(event, f, function(e){return null}, false, false);
+    return dom.opabind(event, f, null, false, false);
 }
 
 ##register bind_with_options: Dom.private.element, string, (Dom.event -> void), option(Dom.event -> Dom.event_propagation), bool, bool -> Dom.event_handler

diff --git a/opabsl/jsbsl/jQueryExtends.js b/opabsl/jsbsl/jQueryExtends.js
@@ -191,10 +191,12 @@ $.fn.extend({
         var ns = name + "." + Math.random()
         function f(e)
         {
-            var prop =  prop_fn(dom_event_to_opa_event(e))
-            if (prop != null) {
-                if (prop.stop_propagation) e.stopPropagation()
-                if (prop.prevent_default) e.preventDefault()
+            if (prop_fn != null) {
+                var prop =  prop_fn(dom_event_to_opa_event(e))
+                if (prop != null) {
+                    if (prop.stop_propagation) e.stopPropagation()
+                    if (prop.prevent_default) e.preventDefault()
+                }
             }
             return fn(dom_event_to_opa_event(e))
         }