ActiveRow on Tables + itemSelector on event

Author: jcheron

Ajax/common/components/SimpleComponent.php

@@ -24,7 +24,8 @@ public function __construct(JsUtils $js=NULL) {
 
 	protected function compileEvents() {
 		foreach ( $this->events as $event => $jsCode ) {
-			$itemSelector=JString::getValueBetween($jsCode);
+			$itemSelector=JString::getValueBetween($event);
+			//echo $itemSelector.":::".$jsCode."<br>";
 			if($event=="execute"){
 				$this->jquery_code_for_compile []=$jsCode;
 			}else if($event=="beforeExecute"){

Ajax/semantic/html/collections/table/ActiveRow.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace Ajax\semantic\html\collections\table;
+
+/**
+ * A class for row selection in Table or DataTable
+ * @author jc
+ * @since 2.2.2
+ */
+class ActiveRow {
+	/**
+	 * @var HtmlTable
+	 */
+	private $table;
+	private $class;
+	private $event;
+	private $multiple;
+	/**
+	 * @param HtmlTable $table
+	 * @param string $class
+	 * @param string $event
+	 * @param boolean $multiple
+	 */
+	public function __construct($table,$class="active",$event="click",$multiple=false){
+		$this->table=$table;
+		$this->class=$class;
+		$this->event=$event;
+		$this->multiple=$multiple;
+	}
+
+	public function getClass() {
+		return $this->class;
+	}
+
+	public function setClass($class) {
+		$this->class=$class;
+		return $this;
+	}
+
+	public function getEvent() {
+		return $this->event;
+	}
+
+	public function setEvent($event) {
+		$this->event=$event;
+		return $this;
+	}
+
+	public function getMultiple() {
+		return $this->multiple;
+	}
+
+	public function setMultiple($multiple) {
+		$this->multiple=$multiple;
+		return $this;
+	}
+
+	public function compile(){
+		$multiple="";
+		if(!$this->multiple){
+			$multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');";
+		}
+		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');",false,false);
+	}
+
+}

Ajax/semantic/html/collections/table/HtmlTable.php

@@ -23,8 +23,7 @@ class HtmlTable extends HtmlSemDoubleElement {
 	private $_compileParts;
 	private $_footer;
 	private $_afterCompileEvents;
-	private $_activeClass="warning";
-	private $_activeRowEvent="click";
+	private $_activeRowSelector;
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
@@ -252,8 +251,8 @@ protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 		if ($this->propertyContains("class", "sortable")) {
 			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
-		if(isset($this->_activeClass)){
-			$this->onRow($this->_activeRowEvent, "$(this).toggleClass('".$this->_activeClass."');");
+		if(isset($this->_activeRowSelector)){
+			$this->_activeRowSelector->compile();
 		}
 	}
 
@@ -309,15 +308,8 @@ public function onNewRow($callback) {
 		return $this;
 	}
 
-	public function setActiveClass($_activeClass) {
-		$this->_activeClass=$_activeClass;
+	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
+		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
 		return $this;
 	}
-
-	public function setActiveRowEvent($_activeRowEvent) {
-		$this->_activeRowEvent=$_activeRowEvent;
-		return $this;
-	}
-
-
 }

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

@@ -72,11 +72,11 @@ public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=fals
 	}
 
 	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
-		$this->getTable()->addEvent($event,"{{tr}}".$jsCode,$stopPropagation,$preventDefault);
+		$this->getTable()->addEvent($event."{{tr}}",$jsCode,$stopPropagation,$preventDefault);
 	}
 
 	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
-		$parameters=\array_merge($parameters,["eventItemSelector"=>"tbody tr","stopPropagation"=>false,"preventDefault"=>false]);
-		return $this->getTable()->getOn($event, $url,$responseElement,$parameters);
+		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false]);
+		return $this->getTable()->getOn($event."{{tbody tr}}", $url,$responseElement,$parameters);
 	}
 }

Ajax/semantic/widgets/datatable/DataTable.php

@@ -397,4 +397,9 @@ public function setSortable($colIndex=NULL) {
 		return $this;
 	}
 
+	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
+		$this->getTable()->setActiveRowSelector($class,$event,$multiple);
+		return $this;
+	}
+
 }

Ajax/service/AjaxCall.php

@@ -45,8 +45,6 @@ public function compile(JsUtils $js=null) {
 				$result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$params,$jsCallback);
 				break;
 		}
-		if(isset($eventItemSelector))
-			$result="{{".$eventItemSelector."}}".$result;
 		return $result;
 	}
 

Ajax/service/JString.php

@@ -53,6 +53,7 @@ public static function replaceAtFirstAndLast($subject,$fromFirst,$toFirst,$fromL
 
 	public static function getValueBetween(&$str,$before="{{",$after="}}"){
 		$matches=[];
+		$result=null;
 		$_before=\preg_quote($before);
 		$_after=\preg_quote($after);
 		if(\preg_match('/'.$_before.'(.*?)'.$_after.'/s', $str, $matches)===1){