Corrections for SLI

jcheron · jcheron · commit bbe42f400300 · 2017-03-29T17:35:27.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,4 @@
 *.buildpath
 .settings/*
 doxygeneJquery
-doc/*
+doc/*
diff --git a/Ajax/Semantic.php b/Ajax/Semantic.php
@@ -17,7 +17,7 @@ class Semantic extends BaseGui {
 	private $language;
 
 	public function __construct($autoCompile=true) {
-		parent::__construct($autoCompile=true);
+		parent::__construct($autoCompile);
 	}
 
 
diff --git a/Ajax/bootstrap/components/Carousel.php b/Ajax/bootstrap/components/Carousel.php
@@ -3,7 +3,6 @@
 namespace Ajax\bootstrap\components;
 
 use Ajax\JsUtils;
-use Ajax\common\JsCode;
 use Ajax\common\components\SimpleExtComponent;
 
 /**
diff --git a/Ajax/bootstrap/html/HtmlForm.php b/Ajax/bootstrap/html/HtmlForm.php
@@ -51,8 +51,6 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 						$control=new HtmlSelect($futureElement,"");
 						$control->setProperty("size", $futureElementValues [1]);
 						$control->setClass("form-control");
-						//$control->setLabel($this->getPart($futureElement));
-						//TODO check Select label
 						break;
 					default:
 						$control=new HtmlInput($futureElement);
@@ -79,7 +77,7 @@ private function getPart($str, $part=1) {
 		return $result;
 	}
 
-	private function getId($str) {
+	protected function getId($str) {
 		$result=preg_split('/(?=[A-Z])/', $str);
 		if (sizeof($result)>2) {
 			$result=$result [2];
@@ -89,7 +87,7 @@ private function getId($str) {
 		return $result;
 	}
 
-	private function getPrefix($element) {
+	protected function getPrefix($element) {
 		$result="input_text";
 		foreach ( $this->formElementsPrefix as $k => $v ) {
 			if (JString::startswith($element, $k)) {
diff --git a/Ajax/bootstrap/html/HtmlProgressbar.php b/Ajax/bootstrap/html/HtmlProgressbar.php
@@ -15,7 +15,7 @@ class HtmlProgressbar extends HtmlBsDoubleElement {
 	protected $striped="";
 	protected $active;
 	protected $caption;
-	protected $isStacked=false;
+	protected $stacked=false;
 	protected $style="";
 	protected $styleLimits=null;
 
@@ -76,7 +76,7 @@ public function getValue() {
 
 	public function stack(HtmlProgressbar $progressBar) {
 		$this->_template='%content%';
-		$progressBar->setIsStacked(true);
+		$progressBar->setStacked(true);
 		$progressBar->showCaption($this->caption=="%value%%");
 		$progressBar->setStriped($this->striped!=="" || $progressBar->isStriped());
 		$progressBar->setActive($this->active==="active" || $progressBar->isActive());
@@ -109,12 +109,12 @@ public function setMin($min) {
 		return $this;
 	}
 
-	public function getIsStacked() {
-		return $this->isStacked;
+	public function getStacked() {
+		return $this->stacked;
 	}
 
-	public function setIsStacked($isStacked) {
-		$this->isStacked=$isStacked;
+	public function setStacked($stacked) {
+		$this->stacked=$stacked;
 		return $this;
 	}
 
@@ -143,7 +143,7 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 		}
 		$this->style=$actualStyle;
 		$this->_template=str_replace("%caption%", $this->caption, $this->_template);
-		if ($this->getIsStacked()===false) {
+		if ($this->getStacked()===false) {
 			$this->wrap('<div class="progress">', '</div>');
 		}
 		return parent::compile($js, $view);
diff --git a/Ajax/common/components/SimpleComponent.php b/Ajax/common/components/SimpleComponent.php
@@ -24,7 +24,6 @@ public function __construct(JsUtils $js=NULL) {
 	protected function compileEvents() {
 		foreach ( $this->events as $event => $jsCode ) {
 			$itemSelector=JString::getValueBetween($event);
-			//echo $itemSelector.":::".$jsCode."<br>";
 			if($event=="execute"){
 				$this->jquery_code_for_compile []=$jsCode;
 			}else if($event=="beforeExecute"){
diff --git a/Ajax/common/traits/JsUtilsInternalTrait.php b/Ajax/common/traits/JsUtilsInternalTrait.php
@@ -90,4 +90,4 @@ protected function conflict() {
 	public function addToCompile($jsScript) {
 		$this->_addToCompile($jsScript);
 	}
-}
+}
diff --git a/Ajax/semantic/components/Accordion.php b/Ajax/semantic/components/Accordion.php
@@ -24,6 +24,4 @@ public function setOn($value="click") {
 	public function setExclusive($value=true) {
 		return $this->setParam("exclusive", $value);
 	}
-
-	//TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Checkbox.php b/Ajax/semantic/components/Checkbox.php
@@ -23,5 +23,4 @@ public function setOnUnchecked($value) {
 	public function setOnChange($value){
 		$this->params["onChange"]="%function(){".$value."}%";
 	}
-	//TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Popup.php b/Ajax/semantic/components/Popup.php
@@ -51,5 +51,4 @@ public function setInline($value){
 	public function setPosition($value){
 		return $this->setParam("position", $value);
 	}
-	//TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Rating.php b/Ajax/semantic/components/Rating.php
@@ -11,6 +11,4 @@ public function __construct(JsUtils $js) {
 		parent::__construct($js);
 		$this->uiName="rating";
 	}
-
-	//TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Sticky.php b/Ajax/semantic/components/Sticky.php
@@ -24,6 +24,4 @@ public function setContext($value="") {
 	public function setOffset($offset=0){
 		return $this->setParam("offset", $offset);
 	}
-
-	//TODO other events implementation
 }
diff --git a/Ajax/semantic/components/Tab.php b/Ajax/semantic/components/Tab.php
@@ -14,5 +14,4 @@ public function __construct(JsUtils $js) {
 	public function setDebug($value=true) {
 		return $this->setParam("debug", $value);
 	}
-	//TODO other events implementation
 }
diff --git a/Ajax/semantic/components/jsTemplates/tplCheckedList.php b/Ajax/semantic/components/jsTemplates/tplCheckedList.php
@@ -35,4 +35,4 @@
       }
     }
   })
-;';
+;';
diff --git a/Ajax/semantic/html/collections/form/HtmlFormFields.php b/Ajax/semantic/html/collections/form/HtmlFormFields.php
@@ -119,7 +119,6 @@ public static function checkeds($name, $items=array(), $label=NULL, $values=arra
 		foreach ( $items as $val => $caption ) {
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $name, $caption, $val, $type);
 			if (\array_search($val, $values)!==false) {
-				//TODO check getField
 				$itemO->getField()->getDataField()->setProperty("checked", "");
 			}
 			$fields[]=$itemO;
diff --git a/Ajax/semantic/html/collections/form/HtmlFormInput.php b/Ajax/semantic/html/collections/form/HtmlFormInput.php
@@ -17,7 +17,6 @@ public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$p
 
 	public function getDataField(){
 		$field= $this->getField();
-		//TODO check getField
 		if($field instanceof HtmlInput)
 			$field=$field->getDataField();
 		return $field;
diff --git a/Ajax/semantic/html/collections/form/traits/CheckboxTrait.php b/Ajax/semantic/html/collections/form/traits/CheckboxTrait.php
@@ -39,7 +39,6 @@ public function attachEvents($events=array()) {
 	}
 
 	public function getField(){
-		//TODO check getField() ?
 		return $this->content["field"];
 	}
 
diff --git a/Ajax/semantic/html/collections/form/traits/FormTrait.php b/Ajax/semantic/html/collections/form/traits/FormTrait.php
@@ -5,7 +5,6 @@
 use Ajax\semantic\html\collections\HtmlMessage;
 use Ajax\service\AjaxCall;
 use Ajax\JsUtils;
-use Ajax\semantic\html\elements\HtmlButton;
 use Ajax\common\html\BaseHtml;
 
 /**
diff --git a/Ajax/semantic/html/content/view/HtmlViewContent.php b/Ajax/semantic/html/content/view/HtmlViewContent.php
@@ -140,7 +140,6 @@ public function addHeaderContent($header, $metas=array(), $description=NULL,$ext
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		//$this->content=JArray::sortAssociative($this->content, [ "header","meta","description","extra" ]);
 		return parent::compile($js, $view);
 	}
 }
diff --git a/Ajax/semantic/html/elements/HtmlButton.php b/Ajax/semantic/html/elements/HtmlButton.php
@@ -138,7 +138,6 @@ public function setPositive() {
 	}
 
 	public function setColor($color){
-		//TODO check button content
 		if(\is_array($this->content)){
 			foreach ($this->content as $content){
 				if($content instanceof HtmlButton)
diff --git a/Ajax/semantic/html/modules/HtmlModal.php b/Ajax/semantic/html/modules/HtmlModal.php
@@ -99,10 +99,6 @@ public function addIconContent($icon,$description=NULL){
 		return $this;
 	}
 
-	private function addContentInPart($content,$uiClass,$part) {
-		return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part);
-	}
-
 	private function addElementInPart($element,$part) {
 		$this->content[$part]->addContent($element);
 		return $element;
diff --git a/Ajax/semantic/html/modules/HtmlSearch.php b/Ajax/semantic/html/modules/HtmlSearch.php
@@ -26,7 +26,6 @@ private function createField($placeholder=NULL, $icon=NULL) {
 			$field->setPlaceholder($placeholder);
 		if (isset($icon))
 			$field->addIcon($icon, Direction::RIGHT);
-		//TODO check getField
 		$field->getDataField()->setClass("prompt");
 		$this->content["field"]=$field;
 		return $field;
diff --git a/Ajax/semantic/widgets/base/InstanceViewer.php b/Ajax/semantic/widgets/base/InstanceViewer.php
@@ -270,16 +270,16 @@ public function getCaption($index){
 	}
 
 	public function getCaptions(){
+		$count=$this->count();
 		if(isset($this->captions)){
 			$captions= \array_values($this->captions);
 			$captionsSize=\sizeof($captions);
-			for($i=$captionsSize;$i<$this->count();$i++){
+			for($i=$captionsSize;$i<$count;$i++){
 				$captions[]="";
 			}
 		}else{
 			$captions=[];
 			$index=0;
-			$count=$this->count();
 			while($index<$count){
 				$captions[]=$this->getCaption($index++);
 			}
diff --git a/Ajax/semantic/widgets/dataform/FormInstanceViewer.php b/Ajax/semantic/widgets/dataform/FormInstanceViewer.php
@@ -12,7 +12,7 @@ class FormInstanceViewer extends InstanceViewer {
 	protected $wrappers;
 
 	public function __construct($identifier,$instance=NULL, $captions=NULL) {
-		parent::__construct($identifier,$instance=NULL, $captions=NULL);
+		parent::__construct($identifier,$instance, $captions);
 		$this->separators=[-1];
 		$this->headers=[];
 		$this->wrappers=[];
@@ -78,7 +78,8 @@ public function removeField($index){
 		parent::removeField($index);
 		$pos=\array_search($index, $this->separators);
 		if($pos!==false){
-			for($i=$pos+1;$i<\sizeof($this->separators);$i++){
+			$sepCount=\sizeof($this->separators);
+			for($i=$pos+1;$i<$sepCount;$i++){
 				$this->separators[$i]--;
 			}
 			\array_splice($this->separators, $pos, 1);
diff --git a/Ajax/service/JArray.php b/Ajax/service/JArray.php
@@ -6,7 +6,6 @@ class JArray {
 
 	public static function isAssociative($array) {
 		return (array_values($array) !== $array);
-		// return (array_keys($array)!==range(0, count($array)-1));
 	}
 
 	public static function getValue($array, $key, $pos) {

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ class Semantic extends BaseGui {`
`17`	`17`	`private $language;`
`18`	`18`
`19`	`19`	`public function __construct($autoCompile=true) {`
`20`		`- parent::__construct($autoCompile=true);`
	`20`	`+ parent::__construct($autoCompile);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -90,4 +90,4 @@ protected function conflict() {`
`90`	`90`	`public function addToCompile($jsScript) {`
`91`	`91`	`$this->_addToCompile($jsScript);`
`92`	`92`	`}`
`93`		`-}`
	`93`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,4 @@ public function setOn($value="click") {`
`24`	`24`	`public function setExclusive($value=true) {`
`25`	`25`	`return $this->setParam("exclusive", $value);`
`26`	`26`	`}`
`27`		`-`
`28`		`- //TODO other events implementation`
`29`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,4 @@ public function setOnUnchecked($value) {`
`23`	`23`	`public function setOnChange($value){`
`24`	`24`	`$this->params["onChange"]="%function(){".$value."}%";`
`25`	`25`	`}`
`26`		`- //TODO other events implementation`
`27`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,5 +51,4 @@ public function setInline($value){`
`51`	`51`	`public function setPosition($value){`
`52`	`52`	`return $this->setParam("position", $value);`
`53`	`53`	`}`
`54`		`- //TODO other events implementation`
`55`	`54`	`}`