clean preventDefault

Author: jcheron

Ajax/Jquery.php

@@ -206,10 +206,10 @@ public function _add_event($element, $js, $event, $preventDefault=false, $stopPr
 			$js=implode("\n\t\t", $js);
 		}
 		if ($preventDefault===true) {
-			$js="event.preventDefault();\n".$js;
+			$js=Javascript::$preventDefault.$js;
 		}
 		if ($stopPropagation===true) {
-			$js="event.stopPropagation();\n".$js;
+			$js=Javascript::$stopPropagation.$js;
 		}
 		if (array_search($event, $this->jquery_events)===false)
 			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";

Ajax/common/html/traits/BaseHtmlEventsTrait.php

@@ -24,10 +24,10 @@ trait BaseHtmlEventsTrait{
 	 */
 	public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
 		if ($stopPropagation === true) {
-			$jsCode="event.stopPropagation();" . $jsCode;
+			$jsCode=Javascript::$stopPropagation . $jsCode;
 		}
 		if ($preventDefault === true) {
-			$jsCode="event.preventDefault();" . $jsCode;
+			$jsCode=Javascript::$preventDefault . $jsCode;
 		}
 		return $this->_addEvent($event, $jsCode);
 	}

Ajax/semantic/html/collections/form/traits/FormTrait.php

@@ -116,7 +116,7 @@ public function onValid($jsCode){
 	 */
 	public function onSuccess($jsCode){
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", "%function(evt,fields){".$jsCode."}%");
+		$form->addValidationParam("onSuccess", "%function(event,fields){console.log(fields);".$jsCode."}%");
 		return $form;
 	}
 }

Ajax/service/AjaxCall.php

@@ -27,10 +27,10 @@ public function compile(JsUtils $js=null) {
 		$hasLoader=true;
 		extract($this->parameters);
 		if ($preventDefault===true) {
-			$result.="\nevent.preventDefault();\n";
+			$result.=Javascript::$preventDefault;
 		}
 		if ($stopPropagation===true) {
-			$result.="event.stopPropagation();\n";
+			$result.=Javascript::$stopPropagation;
 		}
 		switch($this->method) {
 			case "get":

Ajax/service/Javascript.php

@@ -3,6 +3,9 @@
 namespace Ajax\service;
 
 class Javascript {
+	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
+	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
+
 	public static function containsCode($expression){
 		return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false;
 	}