jcheron / phalcon-jquery

Ajax/common/html/BaseHtml.php

Doc Comments +32 added lines

@@ -108,6 +108,10 @@ 
 		return true;
 	}
 
+	/**
+	 * @param string $propertyName
+	 * @param string $value
+	 */
 	protected function propertyContains($propertyName,$value){
 		$values=$this->getProperty($propertyName);
 		if(isset($values)){
@@ -137,6 +141,10 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $name
+	 * @param string[] $typeCtrl
+	 */
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
 		if ($this->ctrl($name, $value, $typeCtrl)===true) {
 			if (is_array($typeCtrl)) {
@@ -161,6 +169,9 @@ 
 		return $this->addToProperty($name, $value);
 	}
 
+	/**
+	 * @param string $name
+	 */
 	public function addToPropertyCtrl($name, $value, $typeCtrl) {
 		// if($this->ctrl($name, $value, $typeCtrl)===true){
 		return $this->addToPropertyUnique($name, $value, $typeCtrl);
@@ -228,6 +239,9 @@ 
 
 	}
 
+	/**
+	 * @param string $before
+	 */
 	public function wrap($before, $after="") {
 		if(isset($before)){
 			$this->wrapBefore.=$before;
@@ -296,6 +310,9 @@ 
 		}
 	}
 
+	/**
+	 * @param string $operation
+	 */
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
 		$params=array (
 				"url" => $url,
@@ -306,14 +323,23 @@ 
 		return $this;
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function getOn($event, $url, $responseElement="", $parameters=array()) {
 		return $this->_ajaxOn("get", $event, $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $url
+	 */
 	public function getOnClick($url, $responseElement="", $parameters=array()) {
 		return $this->getOn("click", $url, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function postOn($event, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$parameters ["params"]=$params;
 		return $this->_ajaxOn("post", $event, $url, $responseElement, $parameters);
@@ -323,6 +349,9 @@ 
 		return $this->postOn("click", $url, $params, $responseElement, $parameters);
 	}
 
+	/**
+	 * @param string $event
+	 */
 	public function postFormOn($event, $url, $form, $responseElement="", $parameters=array()) {
 		$parameters ["form"]=$form;
 		return $this->_ajaxOn("postForm", $event, $url, $responseElement, $parameters);
@@ -372,6 +401,9 @@ 
 		return $value;
 	}
 
+	/**
+	 * @param string $jqueryCall
+	 */
 	public function jsDoJquery($jqueryCall, $param=""){
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}

Spacing +36 added lines, -36 removed lines

@@ -16,8 +16,8 @@ 
 abstract class BaseHtml extends BaseWidget {
 	protected $_template;
 	protected $tagName;
-	protected $properties=array ();
-	protected $events=array ();
+	protected $properties=array();
+	protected $events=array();
 	protected $wrapBefore="";
 	protected $wrapAfter="";
 	protected $_bsComponent;
@@ -56,7 +56,7 @@ 
 
 	public function addToProperty($name, $value, $separator=" ") {
 		$v=@$this->properties[$name];
-		if (isset($v)&&$v!=="")
+		if (isset($v) && $v!=="")
 			$v=$v.$separator.$value;
 		else
 			$v=$value;
@@ -71,11 +71,11 @@ 
 
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
 		$result=$this->getTemplate();
-		foreach ( $this as $key => $value ) {
-			if (PhalconUtils::startsWith($key, "_")===false&&$key!=="events") {
+		foreach ($this as $key => $value) {
+			if (PhalconUtils::startsWith($key, "_")===false && $key!=="events") {
 				if (is_array($value)) {
 					$v=PropertyWrapper::wrap($value, $js);
-				} else {
+				}else {
 					$v=$value;
 				}
 				$result=str_ireplace("%".$key."%", $v, $result);
@@ -87,7 +87,7 @@ 
 		if (isset($view)===true) {
 			$controls=$view->getVar("q");
 			if (isset($controls)===false) {
-				$controls=array ();
+				$controls=array();
 			}
 			$controls [$this->identifier]=$result;
 			$view->setVar("q", $controls);
@@ -100,7 +100,7 @@ 
 			if (array_search($value, $typeCtrl)===false) {
 				throw new \Exception("La valeur passée a propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
-		} else {
+		}else {
 			if (!$typeCtrl($value)) {
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
@@ -108,9 +108,9 @@ 
 		return true;
 	}
 
-	protected function propertyContains($propertyName,$value){
+	protected function propertyContains($propertyName, $value) {
 		$values=$this->getProperty($propertyName);
-		if(isset($values)){
+		if (isset($values)) {
 			return JString::contains($values, $value);
 		}
 		return false;
@@ -185,28 +185,28 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
+		foreach ($this as $key => $value) {
 			if (array_key_exists($key, $array) && !PhalconUtils::startsWith($key, "_")) {
 					$setter="set".ucfirst($key);
 					$this->$setter($array [$key]);
 				unset($array [$key]);
 			}
 		}
-		foreach ( $array as $key => $value ) {
+		foreach ($array as $key => $value) {
 			if (method_exists($this, $key)) {
 				try {
 					$this->$key($value);
 					unset($array [$key]);
-				} catch ( \Exception $e ) {
+				} catch (\Exception $e) {
 					// Nothing to do
 				}
-			} else {
+			}else {
 				$setter="set".ucfirst($key);
 				if (method_exists($this, $setter)) {
 					try {
 						$this->$setter($value);
 						unset($array [$key]);
-					} catch ( \Exception $e ) {
+					} catch (\Exception $e) {
 						// Nothing to do
 					}
 				}
@@ -215,21 +215,21 @@ 
 		return $array;
 	}
 
-	public function fromDatabaseObjects($objects,$function) {
-		if(isset($objects)){
-			foreach ($objects as $object){
-				$this->fromDatabaseObject($object,$function);
+	public function fromDatabaseObjects($objects, $function) {
+		if (isset($objects)) {
+			foreach ($objects as $object) {
+				$this->fromDatabaseObject($object, $function);
 			}
 		}
 		return $this;
 	}
 
-	public function fromDatabaseObject($object,$function){
+	public function fromDatabaseObject($object, $function) {
 
 	}
 
 	public function wrap($before, $after="") {
-		if(isset($before)){
+		if (isset($before)) {
 			$this->wrapBefore.=$before;
 		}
 		$this->wrapAfter=$after.$this->wrapAfter;
@@ -251,13 +251,13 @@ 
 		if (array_key_exists($event, $this->events)) {
 			if (is_array($this->events [$event])) {
 				$this->events [$event] []=$jsCode;
-			} else {
-				$this->events [$event]=array (
+			}else {
+				$this->events [$event]=array(
 						$this->events [$event],
 						$jsCode
 				);
 			}
-		} else {
+		}else {
 			$this->events [$event]=$jsCode;
 		}
 	}
@@ -276,14 +276,14 @@ 
 
 	public function addEventsOnRun(JsUtils $js) {
 		if (isset($this->_bsComponent)) {
-			foreach ( $this->events as $event => $jsCode ) {
+			foreach ($this->events as $event => $jsCode) {
 				$code=$jsCode;
 				if (is_array($jsCode)) {
 					$code="";
-					foreach ( $jsCode as $jsC ) {
+					foreach ($jsCode as $jsC) {
 						if ($jsC instanceof AjaxCall) {
 							$code.="\n".$jsC->compile($js);
-						} else {
+						}else {
 							$code.="\n".$jsC;
 						}
 					}
@@ -297,7 +297,7 @@ 
 	}
 
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		$params=array (
+		$params=array(
 				"url" => $url,
 				"responseElement" => $responseElement
 		);
@@ -336,7 +336,7 @@ 
 		if (is_array($elements)) {
 			$flag=false;
 			$index=0;
-			while ( !$flag&&$index<sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements [$index] instanceof BaseHtml)
 					$flag=($elements [$index]->getIdentifier()===$identifier);
 				$index++;
@@ -350,7 +350,7 @@ 
 		return null;
 	}
 
-	public function __toString(){
+	public function __toString() {
 		return $this->compile();
 	}
 
@@ -366,25 +366,25 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
-	public function jsDoJquery($jqueryCall, $param=""){
+	public function jsDoJquery($jqueryCall, $param="") {
 		return "$('#".$this->identifier."').".$jqueryCall."(".$this->_prep_value($param).");";
 	}
 
-	public function jsHtml($content=""){
-		return $this->jsDoJquery("html",$content);
+	public function jsHtml($content="") {
+		return $this->jsDoJquery("html", $content);
 	}
 
-	public function jsShow(){
+	public function jsShow() {
 		return $this->jsDoJquery("show");
 	}
 
-	public function jsHide(){
+	public function jsHide() {
 		return $this->jsDoJquery("hide");
 	}
 }
\ No newline at end of file

Ajax/semantic/html/modules/HtmlDropdown.php

Spacing +46 added lines, -46 removed lines

@@ -13,7 +13,7 @@ 
 class HtmlDropdown extends HtmlSemDoubleElement {
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
+	protected $items=array();
 	protected $params=array("action"=>"select");
 	protected $input;
 
@@ -21,40 +21,40 @@ 
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$content=new HtmlSemDoubleElement("","div");
+		$content=new HtmlSemDoubleElement("", "div");
 		$content->setClass("text");
 		$content->setContent($value);
-		$content->wrap("",new HtmlIcon("", "dropdown"));
+		$content->wrap("", new HtmlIcon("", "dropdown"));
 		$this->content=array($content);
 		$this->tagName="div";
 		$this->addItems($items);
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL){
+	public function addItem($item, $value=NULL, $image=NULL) {
 		$itemO=$item;
-		if(\is_object($item)===false){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (\is_object($item)===false) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		}else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
@@ -63,51 +63,51 @@ 
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		}else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
-		if($floating)
+	public function asButton($floating=false) {
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple)
+		if ($multiple)
 			$this->addToProperty("class", "multiple");
 		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+			$this->addToPropertyCtrl("class", "selection", array("selection"));
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=false){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=false) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -115,31 +115,31 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=false,$sens=""){
+	public function asSubmenu($pointing=false, $sens="") {
 		$this->setClass("ui dropdown link item");
-		if($pointing===true){
+		if ($pointing===true) {
 			$this->setPointing($sens);
 		}
 		return $this;
 	}
 
-	public function setPointing($sens=""){
+	public function setPointing($sens="") {
 		$this->addToProperty("class", "pointing");
-		if(JString::isNotNull($sens))
-			$this->addToPropertyCtrl("class", $sens, array("left","right"));
+		if (JString::isNotNull($sens))
+			$this->addToPropertyCtrl("class", $sens, array("left", "right"));
 		return $this;
 	}
 
-	public function setValue($value){
-		if(isset($this->input)){
+	public function setValue($value) {
+		if (isset($this->input)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		}else {
 			$this->setProperty("value", $value);
 		}
 		return $this;
@@ -150,14 +150,14 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->params);
+		if ($this->propertyContains("class", "simple")===false) {
+			$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->params);
 			$this->addEventsOnRun($js);
 			return $this->_bsComponent;
 		}
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->params["action"]=$action;
 	}
 }
\ No newline at end of file

Braces +25 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
 		$itemO=$item;
 		if(\is_object($item)===false){
 			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		} elseif($itemO instanceof HtmlDropdownItem){
 			$this->addToProperty("class", "vertical");
 		}
 		$this->items[]=$itemO;
@@ -42,8 +42,9 @@ 
 	}
 
 	public function addInput($name){
-		if(!isset($name))
-			$name="input-".$this->identifier;
+		if(!isset($name)) {
+					$name="input-".$this->identifier;
+		}
 		$this->setAction("activate");
 		$this->input=new HtmlInput($name,"hidden");
 	}
@@ -53,7 +54,7 @@ 
 			foreach ($items as $k=>$v){
 				$this->addItem($v)->setData($k);
 			}
-		}else{
+		} else{
 			foreach ($items as $item){
 				$this->addItem($item);
 			}
@@ -67,7 +68,7 @@ 
 		if($dropdown===false){
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else{
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
@@ -83,18 +84,22 @@ 
 	}
 
 	public function asButton($floating=false){
-		if($floating)
-			$this->addToProperty("class", "floating");
+		if($floating) {
+					$this->addToProperty("class", "floating");
+		}
 		return $this->addToProperty("class", "button");
 	}
 
 	public function asSelect($name=NULL,$multiple=false,$selection=true){
-		if(isset($name))
-			$this->addInput($name);
-		if($multiple)
-			$this->addToProperty("class", "multiple");
-		if ($selection)
-			$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if(isset($name)) {
+					$this->addInput($name);
+		}
+		if($multiple) {
+					$this->addToProperty("class", "multiple");
+		}
+		if ($selection) {
+					$this->addToPropertyCtrl("class", "selection",array("selection"));
+		}
 		return $this;
 	}
 
@@ -104,8 +109,9 @@ 
 	}
 
 	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
-			$name="select-".$this->identifier;
+		if(!isset($name)) {
+					$name="select-".$this->identifier;
+		}
 		$this->input=null;
 		if($multiple){
 			$this->setProperty("multiple", true);
@@ -131,15 +137,16 @@ 
 
 	public function setPointing($sens=""){
 		$this->addToProperty("class", "pointing");
-		if(JString::isNotNull($sens))
-			$this->addToPropertyCtrl("class", $sens, array("left","right"));
+		if(JString::isNotNull($sens)) {
+					$this->addToPropertyCtrl("class", $sens, array("left","right"));
+		}
 		return $this;
 	}
 
 	public function setValue($value){
 		if(isset($this->input)){
 			$this->input->setProperty("value", $value);
-		}else{
+		} else{
 			$this->setProperty("value", $value);
 		}
 		return $this;

Ajax/service/JString.php

Spacing +6 added lines, -6 removed lines

@@ -2,21 +2,21 @@
 namespace Ajax\service;
 class JString {
 
-	public static function contains($hay,$needle){
-		return strpos($hay, $needle) !== false;
+	public static function contains($hay, $needle) {
+		return strpos($hay, $needle)!==false;
 	}
 	public static function startswith($hay, $needle) {
-		return substr($hay, 0, strlen($needle)) === $needle;
+		return substr($hay, 0, strlen($needle))===$needle;
 	}
 
 	public static function endswith($hay, $needle) {
-		return substr($hay, -strlen($needle)) === $needle;
+		return substr($hay, -strlen($needle))===$needle;
 	}
 
-	public static function isNull($s){
+	public static function isNull($s) {
 		return (!isset($s) || NULL===$s || ""===$s);
 	}
-	public static function isNotNull($s){
+	public static function isNotNull($s) {
 		return (isset($s) && NULL!==$s && ""!==$s);
 	}
 }
\ No newline at end of file