_notAllChecked hability in checkedList + popup evt bug

Author: jcheron

Ajax/semantic/components/jsTemplates/tplCheckedList.php

@@ -1,7 +1,7 @@
 <?php
 return '$("%identifier% .master")
   .checkbox({
-    onChecked: function() {$(this).closest(".checkbox").siblings(".list").find(".checkbox").checkbox("check");},
+    onChecked: function() {if(!$(this).hasClass("_notAllChecked")){$(this).closest(".checkbox").siblings(".list").find(".checkbox").checkbox("check");}},
     onUnchecked: function() {$(this).closest(".checkbox").siblings(".list").find(".checkbox").checkbox("uncheck");}
   })
 ;
@@ -28,7 +28,9 @@
         $parentCheckbox.checkbox("set checked");
       }
       else if(allUnchecked) {
-        $parentCheckbox.checkbox("set unchecked");
+		if(!$parentCheckbox.children("input").first().hasClass("_notAllChecked")){
+        	$parentCheckbox.checkbox("set unchecked");
+		}
       }
       else {
         $parentCheckbox.checkbox("set indeterminate");

Ajax/semantic/html/elements/HtmlList.php

@@ -6,6 +6,7 @@
 use Ajax\semantic\html\content\HtmlListItem;
 use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
 use Ajax\JsUtils;
+use Ajax\semantic\html\modules\checkbox\AbstractCheckbox;
 
 class HtmlList extends HtmlSemCollection {
 	protected $_hasCheckedList;
@@ -47,6 +48,13 @@ public function addList($items=array()) {
 		return $this->addItem($list);
 	}
 
+	protected function getItemToAdd($item){
+		$itemO=parent::getItemToAdd($item);
+		if($itemO instanceof AbstractCheckbox)
+			$itemO->addClass("item");
+		return $itemO;
+	}
+
 	public function setCelled() {
 		return $this->addToProperty("class", "celled");
 	}
@@ -84,11 +92,31 @@ public function setHorizontal() {
 		return $this->addToProperty("class", "horizontal");
 	}
 
-	public function addCheckedList($items=array(), $masterItem=NULL, $values=array()) {
+	/**
+	 * Adds a grouped checked box to the list
+	 * @param array $items
+	 * @param string|array|null $masterItem
+	 * @param array|null $values
+	 * @param string $notAllChecked
+	 * @return HtmlList
+	 */
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false) {
 		$count=$this->count();
 		$identifier=$this->identifier . "-" . $count;
 		if (isset($masterItem)) {
-			$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			if(\is_array($masterItem)){
+				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
+				if(isset($masterItem[1])){
+					if(\array_search($masterItem[1], $values)!==false){
+						$masterO->getDataField()->setProperty("checked", "");
+					}
+				}
+			}else{
+				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			}
+			if($notAllChecked){
+				$masterO->getDataField()->addClass("_notAllChecked");
+			}
 			$masterO->getHtmlCk()->addToProperty("class", "master");
 			$masterO->setClass("item");
 			$this->addItem($masterO);
@@ -98,7 +126,7 @@ public function addCheckedList($items=array(), $masterItem=NULL, $values=array()
 		foreach ( $items as $val => $caption ) {
 			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
 			if (\array_search($val, $values) !== false) {
-				$itemO->getField()->setProperty("checked", "");
+				$itemO->getDataField()->setProperty("checked", "");
 			}
 			$itemO->setClass("item");
 			$fields[]=$itemO;

Ajax/semantic/html/modules/HtmlPopup.php

@@ -19,6 +19,10 @@ public function __construct(BaseHtml $container,$identifier, $content="") {
 		$this->_params=array("on"=>"hover");
 	}
 
+	/**
+	 * {@inheritDoc}
+	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::addList()
+	 */
 	public function addList($items=array(),$header=NULL){
 		if(!$this->content instanceof HtmlGrid){
 			$this->content=new HtmlGrid("Grid-".$this->identifier,0);
@@ -58,6 +62,7 @@ public function setBasic(){
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
 	public function run(JsUtils $js){
+		parent::run($js);
 		$this->_params["popup"]="#".$this->identifier;
 		$js->semantic()->popup("#".$this->_container->getIdentifier(),$this->_params);
 	}