Add col alignment from right

Author: jcheron

Ajax/common/html/BaseHtml.php

@@ -197,10 +197,7 @@ protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 					$beforeCompile($this,$js,$view);
 				}
 			}
-			if(\is_callable($this->_preCompile)){
-				$pc=$this->_preCompile;
-				$pc($this);
-			}
+			$this->callCallback($this->_preCompile);
 			unset($this->properties["jsCallback"]);
 			$this->_compiled=true;
 		}
@@ -279,6 +276,28 @@ public function onPostCompile($callback){
 	}
 
 	public function onPreCompile($callback){
-		$this->_preCompile=$callback;
+		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
+	}
+	
+	private function addCallback($originalValue,$callback){
+		if(isset($originalValue)){
+			if(!is_array($originalValue)){
+				$result=[$originalValue];
+			}
+			$result[]=$callback;
+			return $result;
+		}
+		return $callback;
+	}
+	
+	private function callCallback($callable){
+		if(\is_callable($callable)){
+			return $callable($this);
+		}
+		if(is_array($callable)){
+			foreach ($callable as $call){
+				$this->callCallback($call);
+			}
+		}
 	}
 }

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

@@ -231,6 +231,33 @@ public function colRight($colIndex) {
 	public function colLeft($colIndex) {
 		return $this->colAlign($colIndex, "colLeft");
 	}
+	
+	/**
+	 * Sets the col alignment to center
+	 * @param int $colIndex
+	 * @return HtmlTable
+	 */
+	public function colCenterFromRight($colIndex) {
+		return $this->colAlign($colIndex, "colCenterFromRight");
+	}
+	
+	/**
+	 * Sets the col alignment to right
+	 * @param int $colIndex
+	 * @return HtmlTable
+	 */
+	public function colRightFromRight($colIndex) {
+		return $this->colAlign($colIndex, "colRightFromRight");
+	}
+	
+	/**
+	 * Sets col alignment to left
+	 * @param int $colIndex
+	 * @return HtmlTable
+	 */
+	public function colLeftFromRight($colIndex) {
+		return $this->colAlign($colIndex, "colLeftFromRight");
+	}
 
 	public function setColAlignment($colIndex,$alignment){
 		switch ($alignment){
@@ -252,6 +279,27 @@ public function setColAlignment($colIndex,$alignment){
 		$this->colAlign($colIndex, $function);
 		return $this;
 	}
+	
+	public function setColAlignmentFromRight($colIndex,$alignment){
+		switch ($alignment){
+			case TextAlignment::LEFT:
+				$function="colLeftFromRight";
+				break;
+				
+			case TextAlignment::RIGHT:
+				$function="colRightFromRight";
+				break;
+				
+			case TextAlignment::CENTER:
+				$function="colCenterFromRight";
+				break;
+				
+			default:
+				$function="colLeftFromRight";
+		}
+		$this->colAlign($colIndex, $function);
+		return $this;
+	}
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {

Ajax/semantic/html/content/table/HtmlTableContent.php

@@ -213,6 +213,17 @@ private function colAlign($colIndex, $function) {
 		}
 		return $this;
 	}
+	
+	private function colAlignFromRight($colIndex, $function) {
+		$count=$this->count();
+		for($i=0; $i < $count; $i++) {
+			$maxRow=$this->content[$i]->count();
+			$index=$maxRow-$colIndex-1;
+			if (($cell=$this->getCell($i, $index))!== NULL)
+				$cell->$function();
+		}
+		return $this;
+	}
 
 	public function colCenter($colIndex) {
 		return $this->colAlign($colIndex, "textCenterAligned");
@@ -225,6 +236,18 @@ public function colRight($colIndex) {
 	public function colLeft($colIndex) {
 		return $this->colAlign($colIndex, "textLeftAligned");
 	}
+	
+	public function colCenterFromRight($colIndex) {
+		return $this->colAlignFromRight($colIndex, "textCenterAligned");
+	}
+	
+	public function colRightFromRight($colIndex) {
+		return $this->colAlignFromRight($colIndex, "textRightAligned");
+	}
+	
+	public function colLeftFromRight($colIndex) {
+		return $this->colAlignFromRight($colIndex, "textLeftAligned");
+	}
 
 	/**
 	 * Returns the number of rows (TR)