optimization

Author: jcheron

Ajax/common/html/BaseHtml.php

@@ -213,35 +213,35 @@ public function setTagName($tagName) {
 
 	public function fromArray($array) {
 		foreach ( $this as $key => $value ) {
+			$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
 			if (array_key_exists($key, $array) && !JString::startswith($key, "_")) {
 				$setter="set" . ucfirst($key);
 				$this->$setter($array[$key]);
 				unset($array[$key]);
 			}
 		}
 		foreach ( $array as $key => $value ) {
-			if (method_exists($this, $key)) {
-				try {
-					$this->$key($value);
-					unset($array[$key]);
-				} catch ( \Exception $e ) {
-					// Nothing to do
-				}
-			} else {
-				$setter="set" . ucfirst($key);
-				if (method_exists($this, $setter)) {
-					try {
-						$this->$setter($value);
-						unset($array[$key]);
-					} catch ( \Exception $e ) {
-						// Nothing to do
-					}
-				}
+			if($this->_callSetter($key, $key, $value, $array)===false){
+				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
 	}
 
+	private function _callSetter($setter,$key,$value,&$array){
+		$result=false;
+		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
+			try {
+				$this->$setter($value);
+				unset($array[$key]);
+				$result=true;
+			} catch ( \Exception $e ) {
+				$result=false;
+			}
+		}
+		return $result;
+	}
+
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
 			foreach ( $objects as $object ) {
@@ -257,7 +257,6 @@ public function fromDatabaseObject($object, $function) {
 	public function wrap($before, $after="") {
 		if (isset($before)) {
 			array_unshift($this->_wrapBefore, $before);
-			// $this->_wrapBefore[]=$before;
 		}
 		$this->_wrapAfter[]=$after;
 		return $this;

Ajax/common/html/traits/BaseHtmlEventsTrait.php

@@ -59,15 +59,7 @@ public function onCreate($jsCode){
 	}
 
 	public function addEventsOnRun(JsUtils $js) {
-		if(isset($this->_events["_create"])){
-			$create=$this->_events["_create"];
-			if(\is_array($create)){
-				$create=\implode("", $create);
-			}
-			if($create!=="")
-				$js->exec($create,true);
-				unset($this->_events["_create"]);
-		}
+		$this->_eventsOnCreate($js);
 		if (isset($this->_bsComponent)) {
 			foreach ( $this->_events as $event => $jsCode ) {
 				$code=$jsCode;
@@ -89,6 +81,18 @@ public function addEventsOnRun(JsUtils $js) {
 		}
 	}
 
+	protected function _eventsOnCreate(JsUtils $js){
+		if(isset($this->_events["_create"])){
+			$create=$this->_events["_create"];
+			if(\is_array($create)){
+				$create=\implode("", $create);
+			}
+			if($create!=="")
+				$js->exec($create,true);
+			unset($this->_events["_create"]);
+		}
+	}
+
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
 		$params=array ("url" => $url,"responseElement" => $responseElement );
 		$params=array_merge($params, $parameters);

Ajax/semantic/html/collections/form/HtmlForm.php

@@ -179,18 +179,20 @@ public function run(JsUtils $js) {
 		if(isset($compo)===false){
 			return parent::run($js);
 		}
-		if(isset($this->_validationParams["_ajaxSubmit"])){
-			if($this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){
-				$compilation=$this->_validationParams["_ajaxSubmit"]->compile($js);
-				$compilation=str_ireplace("\"","%quote%", $compilation);
-				$this->onSuccess($compilation);
-				unset($this->_validationParams["_ajaxSubmit"]);
-			}
+		$this->_runValidationParams($compo,$js);
+		return $this->_bsComponent;
+	}
+
+	private function _runValidationParams(&$compo,JsUtils $js=NULL){
+		if(isset($this->_validationParams["_ajaxSubmit"]) && $this->_validationParams["_ajaxSubmit"] instanceof AjaxCall){
+			$compilation=$this->_validationParams["_ajaxSubmit"]->compile($js);
+			$compilation=str_ireplace("\"","%quote%", $compilation);
+			$this->onSuccess($compilation);
+			unset($this->_validationParams["_ajaxSubmit"]);
 		}
 		$compo->addParams($this->_validationParams);
 		$this->_bsComponent=$compo;
 		$this->addEventsOnRun($js);
-		return $this->_bsComponent;
 	}
 
 	public function addValidationParam($paramName,$paramValue){

Ajax/semantic/widgets/datatable/DataTable.php

@@ -63,25 +63,20 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 		$table=$this->content["table"];
 
 		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
-			$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
-			$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
-			\array_unshift($captions, $ck);
+			$this->_generateMainCheckbox($captions);
 		}
 
 		$table->setRowCount(0, \sizeof($captions));
 		$table->setHeaderValues($captions);
 		if(isset($this->_compileParts))
 			$table->setCompileParts($this->_compileParts);
-		if(isset($this->_searchField)){
-			if(isset($js))
-				$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
+		if(isset($this->_searchField) && isset($js)){
+			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","-#".$this->identifier." tbody",["preventDefault"=>false]);
 		}
 
 		$this->_generateContent($table);
 
-		if($this->_hasCheckboxes){
-			if($table->hasPart("thead"))
+		if($this->_hasCheckboxes && $table->hasPart("thead")){
 				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
 		}
 
@@ -95,6 +90,13 @@ public function compile(JsUtils $js=NULL,&$view=NULL){
 		return parent::compile($js,$view);
 	}
 
+	private function _generateMainCheckbox(&$captions){
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
+		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
+		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
+		\array_unshift($captions, $ck);
+	}
+
 	protected function _generateContent($table){
 		$objects=$this->_modelInstance;
 		if(isset($this->_pagination)){