@@ -45,8 +45,9 @@ |
||
45 | 45 | |
46 | 46 | protected function _setDi($di) { |
47 | 47 | $this->_di=$di; |
48 | - if ($this->js!=null&&$di!=null) |
|
49 | - $this->js->setDi($di); |
|
48 | + if ($this->js!=null&&$di!=null) { |
|
49 | + $this->js->setDi($di); |
|
50 | + } |
|
50 | 51 | } |
51 | 52 | |
52 | 53 | /** |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | protected function _setDi($di) { |
52 | 52 | $this->_di=$di; |
53 | - if ($this->js!=null&&$di!=null) |
|
53 | + if ($this->js!=null && $di!=null) |
|
54 | 54 | $this->js->setDi($di); |
55 | 55 | } |
56 | 56 | |
@@ -145,18 +145,18 @@ discard block |
||
145 | 145 | } |
146 | 146 | |
147 | 147 | public function __construct($params=array()) { |
148 | - $defaults=array ( |
|
148 | + $defaults=array( |
|
149 | 149 | 'driver' => 'Jquery', |
150 | 150 | 'debug' => true |
151 | 151 | ); |
152 | - foreach ( $defaults as $key => $val ) { |
|
153 | - if (isset($params[$key])&&$params[$key]!=="") { |
|
152 | + foreach ($defaults as $key => $val) { |
|
153 | + if (isset($params[$key]) && $params[$key]!=="") { |
|
154 | 154 | $defaults[$key]=$params[$key]; |
155 | 155 | } |
156 | 156 | } |
157 | 157 | extract($defaults); |
158 | 158 | $this->js=new Jquery($defaults); |
159 | - $this->cdns=array (); |
|
159 | + $this->cdns=array(); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | public function addToCompile($jsScript) { |
@@ -408,7 +408,7 @@ discard block |
||
408 | 408 | * @return string |
409 | 409 | */ |
410 | 410 | public function addClass($element='this', $class='', $immediatly=false) { |
411 | - return $this->js->_genericCallValue('addClass',$element, $class, $immediatly); |
|
411 | + return $this->js->_genericCallValue('addClass', $element, $class, $immediatly); |
|
412 | 412 | } |
413 | 413 | |
414 | 414 | /** |
@@ -418,8 +418,8 @@ discard block |
||
418 | 418 | * @param boolean $immediatly defers the execution if set to false |
419 | 419 | * @return string |
420 | 420 | */ |
421 | - public function after($to, $element, $immediatly=false){ |
|
422 | - return $this->js->_genericCallElement('after',$to, $element, $immediatly); |
|
421 | + public function after($to, $element, $immediatly=false) { |
|
422 | + return $this->js->_genericCallElement('after', $to, $element, $immediatly); |
|
423 | 423 | } |
424 | 424 | |
425 | 425 | /** |
@@ -429,8 +429,8 @@ discard block |
||
429 | 429 | * @param boolean $immediatly defers the execution if set to false |
430 | 430 | * @return string |
431 | 431 | */ |
432 | - public function before($to, $element, $immediatly=false){ |
|
433 | - return $this->js->_genericCallElement('before',$to, $element, $immediatly); |
|
432 | + public function before($to, $element, $immediatly=false) { |
|
433 | + return $this->js->_genericCallElement('before', $to, $element, $immediatly); |
|
434 | 434 | } |
435 | 435 | |
436 | 436 | /** |
@@ -450,8 +450,8 @@ discard block |
||
450 | 450 | * @param string $value |
451 | 451 | * @param boolean $immediatly defers the execution if set to false |
452 | 452 | */ |
453 | - public function val($element='this',$value='',$immediatly=false){ |
|
454 | - return $this->js->_genericCallValue('val',$element,$value,$immediatly); |
|
453 | + public function val($element='this', $value='', $immediatly=false) { |
|
454 | + return $this->js->_genericCallValue('val', $element, $value, $immediatly); |
|
455 | 455 | } |
456 | 456 | |
457 | 457 | /** |
@@ -461,7 +461,7 @@ discard block |
||
461 | 461 | * @param boolean $immediatly defers the execution if set to false |
462 | 462 | */ |
463 | 463 | public function html($element='this', $value='', $immediatly=false) { |
464 | - return $this->js->_genericCallValue('html',$element, $value, $immediatly); |
|
464 | + return $this->js->_genericCallValue('html', $element, $value, $immediatly); |
|
465 | 465 | } |
466 | 466 | // -------------------------------------------------------------------- |
467 | 467 | /** |
@@ -486,7 +486,7 @@ discard block |
||
486 | 486 | * @return string |
487 | 487 | */ |
488 | 488 | public function append($to, $element, $immediatly=false) { |
489 | - return $this->js->_genericCallElement('append',$to, $element, $immediatly); |
|
489 | + return $this->js->_genericCallElement('append', $to, $element, $immediatly); |
|
490 | 490 | } |
491 | 491 | |
492 | 492 | /** |
@@ -497,7 +497,7 @@ discard block |
||
497 | 497 | * @return string |
498 | 498 | */ |
499 | 499 | public function prepend($to, $element, $immediatly=false) { |
500 | - return $this->js->_genericCallElement('prepend',$to, $element, $immediatly); |
|
500 | + return $this->js->_genericCallElement('prepend', $to, $element, $immediatly); |
|
501 | 501 | } |
502 | 502 | // -------------------------------------------------------------------- |
503 | 503 | /** |
@@ -548,7 +548,7 @@ discard block |
||
548 | 548 | * @return string |
549 | 549 | */ |
550 | 550 | public function removeClass($element='this', $class='', $immediatly=false) { |
551 | - return $this->js->_genericCall('removeClass',$element, $class, $immediatly); |
|
551 | + return $this->js->_genericCall('removeClass', $element, $class, $immediatly); |
|
552 | 552 | } |
553 | 553 | // -------------------------------------------------------------------- |
554 | 554 | /** |
@@ -609,7 +609,7 @@ discard block |
||
609 | 609 | * @return string |
610 | 610 | */ |
611 | 611 | public function toggleClass($element='this', $class='', $immediatly=false) { |
612 | - return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly); |
|
612 | + return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly); |
|
613 | 613 | } |
614 | 614 | |
615 | 615 | /** |
@@ -656,11 +656,11 @@ discard block |
||
656 | 656 | */ |
657 | 657 | public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) { |
658 | 658 | $bs=$this->_bootstrap; |
659 | - if (isset($bs)&&isset($view)) { |
|
659 | + if (isset($bs) && isset($view)) { |
|
660 | 660 | $bs->compileHtml($this, $view); |
661 | 661 | } |
662 | 662 | $sem=$this->_semantic; |
663 | - if (isset($sem)&&isset($view)) { |
|
663 | + if (isset($sem) && isset($view)) { |
|
664 | 664 | $sem->compileHtml($this, $view); |
665 | 665 | } |
666 | 666 | return $this->js->_compile($view, $view_var, $script_tags); |
@@ -740,27 +740,27 @@ discard block |
||
740 | 740 | $json_result=$result->result_array(); |
741 | 741 | } elseif (is_array($result)) { |
742 | 742 | $json_result=$result; |
743 | - } else { |
|
743 | + }else { |
|
744 | 744 | return $this->_prep_args($result); |
745 | 745 | } |
746 | - } else { |
|
746 | + }else { |
|
747 | 747 | return 'null'; |
748 | 748 | } |
749 | 749 | return $this->_create_json($json_result, $match_array_type); |
750 | 750 | } |
751 | 751 | |
752 | 752 | private function _create_json($json_result, $match_array_type) { |
753 | - $json=array (); |
|
753 | + $json=array(); |
|
754 | 754 | $_is_assoc=TRUE; |
755 | - if (!is_array($json_result)&&empty($json_result)) { |
|
755 | + if (!is_array($json_result) && empty($json_result)) { |
|
756 | 756 | show_error("Generate JSON Failed - Illegal key, value pair."); |
757 | 757 | } elseif ($match_array_type) { |
758 | 758 | $_is_assoc=$this->_is_associative_array($json_result); |
759 | 759 | } |
760 | - foreach ( $json_result as $k => $v ) { |
|
760 | + foreach ($json_result as $k => $v) { |
|
761 | 761 | if ($_is_assoc) { |
762 | 762 | $json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type); |
763 | - } else { |
|
763 | + }else { |
|
764 | 764 | $json[]=$this->generate_json($v, $match_array_type); |
765 | 765 | } |
766 | 766 | } |
@@ -775,7 +775,7 @@ discard block |
||
775 | 775 | * @return type |
776 | 776 | */ |
777 | 777 | public function _is_associative_array($arr) { |
778 | - foreach ( array_keys($arr) as $key => $val ) { |
|
778 | + foreach (array_keys($arr) as $key => $val) { |
|
779 | 779 | if ($key!==$val) { |
780 | 780 | return TRUE; |
781 | 781 | } |
@@ -794,11 +794,11 @@ discard block |
||
794 | 794 | return 'null'; |
795 | 795 | } elseif (is_bool($result)) { |
796 | 796 | return ($result===TRUE) ? 'true' : 'false'; |
797 | - } elseif (is_string($result)||$is_key) { |
|
798 | - return '"'.str_replace(array ( |
|
799 | - '\\',"\t","\n","\r",'"','/' |
|
800 | - ), array ( |
|
801 | - '\\\\','\\t','\\n',"\\r",'\"','\/' |
|
797 | + } elseif (is_string($result) || $is_key) { |
|
798 | + return '"'.str_replace(array( |
|
799 | + '\\', "\t", "\n", "\r", '"', '/' |
|
800 | + ), array( |
|
801 | + '\\\\', '\\t', '\\n', "\\r", '\"', '\/' |
|
802 | 802 | ), $result).'"'; |
803 | 803 | } elseif (is_scalar($result)) { |
804 | 804 | return $result; |
@@ -813,8 +813,8 @@ discard block |
||
813 | 813 | * @param string $jsCallback javascript code to execute after the request |
814 | 814 | * @param boolean $hasLoader true for showing ajax loader. default : true |
815 | 815 | */ |
816 | - public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) { |
|
817 | - return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true); |
|
816 | + public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) { |
|
817 | + return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true); |
|
818 | 818 | } |
819 | 819 | |
820 | 820 | /** |
@@ -825,8 +825,8 @@ discard block |
||
825 | 825 | * @param string $jsCallback javascript code to execute after the request |
826 | 826 | * @param boolean $immediatly |
827 | 827 | */ |
828 | - public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
829 | - return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly); |
|
828 | + public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
829 | + return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly); |
|
830 | 830 | } |
831 | 831 | |
832 | 832 | /** |
@@ -836,8 +836,8 @@ discard block |
||
836 | 836 | * @param string $url the request address |
837 | 837 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
838 | 838 | */ |
839 | - public function jsonOn($event,$element, $url,$parameters=array()) { |
|
840 | - return $this->js->_jsonOn($event, $element, $url,$parameters); |
|
839 | + public function jsonOn($event, $element, $url, $parameters=array()) { |
|
840 | + return $this->js->_jsonOn($event, $element, $url, $parameters); |
|
841 | 841 | } |
842 | 842 | |
843 | 843 | /** |
@@ -881,8 +881,8 @@ discard block |
||
881 | 881 | * @param string $url the request url |
882 | 882 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
883 | 883 | */ |
884 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) { |
|
885 | - return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters); |
|
884 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
885 | + return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters); |
|
886 | 886 | } |
887 | 887 | |
888 | 888 | /** |
@@ -894,7 +894,7 @@ discard block |
||
894 | 894 | * @param string $jsCallback javascript code to execute after the request |
895 | 895 | * @param string $attr the html attribute added to the request |
896 | 896 | */ |
897 | - public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") { |
|
897 | + public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") { |
|
898 | 898 | return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false); |
899 | 899 | } |
900 | 900 | |
@@ -932,8 +932,8 @@ discard block |
||
932 | 932 | * @param string $jsCallback javascript code to execute after the request |
933 | 933 | * @param boolean $hasLoader true for showing ajax loader. default : true |
934 | 934 | */ |
935 | - public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) { |
|
936 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true); |
|
935 | + public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) { |
|
936 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true); |
|
937 | 937 | } |
938 | 938 | |
939 | 939 | /** |
@@ -946,8 +946,8 @@ discard block |
||
946 | 946 | * @param string $jsCallback javascript code to execute after the request |
947 | 947 | * @param boolean $hasLoader true for showing ajax loader. default : true |
948 | 948 | */ |
949 | - public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) { |
|
950 | - return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false); |
|
949 | + public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) { |
|
950 | + return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false); |
|
951 | 951 | } |
952 | 952 | |
953 | 953 | /** |
@@ -961,7 +961,7 @@ discard block |
||
961 | 961 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
962 | 962 | */ |
963 | 963 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
964 | - return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
964 | + return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters); |
|
965 | 965 | } |
966 | 966 | |
967 | 967 | /** |
@@ -985,8 +985,8 @@ discard block |
||
985 | 985 | * @param string $jsCallback javascript code to execute after the request |
986 | 986 | * @param boolean $hasLoader true for showing ajax loader. default : true |
987 | 987 | */ |
988 | - public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) { |
|
989 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true); |
|
988 | + public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) { |
|
989 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true); |
|
990 | 990 | } |
991 | 991 | |
992 | 992 | /** |
@@ -999,8 +999,8 @@ discard block |
||
999 | 999 | * @param string $attr the html attribute added to the request |
1000 | 1000 | * @param boolean $hasLoader true for showing ajax loader. default : true |
1001 | 1001 | */ |
1002 | - public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) { |
|
1003 | - return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false); |
|
1002 | + public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) { |
|
1003 | + return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false); |
|
1004 | 1004 | } |
1005 | 1005 | |
1006 | 1006 | /** |
@@ -1014,7 +1014,7 @@ discard block |
||
1014 | 1014 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true) |
1015 | 1015 | */ |
1016 | 1016 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
1017 | - return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters); |
|
1017 | + return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters); |
|
1018 | 1018 | } |
1019 | 1019 | |
1020 | 1020 | /** |
@@ -1069,7 +1069,7 @@ discard block |
||
1069 | 1069 | $preventDefault=false; |
1070 | 1070 | $immediatly=true; |
1071 | 1071 | extract($parameters); |
1072 | - return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly); |
|
1072 | + return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly); |
|
1073 | 1073 | } |
1074 | 1074 | |
1075 | 1075 | /** |
@@ -1096,7 +1096,7 @@ discard block |
||
1096 | 1096 | $preventDefault=false; |
1097 | 1097 | $immediatly=true; |
1098 | 1098 | extract($parameters); |
1099 | - $script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly); |
|
1099 | + $script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly); |
|
1100 | 1100 | return $script; |
1101 | 1101 | } |
1102 | 1102 | |
@@ -1106,7 +1106,7 @@ discard block |
||
1106 | 1106 | |
1107 | 1107 | public function setCDNs($cdns) { |
1108 | 1108 | if (is_array($cdns)===false) { |
1109 | - $cdns=array ( |
|
1109 | + $cdns=array( |
|
1110 | 1110 | $cdns |
1111 | 1111 | ); |
1112 | 1112 | } |
@@ -1117,9 +1117,9 @@ discard block |
||
1117 | 1117 | $hasJQuery=false; |
1118 | 1118 | $hasJQueryUI=false; |
1119 | 1119 | $hasBootstrap=false; |
1120 | - $result=array (); |
|
1121 | - foreach ( $this->cdns as $cdn ) { |
|
1122 | - switch(get_class($cdn)) { |
|
1120 | + $result=array(); |
|
1121 | + foreach ($this->cdns as $cdn) { |
|
1122 | + switch (get_class($cdn)) { |
|
1123 | 1123 | case "Ajax\lib\CDNJQuery": |
1124 | 1124 | $hasJQuery=true; |
1125 | 1125 | $result[0]=$cdn; |
@@ -1137,10 +1137,10 @@ discard block |
||
1137 | 1137 | if ($hasJQuery===false) { |
1138 | 1138 | $result[0]=new CDNJQuery("x"); |
1139 | 1139 | } |
1140 | - if ($hasJQueryUI===false&&isset($this->_ui)) { |
|
1140 | + if ($hasJQueryUI===false && isset($this->_ui)) { |
|
1141 | 1141 | $result[1]=new CDNGuiGen("x", $template); |
1142 | 1142 | } |
1143 | - if ($hasBootstrap===false&&isset($this->_bootstrap)) { |
|
1143 | + if ($hasBootstrap===false && isset($this->_bootstrap)) { |
|
1144 | 1144 | $result[2]=new CDNBootstrap("x"); |
1145 | 1145 | } |
1146 | 1146 | ksort($result); |
@@ -1154,7 +1154,7 @@ discard block |
||
1154 | 1154 | $this->_setDi($di); |
1155 | 1155 | } |
1156 | 1156 | } |
1157 | -} else { |
|
1157 | +}else { |
|
1158 | 1158 | class JsUtils extends _JsUtils { |
1159 | 1159 | |
1160 | 1160 | public function setDi(DiInterface $di) { |
@@ -65,7 +65,7 @@ |
||
65 | 65 | } |
66 | 66 | |
67 | 67 | protected function compileEvents() { |
68 | - foreach ( $this->events as $event => $jsCode ) { |
|
68 | + foreach ($this->events as $event => $jsCode) { |
|
69 | 69 | $this->jquery_code_for_compile []="$( \"".$this->collapsed."\" ).on(\"".$event."\" , function (e) {".$jsCode."});"; |
70 | 70 | } |
71 | 71 | } |
@@ -57,7 +57,7 @@ |
||
57 | 57 | if ($value) { |
58 | 58 | $this->jsCodes ["draggable"]=new Draggable(); |
59 | 59 | $this->setBackdrop(false); |
60 | - } else if (array_key_exists("draggable", $this->jsCodes)) { |
|
60 | + }else if (array_key_exists("draggable", $this->jsCodes)) { |
|
61 | 61 | unset($this->jsCodes ["draggable"]); |
62 | 62 | unset($this->params ["backdrop"]); |
63 | 63 | } |
@@ -9,10 +9,10 @@ |
||
9 | 9 | * @see \Ajax\common\SimpleComponent::compileEvents() |
10 | 10 | */ |
11 | 11 | protected function compileEvents() { |
12 | - foreach ( $this->events as $event => $jsCode ) { |
|
12 | + foreach ($this->events as $event => $jsCode) { |
|
13 | 13 | if ($event==="buttonClick") { |
14 | 14 | $this->jquery_code_for_compile []="$( \"#split-".preg_replace('/[^a-zA-Z0-9\-.]/s', '', $this->attachTo)."\" ).on(\"click\" , function( event, data ) {".$jsCode."});"; |
15 | - } else { |
|
15 | + }else { |
|
16 | 16 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});"; |
17 | 17 | } |
18 | 18 | } |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | public function __construct(JsUtils $js) { |
20 | 20 | parent::__construct($js); |
21 | - $this->tabs=array (); |
|
21 | + $this->tabs=array(); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | public function getTabs() { |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | public function getTab($index) { |
38 | - if ($index>0&&$index<sizeof($this->tabs)) |
|
38 | + if ($index>0 && $index<sizeof($this->tabs)) |
|
39 | 39 | return $this->tabs [$index]; |
40 | 40 | } |
41 | 41 |
@@ -35,8 +35,9 @@ discard block |
||
35 | 35 | } |
36 | 36 | |
37 | 37 | public function getTab($index) { |
38 | - if ($index>0&&$index<sizeof($this->tabs)) |
|
39 | - return $this->tabs [$index]; |
|
38 | + if ($index>0&&$index<sizeof($this->tabs)) { |
|
39 | + return $this->tabs [$index]; |
|
40 | + } |
|
40 | 41 | } |
41 | 42 | |
42 | 43 | public function show($index) { |
@@ -52,8 +53,9 @@ discard block |
||
52 | 53 | */ |
53 | 54 | public function onShow($index, $jsCode) { |
54 | 55 | $tab=$this->getTab($index); |
55 | - if (isset($tab)) |
|
56 | - return $tab->onShow($jsCode); |
|
56 | + if (isset($tab)) { |
|
57 | + return $tab->onShow($jsCode); |
|
58 | + } |
|
57 | 59 | } |
58 | 60 | |
59 | 61 | /** |
@@ -64,8 +66,9 @@ discard block |
||
64 | 66 | */ |
65 | 67 | public function onShown($index, $jsCode) { |
66 | 68 | $tab=$this->getTab($index); |
67 | - if (isset($tab)) |
|
68 | - return $tab->onShown($jsCode); |
|
69 | + if (isset($tab)) { |
|
70 | + return $tab->onShown($jsCode); |
|
71 | + } |
|
69 | 72 | } |
70 | 73 | |
71 | 74 | /** |
@@ -76,8 +79,9 @@ discard block |
||
76 | 79 | */ |
77 | 80 | public function onHide($index, $jsCode) { |
78 | 81 | $tab=$this->getTab($index); |
79 | - if (isset($tab)) |
|
80 | - return $tab->onShow($jsCode); |
|
82 | + if (isset($tab)) { |
|
83 | + return $tab->onShow($jsCode); |
|
84 | + } |
|
81 | 85 | } |
82 | 86 | |
83 | 87 | /** |
@@ -88,7 +92,8 @@ discard block |
||
88 | 92 | */ |
89 | 93 | public function onHidden($index, $jsCode) { |
90 | 94 | $tab=$this->getTab($index); |
91 | - if (isset($tab)) |
|
92 | - return $tab->onShow($jsCode); |
|
95 | + if (isset($tab)) { |
|
96 | + return $tab->onShow($jsCode); |
|
97 | + } |
|
93 | 98 | } |
94 | 99 | } |
95 | 100 | \ No newline at end of file |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | $this->setClass("panel-group"); |
20 | 20 | $this->setRole("tablist"); |
21 | 21 | $this->setProperty("aria-multiselectable", "true"); |
22 | - $this->content=array (); |
|
22 | + $this->content=array(); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | public function addPanel($title, $content) { |
@@ -45,8 +45,8 @@ discard block |
||
45 | 45 | * @param string $action a Phalcon action |
46 | 46 | * @param $params The parameters to pass to the view |
47 | 47 | */ |
48 | - public function renderContentPanel($title,$view, $controller, $action, $params=NULL) { |
|
49 | - $template=$view->getRender($controller, $action, $params, function ($view) { |
|
48 | + public function renderContentPanel($title, $view, $controller, $action, $params=NULL) { |
|
49 | + $template=$view->getRender($controller, $action, $params, function($view) { |
|
50 | 50 | $view->setRenderLevel(View::LEVEL_ACTION_VIEW); |
51 | 51 | }); |
52 | 52 | return $this->addPanel($title, $template); |
@@ -59,19 +59,19 @@ discard block |
||
59 | 59 | * @param string $controller a Phalcon controller |
60 | 60 | * @param string $action a Phalcon action |
61 | 61 | */ |
62 | - public function forwardPanel($title,$initialController,$controller,$action){ |
|
63 | - $dispatcher = $initialController->dispatcher; |
|
62 | + public function forwardPanel($title, $initialController, $controller, $action) { |
|
63 | + $dispatcher=$initialController->dispatcher; |
|
64 | 64 | $dispatcher->setControllerName($controller); |
65 | 65 | $dispatcher->setActionName($action); |
66 | 66 | $dispatcher->dispatch(); |
67 | - $template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) { |
|
67 | + $template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) { |
|
68 | 68 | $view->setRenderLevel(View::LEVEL_ACTION_VIEW); |
69 | 69 | }); |
70 | 70 | return $this->addPanel($title, $template); |
71 | 71 | } |
72 | 72 | |
73 | 73 | public function run(JsUtils $js) { |
74 | - foreach ( $this->content as $content ) { |
|
74 | + foreach ($this->content as $content) { |
|
75 | 75 | $content->run($js); |
76 | 76 | } |
77 | 77 | } |
@@ -77,7 +77,8 @@ |
||
77 | 77 | } |
78 | 78 | |
79 | 79 | public function getPanel($index) { |
80 | - if ($index<sizeof($this->content)) |
|
81 | - return $this->content [$index]; |
|
80 | + if ($index<sizeof($this->content)) { |
|
81 | + return $this->content [$index]; |
|
82 | + } |
|
82 | 83 | } |
83 | 84 | } |
84 | 85 | \ No newline at end of file |
@@ -44,13 +44,13 @@ discard block |
||
44 | 44 | |
45 | 45 | public function addCloseButton() { |
46 | 46 | $button=new HtmlButton("close-".$this->identifier); |
47 | - $button->setProperties(array ( |
|
47 | + $button->setProperties(array( |
|
48 | 48 | "class" => "close", |
49 | 49 | "data-dismiss" => "alert", |
50 | 50 | "aria-label" => "close" |
51 | 51 | )); |
52 | 52 | $button->setValue('<span aria-hidden="true">×</span>'); |
53 | - $this->addToPropertyCtrl("class", "alert-dismissible", array ( |
|
53 | + $this->addToPropertyCtrl("class", "alert-dismissible", array( |
|
54 | 54 | "alert-dismissible" |
55 | 55 | )); |
56 | 56 | $this->button=$button; |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @see \Ajax\bootstrap\html\base\BaseHtml::compile() |
80 | 80 | */ |
81 | 81 | public function compile(JsUtils $js=NULL, View $view=NULL) { |
82 | - if ($this->closeable&&$this->button==="") { |
|
82 | + if ($this->closeable && $this->button==="") { |
|
83 | 83 | $this->addCloseButton(); |
84 | 84 | } |
85 | 85 | return parent::compile($js, $view); |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | * @return \Ajax\bootstrap\html\HtmlButton |
72 | 72 | */ |
73 | 73 | public function setActive() { |
74 | - return $this->addToPropertyCtrl("class", "active", array ( |
|
74 | + return $this->addToPropertyCtrl("class", "active", array( |
|
75 | 75 | "active" |
76 | 76 | )); |
77 | 77 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | * @return \Ajax\bootstrap\html\HtmlButton |
82 | 82 | */ |
83 | 83 | public function setDisabled() { |
84 | - return $this->addToPropertyCtrl("class", "disabled", array ( |
|
84 | + return $this->addToPropertyCtrl("class", "disabled", array( |
|
85 | 85 | "disabled" |
86 | 86 | )); |
87 | 87 | } |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | */ |
110 | 110 | public function fromArray($array) { |
111 | 111 | $array=parent::fromArray($array); |
112 | - foreach ( $array as $key => $value ) { |
|
112 | + foreach ($array as $key => $value) { |
|
113 | 113 | $this->setProperty($key, $value); |
114 | 114 | } |
115 | 115 | return $array; |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | * @return HtmlButtongroups default : "" |
35 | 35 | */ |
36 | 36 | public function setSize($size) { |
37 | - foreach ( $this->elements as $element ) { |
|
37 | + foreach ($this->elements as $element) { |
|
38 | 38 | $element->setSize($size); |
39 | 39 | } |
40 | 40 | if (is_int($size)) { |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | public function setStyle($value) { |
47 | - foreach ( $this->elements as $element ) |
|
47 | + foreach ($this->elements as $element) |
|
48 | 48 | $element->setStyle($value); |
49 | 49 | } |
50 | 50 | |
@@ -64,7 +64,7 @@ discard block |
||
64 | 64 | public function addElement($element) { |
65 | 65 | $result=$element; |
66 | 66 | $iid=sizeof($this->elements)+1; |
67 | - if (($element instanceof HtmlDropdown)||($element instanceof HtmlSplitbutton)) { |
|
67 | + if (($element instanceof HtmlDropdown) || ($element instanceof HtmlSplitbutton)) { |
|
68 | 68 | $this->addExistingDropDown($element); |
69 | 69 | $this->elements[]=$element; |
70 | 70 | } elseif ($element instanceof HtmlButton) { |
@@ -78,7 +78,7 @@ discard block |
||
78 | 78 | else |
79 | 79 | $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
80 | 80 | $this->dropdownAsButton($bt); |
81 | - } else |
|
81 | + }else |
|
82 | 82 | $bt=new HtmlButton($this->identifier."-button-".$iid); |
83 | 83 | $bt->fromArray($element); |
84 | 84 | $this->elements[]=$bt; |
@@ -93,7 +93,7 @@ discard block |
||
93 | 93 | } |
94 | 94 | |
95 | 95 | public function addElements($elements) { |
96 | - foreach ( $elements as $element ) { |
|
96 | + foreach ($elements as $element) { |
|
97 | 97 | $this->addElement($element); |
98 | 98 | } |
99 | 99 | return $this; |
@@ -110,10 +110,10 @@ discard block |
||
110 | 110 | public function setAlignment($value) { |
111 | 111 | if (is_int($value)) { |
112 | 112 | $value=CssRef::alignment("btn-group")[$value]; |
113 | - } else |
|
113 | + }else |
|
114 | 114 | $value="btn-group-".$value; |
115 | 115 | if (strstr($value, "justified")) { |
116 | - foreach ( $this->elements as $element ) { |
|
116 | + foreach ($this->elements as $element) { |
|
117 | 117 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
118 | 118 | } |
119 | 119 | } |
@@ -144,7 +144,7 @@ discard block |
||
144 | 144 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
145 | 145 | */ |
146 | 146 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
147 | - foreach ( $this->elements as $element ) { |
|
147 | + foreach ($this->elements as $element) { |
|
148 | 148 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
149 | 149 | } |
150 | 150 | return $this; |
@@ -44,8 +44,9 @@ discard block |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | public function setStyle($value) { |
47 | - foreach ( $this->elements as $element ) |
|
48 | - $element->setStyle($value); |
|
47 | + foreach ( $this->elements as $element ) { |
|
48 | + $element->setStyle($value); |
|
49 | + } |
|
49 | 50 | } |
50 | 51 | |
51 | 52 | private function dropdownAsButton($bt) { |
@@ -70,16 +71,18 @@ discard block |
||
70 | 71 | } elseif ($element instanceof HtmlButton) { |
71 | 72 | $this->elements[]=$element; |
72 | 73 | } elseif (is_array($element)) { |
73 | - if (array_key_exists("glyph", $element)) |
|
74 | - $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
75 | - elseif (array_key_exists("btnCaption", $element)) { |
|
76 | - if (array_key_exists("split", $element)) |
|
77 | - $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
78 | - else |
|
79 | - $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
74 | + if (array_key_exists("glyph", $element)) { |
|
75 | + $bt=new HtmlGlyphButton($this->identifier."-button-".$iid); |
|
76 | + } elseif (array_key_exists("btnCaption", $element)) { |
|
77 | + if (array_key_exists("split", $element)) { |
|
78 | + $bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid); |
|
79 | + } else { |
|
80 | + $bt=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
|
81 | + } |
|
80 | 82 | $this->dropdownAsButton($bt); |
81 | - } else |
|
82 | - $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
83 | + } else { |
|
84 | + $bt=new HtmlButton($this->identifier."-button-".$iid); |
|
85 | + } |
|
83 | 86 | $bt->fromArray($element); |
84 | 87 | $this->elements[]=$bt; |
85 | 88 | $result=$bt; |
@@ -110,8 +113,9 @@ discard block |
||
110 | 113 | public function setAlignment($value) { |
111 | 114 | if (is_int($value)) { |
112 | 115 | $value=CssRef::alignment("btn-group")[$value]; |
113 | - } else |
|
114 | - $value="btn-group-".$value; |
|
116 | + } else { |
|
117 | + $value="btn-group-".$value; |
|
118 | + } |
|
115 | 119 | if (strstr($value, "justified")) { |
116 | 120 | foreach ( $this->elements as $element ) { |
117 | 121 | $element->wrap('<div class="btn-group" role="group">', '</div>'); |
@@ -126,9 +130,9 @@ discard block |
||
126 | 130 | * @return HtmlButton |
127 | 131 | */ |
128 | 132 | public function getElement($index) { |
129 | - if (is_int($index)) |
|
130 | - return $this->elements[$index]; |
|
131 | - else { |
|
133 | + if (is_int($index)) { |
|
134 | + return $this->elements[$index]; |
|
135 | + } else { |
|
132 | 136 | $elm=$this->getElementById($index, $this->elements); |
133 | 137 | return $elm; |
134 | 138 | } |