InstanceViewer->setInstance refacto

Author: jcheron

Ajax/common/html/traits/BaseHtmlEventsTrait.php

@@ -58,7 +58,7 @@ public function onCreate($jsCode){
 		return $this;
 	}
 
-	public function addEventsOnRun(JsUtils $js) {
+	public function addEventsOnRun(JsUtils $js=NULL) {
 		$this->_eventsOnCreate($js);
 		if (isset($this->_bsComponent)) {
 			foreach ( $this->_events as $event => $jsCode ) {
@@ -81,13 +81,13 @@ public function addEventsOnRun(JsUtils $js) {
 		}
 	}
 
-	protected function _eventsOnCreate(JsUtils $js){
+	protected function _eventsOnCreate(JsUtils $js=NULL){
 		if(isset($this->_events["_create"])){
 			$create=$this->_events["_create"];
 			if(\is_array($create)){
 				$create=\implode("", $create);
 			}
-			if($create!=="")
+			if(isset($js) && $create!=="")
 				$js->exec($create,true);
 			unset($this->_events["_create"]);
 		}

Ajax/semantic/widgets/base/InstanceViewer.php

@@ -138,31 +138,35 @@ public function setInstance($instance) {
 			$this->properties=$this->getDefaultProperties();
 		}else{
 			foreach ($this->visibleProperties as $property){
-				if(\is_callable($property)){
-					$this->properties[]=$property;
-				}elseif(\is_string($property)){
-					try{
-						$this->_beforeAddProperty(\sizeof($this->properties), $property);
-						$rProperty=$this->reflect->getProperty($property);
-						$this->properties[]=$rProperty;
-					}catch(\Exception $e){
-						$this->_beforeAddProperty(\sizeof($this->properties), $property);
-						$this->properties[]=$property;
-					}
-				}elseif(\is_int($property)){
-					$props=$this->getDefaultProperties();
-					if(isset($props[$property]))
-						$this->properties[]=$props[$property];
-					else
-						$this->properties[]=$property;
-				}else{
-					$this->properties[]=$property;
-				}
+				$this->setInstanceProperty($property);
 			}
 		}
 		return $this;
 	}
 
+	private function setInstanceProperty($property){
+		if(\is_callable($property)){
+			$this->properties[]=$property;
+		}elseif(\is_string($property)){
+			try{
+				$this->_beforeAddProperty(\sizeof($this->properties), $property);
+				$rProperty=$this->reflect->getProperty($property);
+				$this->properties[]=$rProperty;
+			}catch(\Exception $e){
+				$this->_beforeAddProperty(\sizeof($this->properties), $property);
+				$this->properties[]=$property;
+			}
+		}elseif(\is_int($property)){
+			$props=$this->getDefaultProperties();
+			if(isset($props[$property]))
+				$this->properties[]=$props[$property];
+				else
+					$this->properties[]=$property;
+		}else{
+			$this->properties[]=$property;
+		}
+	}
+
 	protected function getDefaultProperties(){
 		$result=[];
 		$properties=$this->reflect->getProperties();