optimization

TR TD merged + getColIndex
JsUtils CompileLibrary
BaseHtml => JString removed
PropertyWrapper

Author: jcheron

Ajax/JsUtils.php

@@ -48,6 +48,7 @@ abstract class JsUtils{
 	 */
 	protected $config;
 
+
 	abstract public function getUrl($url);
 	abstract public function addViewElement($identifier,$content,&$view);
 	abstract public function createScriptVariable(&$view,$view_var, $output);
@@ -167,6 +168,9 @@ public function __construct($params=array(),$injected=NULL) {
 
 		$this->params=$params;
 		$this->injected=$injected;
+		if(isset($params['gc'])){
+			\gc_disable();
+		}
 	}
 
 	public function __set($property, $value){
@@ -222,9 +226,15 @@ public function output($array_js) {
 	 * @return string
 	 */
 	public function compile(&$view=NULL, $view_var='script_foot', $script_tags=TRUE) {
-		$this->_compileLibrary($this->ui(),$view);
-		$this->_compileLibrary($this->bootstrap(),$view);
-		$this->_compileLibrary($this->semantic(),$view);
+		if(isset($this->_ui)){
+			$this->_compileLibrary($this->_ui,$view);
+		}
+		if(isset($this->_bootstrap)){
+			$this->_compileLibrary($this->_bootstrap,$view);
+		}
+		if(isset($this->_semantic)){
+			$this->_compileLibrary($this->_semantic,$view);
+		}
 
 		if (\sizeof($this->jquery_code_for_compile)==0) {
 			return;

Ajax/common/html/BaseHtml.php

@@ -3,7 +3,6 @@
 namespace Ajax\common\html;
 
 
-use Ajax\service\JString;
 use Ajax\common\components\SimpleExtComponent;
 use Ajax\JsUtils;
 use Ajax\common\html\traits\BaseHtmlEventsTrait;
@@ -34,7 +33,7 @@ abstract public function run(JsUtils $js);
 
 	private function _callSetter($setter,$key,$value,&$array){
 		$result=false;
-		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
+		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
@@ -211,17 +210,16 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->compile_once($js,$view);
 		$result=$this->getTemplate($js);
 		foreach ( $this as $key => $value ) {
-			if (JString::startswith($key, "_") === false && $key !== "events") {
-				if (\is_array($value)) {
-					$v=PropertyWrapper::wrap($value, $js);
-				} else {
-					if($value instanceof \stdClass)
-						$v=\print_r($value,true);
-					else
+				if(\strstr($result, "%{$key}%")!==false){
+					if (\is_array($value)) {
+						$v=PropertyWrapper::wrap($value, $js);
+					}elseif($value instanceof \stdClass){
+							$v=\print_r($value,true);
+					}else{
 						$v=$value;
+					}
+					$result=str_replace("%{$key}%", $v, $result);
 				}
-				$result=str_ireplace("%" . $key . "%", $v, $result);
-			}
 		}
 		if (isset($js)===true) {
 			$this->run($js);

Ajax/common/html/PropertyWrapper.php

@@ -7,10 +7,10 @@
 class PropertyWrapper {
 
 	public static function wrap($input, $js=NULL, $separator=' ', $valueQuote='"') {
-		$output="";
 		if (is_string($input)) {
-			$output=$input;
+			return $input;
 		}
+		$output="";
 		if (\is_array($input)) {
 			if (sizeof($input) > 0) {
 				if (self::containsElement($input) === false) {
@@ -37,19 +37,50 @@ public static function wrapStrings($input, $separator=' ', $valueQuote='"') {
 				return $k . '=' . $valueQuote . $v . $valueQuote;
 			}, $input, array_keys($input)));
 		} else {
-			$result=implode($separator, array_values($input));
+			$result=implode($separator, $input);
 		}
 		return $result;
 	}
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') {
 		return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) {
-			if ($v instanceof BaseHtml)
+			if(\is_string($v)){
+				return $v;
+			}
+			if ($v instanceof BaseHtml){
 				return $v->compile($js);
-			elseif (\is_array($v)) {
+			}
+			if (\is_array($v)) {
 				return self::wrap($v, $js, $separator, $valueQuote);
-			} elseif(!\is_callable($v))
+			}
+			if(!\is_callable($v)){
 				return $v;
+			}
 		}, $input));
+		/*$result='';
+		foreach ($input as $value) {
+			if($result!==''){
+				$result.=$separator;
+			}
+			if(\is_string($value)){
+				$result.=$value;
+			}else{
+				$result.=self::wrapValue($value,$js,$separator,$valueQuote);
+			}
+		}
+		return $result;*/
+	}
+
+	protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){
+		if (\is_array($value)) {
+			return self::wrap($value, $js, $separator, $valueQuote);
+		}
+		if ($value instanceof BaseHtml){
+			return $value->compile($js);
+		}
+		if(!\is_callable($value)){
+			return $value;
+		}
+		return '';
 	}
 }

Ajax/common/traits/JsUtilsInternalTrait.php

@@ -16,12 +16,10 @@ protected function _addToCompile($jsScript) {
 	 * @param mixed $view
 	 */
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
-		if ($library!=NULL) {
-			if(isset($view))
-				$library->compileHtml($this, $view);
-			if ($library->isAutoCompile()) {
-				$library->compile(true);
-			}
+		if(isset($view))
+			$library->compileHtml($this, $view);
+		if ($library->isAutoCompile()) {
+			$library->compile(true);
 		}
 	}
 

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

@@ -54,7 +54,7 @@ public function setRowspan($rowspan) {
 			$this->_container->toDelete($i, $this->_col);
 		}
 		$this->setProperty("rowspan", $rowspan);
-		return $this->_container;
+		return $this->_container->_setMerged(true);
 	}
 
 	public function mergeRow() {
@@ -79,7 +79,7 @@ public function setColspan($colspan) {
 			$this->_container->toDelete($this->_row, $this->_col + 1);
 		}
 		$this->setProperty("colspan", $colspan);
-		return $this->_container;
+		return $this->_container->_setMerged(true);
 	}
 
 	public function getColspan() {

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

@@ -120,6 +120,8 @@ public function mergeRow($colIndex=0) {
 	}
 
 	public function getColPosition($colIndex) {
+		if($this->_container->_isMerged()!==true)
+			return $colIndex;
 		$pos=0;
 		$rows=$this->_container->getContent();
 		for($i=0; $i < $this->_row; $i++) {

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

@@ -12,6 +12,7 @@
  */
 class HtmlTableContent extends HtmlSemCollection {
 	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_merged=false;
 
 	/**
 	 *
@@ -366,4 +367,13 @@ public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
 		}
 		return $this;
 	}
+
+	public function _isMerged(){
+		return $this->_merged;
+	}
+
+	public function _setMerged($value){
+		$this->_merged=$value;
+		return $this;
+	}
 }