Fix jsCondition pb in TableTrait getOnRow evt

Author: jcheron

Ajax/semantic/html/collections/table/traits/TableTrait.php

@@ -1,38 +1,47 @@
 <?php
 namespace Ajax\semantic\html\collections\table\traits;
 
-
 use Ajax\JsUtils;
 
 /**
+ *
  * @author jc
  * @property HtmlTable $_self
  */
-trait TableTrait{
+trait TableTrait {
+
+	abstract public function addEvent($event, $jsCode, $stopPropagation = false, $preventDefault = false);
 
-	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
-	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
-	
-	protected function addToPropertyTable($property,$value){
+	abstract public function getOn($event, $url, $responseElement = "", $parameters = array());
+
+	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
 	}
 
 	public function setCelled() {
 		return $this->addToPropertyTable("class", "celled");
 	}
 
-	public function setBasic($very=false) {
-		$table=$this->_self;
+	public function setBasic($very = false) {
+		$table = $this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
+			$table->addToPropertyCtrl("class", "very", array(
+				"very"
+			));
+		return $table->addToPropertyCtrl("class", "basic", array(
+			"basic"
+		));
 	}
 
-	public function setCompact($very=false) {
-		$table=$this->_self;
+	public function setCompact($very = false) {
+		$table = $this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
+			$table->addToPropertyCtrl("class", "very", array(
+				"very"
+			));
+		return $table->addToPropertyCtrl("class", "compact", array(
+			"compact"
+		));
 	}
 
 	public function setCollapsing() {
@@ -47,8 +56,8 @@ public function setStructured() {
 		return $this->addToPropertyTable("class", "structured");
 	}
 
-	public function setSortable($colIndex=NULL) {
-		$table=$this->_self;
+	public function setSortable($colIndex = NULL) {
+		$table = $this->_self;
 		if (isset($colIndex) && $table->hasPart("thead")) {
 			$table->getHeader()->sort($colIndex);
 		}
@@ -71,41 +80,49 @@ public function setStriped() {
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){
-		return $this->onRow("click", $jsCode,$stopPropagation,$preventDefault);
+	public function onRowClick($jsCode, $stopPropagation = false, $preventDefault = false) {
+		return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
-		return $this->_self->addEvent($event."{{tbody tr}}",$jsCode,$stopPropagation,$preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation = false, $preventDefault = false) {
+		return $this->_self->addEvent($event . "{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
-		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false,"jsCondition"=>'!$(this).closest("tr").hasClass("active")']);
-		$selector="tbody tr";
-		if(isset($parameters["selector"])){
-			$selector=$parameters["selector"];
+	public function getOnRow($event, $url, $responseElement = "", $parameters = array()) {
+		$jsCondition = '!$(this).closest("tr").hasClass("active")';
+		if (isset($parameters['jsCondition'])) {
+			$jsCondition = '(' . $parameters['jsCondition'] . ' && ' . $jsCondition . ')';
+		}
+		$parameters = \array_merge($parameters, [
+			"stopPropagation" => false,
+			"preventDefault" => false,
+			"jsCondition" => $jsCondition
+		]);
+		$selector = "tbody tr";
+		if (isset($parameters["selector"])) {
+			$selector = $parameters["selector"];
 		}
-		return $this->_self->getOn($event."{{".$selector."}}", $url,$responseElement,$parameters);
+		return $this->_self->getOn($event . "{{" . $selector . "}}", $url, $responseElement, $parameters);
 	}
-	
-	public function onPageChange($jsCode){
+
+	public function onPageChange($jsCode) {
 		$this->_self->_addEvent("pageChange", $jsCode);
 		return $this;
 	}
-	
-	public function onSearchTerminate($jsCode){
+
+	public function onSearchTerminate($jsCode) {
 		$this->_self->_addEvent("searchTerminate", $jsCode);
 		return $this;
 	}
-	
-	public function getEventsScript(){
+
+	public function getEventsScript() {
 		return $this->_self->getBsComponent()->getScript();
 	}
-	
-	public function addEventsOnRun(JsUtils $js=NULL) {
-		$script=parent::addEventsOnRun($js);
-		$innerScript=$this->_self->getInnerScript();
-		if(!isset($innerScript)){
+
+	public function addEventsOnRun(JsUtils $js = NULL) {
+		$script = parent::addEventsOnRun($js);
+		$innerScript = $this->_self->getInnerScript();
+		if (! isset($innerScript)) {
 			$this->_self->setInnerScript($script);
 		}
 		return $script;

Ajax/semantic/widgets/datatable/DataTable.php

@@ -21,7 +21,7 @@
  * @version 1.0
  * @author jc
  * @since 2.2
- *       
+ *
  */
 class DataTable extends Widget {
 	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
@@ -281,7 +281,7 @@ protected function _generateRow($instance, $fields, &$table, $checkedClass = nul
 				$checked = $func($instance);
 			}
 			$ck->setChecked($checked);
-			$ck->setOnChange("event.stopPropagation();");
+			// $ck->setOnChange("event.stopPropagation();");
 			$field = $ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
@@ -475,7 +475,9 @@ public function autoPaginate($page = 1, $items_per_page = 10, $pages_visibles =
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = ["tbody"]) {
+	public function refresh($compileParts = [
+		"tbody"
+	]) {
 		$this->_compileParts = $compileParts;
 		return $this;
 	}