@@ -25,7 +25,7 @@ |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setDisabled($disable=true) { |
28 | - if($disable) |
|
28 | + if ($disable) |
|
29 | 29 | $this->addState(State::DISABLED); |
30 | 30 | return $this; |
31 | 31 | } |
@@ -25,8 +25,9 @@ |
||
25 | 25 | } |
26 | 26 | |
27 | 27 | public function setDisabled($disable=true) { |
28 | - if($disable) |
|
29 | - $this->addState(State::DISABLED); |
|
28 | + if($disable) { |
|
29 | + $this->addState(State::DISABLED); |
|
30 | + } |
|
30 | 31 | return $this; |
31 | 32 | } |
32 | 33 | } |
33 | 34 | \ No newline at end of file |
@@ -9,15 +9,15 @@ discard block |
||
9 | 9 | protected $image; |
10 | 10 | |
11 | 11 | public function __construct($identifier, $content=NULL) { |
12 | - parent::__construct($identifier,"item",$content); |
|
12 | + parent::__construct($identifier, "item", $content); |
|
13 | 13 | } |
14 | - protected function initContent($content){ |
|
15 | - if(\is_array($content)){ |
|
16 | - if(JArray::isAssociative($content)===false){ |
|
14 | + protected function initContent($content) { |
|
15 | + if (\is_array($content)) { |
|
16 | + if (JArray::isAssociative($content)===false) { |
|
17 | 17 | $icon=@$content[0]; |
18 | 18 | $title=@$content[1]; |
19 | 19 | $desc=@$content[2]; |
20 | - }else{ |
|
20 | + } else { |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $image=@$content["image"]; |
23 | 23 | $title=@$content["title"]; |
@@ -25,21 +25,21 @@ discard block |
||
25 | 25 | $desc=@$content["description"]; |
26 | 26 | $items=@$content["items"]; |
27 | 27 | } |
28 | - if(isset($icon)){ |
|
28 | + if (isset($icon)) { |
|
29 | 29 | $this->setIcon($icon); |
30 | 30 | } |
31 | - if(isset($image)){ |
|
31 | + if (isset($image)) { |
|
32 | 32 | $this->setImage($image); |
33 | 33 | } |
34 | - if(isset($title)){ |
|
35 | - $this->setTitle($title,$desc); |
|
36 | - }elseif (isset($header)){ |
|
37 | - $this->setTitle($header,$desc,"header"); |
|
34 | + if (isset($title)) { |
|
35 | + $this->setTitle($title, $desc); |
|
36 | + }elseif (isset($header)) { |
|
37 | + $this->setTitle($header, $desc, "header"); |
|
38 | 38 | } |
39 | - if(isset($items)){ |
|
39 | + if (isset($items)) { |
|
40 | 40 | $this->addList($items); |
41 | 41 | } |
42 | - }else{ |
|
42 | + } else { |
|
43 | 43 | $this->setContent($content); |
44 | 44 | } |
45 | 45 | } |
@@ -50,11 +50,11 @@ discard block |
||
50 | 50 | return $list; |
51 | 51 | } |
52 | 52 | |
53 | - public function getList(){ |
|
53 | + public function getList() { |
|
54 | 54 | return $this->content["list"]; |
55 | 55 | } |
56 | 56 | |
57 | - public function getItem($index){ |
|
57 | + public function getItem($index) { |
|
58 | 58 | return $this->getList()->getItem($index); |
59 | 59 | } |
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | $icon=@$content[0]; |
18 | 18 | $title=@$content[1]; |
19 | 19 | $desc=@$content[2]; |
20 | - }else{ |
|
20 | + } else{ |
|
21 | 21 | $icon=@$content["icon"]; |
22 | 22 | $image=@$content["image"]; |
23 | 23 | $title=@$content["title"]; |
@@ -33,13 +33,13 @@ discard block |
||
33 | 33 | } |
34 | 34 | if(isset($title)){ |
35 | 35 | $this->setTitle($title,$desc); |
36 | - }elseif (isset($header)){ |
|
36 | + } elseif (isset($header)){ |
|
37 | 37 | $this->setTitle($header,$desc,"header"); |
38 | 38 | } |
39 | 39 | if(isset($items)){ |
40 | 40 | $this->addList($items); |
41 | 41 | } |
42 | - }else{ |
|
42 | + } else{ |
|
43 | 43 | $this->setContent($content); |
44 | 44 | } |
45 | 45 | } |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | $output=$input; |
13 | 13 | } |
14 | 14 | if (\is_array($input)) { |
15 | - if (sizeof($input) > 0) { |
|
16 | - if (self::containsElement($input) === false) { |
|
15 | + if (sizeof($input)>0) { |
|
16 | + if (self::containsElement($input)===false) { |
|
17 | 17 | $output=self::wrapStrings($input, $js, $separator=' ', $valueQuote='"'); |
18 | 18 | } else { |
19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | - foreach ( $input as $v ) { |
|
27 | + foreach ($input as $v) { |
|
28 | 28 | if (\is_object($v) || \is_array($v)) |
29 | 29 | return true; |
30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public static function wrapStrings($input, $js, $separator=' ', $valueQuote='"') { |
35 | - if (JArray::isAssociative($input) === true) { |
|
36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
35 | + if (JArray::isAssociative($input)===true) { |
|
36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
38 | 38 | }, $input, array_keys($input))); |
39 | 39 | } else { |
40 | 40 | $result=implode($separator, array_values($input)); |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
47 | 47 | if (is_object($v)) |
48 | 48 | return $v->compile($js); |
49 | 49 | elseif (\is_array($v)) { |
@@ -25,8 +25,9 @@ discard block |
||
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | 27 | foreach ( $input as $v ) { |
28 | - if (\is_object($v) || \is_array($v)) |
|
29 | - return true; |
|
28 | + if (\is_object($v) || \is_array($v)) { |
|
29 | + return true; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | return false; |
32 | 33 | } |
@@ -44,12 +45,13 @@ discard block |
||
44 | 45 | |
45 | 46 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | 47 | return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
47 | - if (is_object($v)) |
|
48 | - return $v->compile($js); |
|
49 | - elseif (\is_array($v)) { |
|
48 | + if (is_object($v)) { |
|
49 | + return $v->compile($js); |
|
50 | + } elseif (\is_array($v)) { |
|
50 | 51 | return self::wrap($v, $js, $separator, $valueQuote); |
51 | - } else |
|
52 | - return $v; |
|
52 | + } else { |
|
53 | + return $v; |
|
54 | + } |
|
53 | 55 | }, $input)); |
54 | 56 | } |
55 | 57 | } |
56 | 58 | \ No newline at end of file |
@@ -61,9 +61,9 @@ discard block |
||
61 | 61 | if (\is_array($elements)) { |
62 | 62 | foreach ( $elements as $key => $element ) { |
63 | 63 | $iid=$this->getElementsCount()+1; |
64 | - if ($element instanceof HtmlDropdownItem) |
|
65 | - $this->elements []=$element; |
|
66 | - else if (\is_array($element)) { |
|
64 | + if ($element instanceof HtmlDropdownItem) { |
|
65 | + $this->elements []=$element; |
|
66 | + } else if (\is_array($element)) { |
|
67 | 67 | if (is_string($key)===true) { |
68 | 68 | $dropdown=new HtmlDropdown($this->identifier."-dropdown-".$iid); |
69 | 69 | $dropdown->addItems($element); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
90 | 90 | if($caption instanceof HtmlLink){ |
91 | 91 | $link=$caption; |
92 | - }else{ |
|
92 | + } else{ |
|
93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
94 | 94 | } |
95 | 95 | $li->setContent($link); |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | parent::__construct($identifier); |
28 | 28 | $this->tagName="ul"; |
29 | 29 | $this->_template='<%tagName% id="%identifier%" class="nav navbar-nav %class%">%elements%</%tagName%>'; |
30 | - $this->elements=array (); |
|
30 | + $this->elements=array(); |
|
31 | 31 | } |
32 | 32 | |
33 | 33 | public function setClass($value) { |
@@ -39,7 +39,7 @@ discard block |
||
39 | 39 | } |
40 | 40 | |
41 | 41 | public function addElement($element) { |
42 | - if($element instanceof HtmlLink){ |
|
42 | + if ($element instanceof HtmlLink) { |
|
43 | 43 | $this->addLink($element); |
44 | 44 | } else if (is_object($element)) { |
45 | 45 | $this->elements []=$element; |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | |
60 | 60 | public function addElements($elements) { |
61 | 61 | if (\is_array($elements)) { |
62 | - foreach ( $elements as $key => $element ) { |
|
62 | + foreach ($elements as $key => $element) { |
|
63 | 63 | $iid=$this->getElementsCount()+1; |
64 | 64 | if ($element instanceof HtmlDropdownItem) |
65 | 65 | $this->elements []=$element; |
@@ -87,9 +87,9 @@ discard block |
||
87 | 87 | public function addLink($caption, $href="#") { |
88 | 88 | $iid=$this->getElementsCount()+1; |
89 | 89 | $li=new HtmlBsDoubleElement($this->identifier."-li-".$iid, "li"); |
90 | - if($caption instanceof HtmlLink){ |
|
90 | + if ($caption instanceof HtmlLink) { |
|
91 | 91 | $link=$caption; |
92 | - }else{ |
|
92 | + } else { |
|
93 | 93 | $link=new HtmlLink($this->identifier."-link-".$iid, $href, $caption); |
94 | 94 | } |
95 | 95 | $li->setContent($link); |
@@ -122,7 +122,7 @@ discard block |
||
122 | 122 | } |
123 | 123 | |
124 | 124 | public function run(JsUtils $js) { |
125 | - foreach ( $this->elements as $element ) { |
|
125 | + foreach ($this->elements as $element) { |
|
126 | 126 | $element->run($js); |
127 | 127 | } |
128 | 128 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | * @param int $index |
144 | 144 | * @return BaseHtml |
145 | 145 | */ |
146 | - public function getElement($index){ |
|
146 | + public function getElement($index) { |
|
147 | 147 | return $this->elements[$index]; |
148 | 148 | } |
149 | 149 | } |
150 | 150 | \ No newline at end of file |
@@ -1,39 +1,39 @@ discard block |
||
1 | 1 | <?php |
2 | 2 | namespace Ajax\php\ci; |
3 | 3 | |
4 | -class JsUtils extends \Ajax\JsUtils{ |
|
4 | +class JsUtils extends \Ajax\JsUtils { |
|
5 | 5 | protected $ci; |
6 | - protected $_my_controller_paths= array(); |
|
7 | - protected $_my_controllers= array(); |
|
6 | + protected $_my_controller_paths=array(); |
|
7 | + protected $_my_controllers=array(); |
|
8 | 8 | |
9 | - public function __construct($params=array(),$injected=NULL){ |
|
10 | - parent::__construct($params,$injected); |
|
11 | - $this->_my_controller_paths = array(APPPATH); |
|
9 | + public function __construct($params=array(), $injected=NULL) { |
|
10 | + parent::__construct($params, $injected); |
|
11 | + $this->_my_controller_paths=array(APPPATH); |
|
12 | 12 | } |
13 | - public function getUrl($url){ |
|
13 | + public function getUrl($url) { |
|
14 | 14 | return site_url($url); |
15 | 15 | } |
16 | 16 | |
17 | - public function getCi(){ |
|
18 | - if(isset($this->ci)===false){ |
|
19 | - $this->ci =& get_instance(); |
|
17 | + public function getCi() { |
|
18 | + if (isset($this->ci)===false) { |
|
19 | + $this->ci=& get_instance(); |
|
20 | 20 | $this->ci->load->helper('url'); |
21 | 21 | } |
22 | 22 | return $this->ci; |
23 | 23 | } |
24 | 24 | |
25 | - public function addViewElement($identifier,$content,&$view){ |
|
26 | - if(\array_key_exists("q", $view)===false){ |
|
25 | + public function addViewElement($identifier, $content, &$view) { |
|
26 | + if (\array_key_exists("q", $view)===false) { |
|
27 | 27 | $view["q"]=array(); |
28 | 28 | } |
29 | 29 | $view["q"][$identifier]=$content; |
30 | 30 | } |
31 | 31 | |
32 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
32 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
33 | 33 | $view[$view_var]=$output; |
34 | 34 | } |
35 | 35 | |
36 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){ |
|
36 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) { |
|
37 | 37 | $ci=$this->getCi(); |
38 | 38 | $controllerName=strtolower($controllerName); |
39 | 39 | $this->controller($controllerName); |
@@ -44,64 +44,64 @@ discard block |
||
44 | 44 | return $result; |
45 | 45 | } |
46 | 46 | |
47 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
47 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
48 | 48 | return $initialControllerInstance->load->view($viewName, $params, true); |
49 | 49 | } |
50 | 50 | |
51 | - public function fromDispatcher($dispatcher){ |
|
51 | + public function fromDispatcher($dispatcher) { |
|
52 | 52 | return array_values($dispatcher->uri->segment_array()); |
53 | 53 | } |
54 | 54 | |
55 | - public function controller($controller, $name = '', $db_conn = FALSE){ |
|
56 | - if (\is_array($controller)){ |
|
57 | - foreach ($controller as $babe){ |
|
55 | + public function controller($controller, $name='', $db_conn=FALSE) { |
|
56 | + if (\is_array($controller)) { |
|
57 | + foreach ($controller as $babe) { |
|
58 | 58 | $this->controller($babe); |
59 | 59 | } |
60 | 60 | return; |
61 | 61 | } |
62 | - if ($controller == ''){ |
|
62 | + if ($controller=='') { |
|
63 | 63 | return; |
64 | 64 | } |
65 | - $path = ''; |
|
65 | + $path=''; |
|
66 | 66 | // Is the controller in a sub-folder? If so, parse out the filename and path. |
67 | - if (($last_slash = strrpos($controller, '/')) !== FALSE){ |
|
67 | + if (($last_slash=strrpos($controller, '/'))!==FALSE) { |
|
68 | 68 | // The path is in front of the last slash |
69 | - $path = substr($controller, 0, $last_slash + 1); |
|
69 | + $path=substr($controller, 0, $last_slash+1); |
|
70 | 70 | // And the controller name behind it |
71 | - $controller = substr($controller, $last_slash + 1); |
|
71 | + $controller=substr($controller, $last_slash+1); |
|
72 | 72 | } |
73 | 73 | |
74 | - if ($name == ''){ |
|
75 | - $name = $controller; |
|
74 | + if ($name=='') { |
|
75 | + $name=$controller; |
|
76 | 76 | } |
77 | 77 | |
78 | - if (in_array($name, $this->_my_controllers, TRUE)){ |
|
78 | + if (in_array($name, $this->_my_controllers, TRUE)) { |
|
79 | 79 | return; |
80 | 80 | } |
81 | 81 | |
82 | - $CI =$this->getCi(); |
|
83 | - if (isset($CI->$name)){ |
|
82 | + $CI=$this->getCi(); |
|
83 | + if (isset($CI->$name)) { |
|
84 | 84 | show_error('The controller name you are loading is the name of a resource that is already being used: '.$name); |
85 | 85 | } |
86 | - $controller = strtolower($controller); |
|
87 | - foreach ($this->_my_controller_paths as $mod_path){ |
|
88 | - if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){ |
|
86 | + $controller=strtolower($controller); |
|
87 | + foreach ($this->_my_controller_paths as $mod_path) { |
|
88 | + if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) { |
|
89 | 89 | continue; |
90 | 90 | } |
91 | - if ($db_conn !== FALSE AND ! class_exists('CI_DB')){ |
|
92 | - if ($db_conn === TRUE){ |
|
93 | - $db_conn = ''; |
|
91 | + if ($db_conn!==FALSE AND !class_exists('CI_DB')) { |
|
92 | + if ($db_conn===TRUE) { |
|
93 | + $db_conn=''; |
|
94 | 94 | } |
95 | 95 | $CI->load->database($db_conn, FALSE, TRUE); |
96 | 96 | } |
97 | - if ( ! class_exists('CI_Controller')){ |
|
97 | + if (!class_exists('CI_Controller')) { |
|
98 | 98 | load_class('Controller', 'core'); |
99 | 99 | } |
100 | 100 | require_once($mod_path.'controllers/'.$path.$controller.'.php'); |
101 | - $controller = ucfirst($controller); |
|
102 | - $CI->$name = new $controller(); |
|
101 | + $controller=ucfirst($controller); |
|
102 | + $CI->$name=new $controller(); |
|
103 | 103 | |
104 | - $this->_my_controllers[] = $name; |
|
104 | + $this->_my_controllers[]=$name; |
|
105 | 105 | return; |
106 | 106 | } |
107 | 107 | show_error('Unable to locate the controller you have specified: '.$controller); |
@@ -25,8 +25,8 @@ discard block |
||
25 | 25 | protected $_contentSeparator=""; |
26 | 26 | |
27 | 27 | |
28 | - public function __construct($identifier,$tagName,$baseClass){ |
|
29 | - parent::__construct($identifier,$tagName,$baseClass); |
|
28 | + public function __construct($identifier, $tagName, $baseClass) { |
|
29 | + parent::__construct($identifier, $tagName, $baseClass); |
|
30 | 30 | $this->root=""; |
31 | 31 | $this->attr="data-ajax"; |
32 | 32 | } |
@@ -36,11 +36,11 @@ discard block |
||
36 | 36 | * @param string $targetSelector the target of the get |
37 | 37 | * @return HtmlNavElement |
38 | 38 | */ |
39 | - public function autoGetOnClick($targetSelector){ |
|
40 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
39 | + public function autoGetOnClick($targetSelector) { |
|
40 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
41 | 41 | } |
42 | 42 | |
43 | - public function contentAsString(){ |
|
43 | + public function contentAsString() { |
|
44 | 44 | return JArray::implode($this->_contentSeparator, $this->content); |
45 | 45 | } |
46 | 46 | |
@@ -48,15 +48,15 @@ discard block |
||
48 | 48 | * Generate the jquery script to set the elements to the HtmlNavElement |
49 | 49 | * @param JsUtils $jsUtils |
50 | 50 | */ |
51 | - public function jsSetContent(JsUtils $jsUtils){ |
|
52 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
51 | + public function jsSetContent(JsUtils $jsUtils) { |
|
52 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
53 | 53 | } |
54 | 54 | |
55 | 55 | public function getRoot() { |
56 | 56 | return $this->root; |
57 | 57 | } |
58 | 58 | public function setRoot($root) { |
59 | - $this->root = $root; |
|
59 | + $this->root=$root; |
|
60 | 60 | return $this; |
61 | 61 | } |
62 | 62 | public function getAttr() { |
@@ -69,12 +69,12 @@ discard block |
||
69 | 69 | * @return HtmlNavElement |
70 | 70 | */ |
71 | 71 | public function setAttr($attr) { |
72 | - $this->attr = $attr; |
|
72 | + $this->attr=$attr; |
|
73 | 73 | return $this; |
74 | 74 | } |
75 | 75 | |
76 | 76 | public function __call($method, $args) { |
77 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
77 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
78 | 78 | return call_user_func_array( |
79 | 79 | $this->$method, |
80 | 80 | $args |
@@ -82,32 +82,32 @@ discard block |
||
82 | 82 | } |
83 | 83 | } |
84 | 84 | |
85 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher, $startIndex=0); |
|
85 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
86 | 86 | |
87 | 87 | |
88 | - public function setContentDivider($divider,$index=NULL) { |
|
88 | + public function setContentDivider($divider, $index=NULL) { |
|
89 | 89 | $divider="<div class='divider'> {$divider} </div>"; |
90 | 90 | return $this->setDivider($divider, $index); |
91 | 91 | } |
92 | 92 | |
93 | - public function setIconContentDivider($iconContentDivider,$index=NULL) { |
|
93 | + public function setIconContentDivider($iconContentDivider, $index=NULL) { |
|
94 | 94 | $contentDivider="<i class='".$iconContentDivider." icon divider'></i>"; |
95 | 95 | return $this->setDivider($contentDivider, $index); |
96 | 96 | } |
97 | 97 | |
98 | - protected function setDivider($divider,$index){ |
|
99 | - if(isset($index)){ |
|
100 | - if(!\is_array($this->_contentSeparator)) |
|
101 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
98 | + protected function setDivider($divider, $index) { |
|
99 | + if (isset($index)) { |
|
100 | + if (!\is_array($this->_contentSeparator)) |
|
101 | + $this->_contentSeparator=array_fill(0, $this->count()-1, $this->_contentSeparator); |
|
102 | 102 | $this->_contentSeparator[$index]=$divider; |
103 | - }else{ |
|
103 | + } else { |
|
104 | 104 | $this->_contentSeparator=$divider; |
105 | 105 | } |
106 | 106 | return $this; |
107 | 107 | } |
108 | 108 | |
109 | - protected function getContentDivider($index){ |
|
110 | - if(\is_array($this->_contentSeparator)){ |
|
109 | + protected function getContentDivider($index) { |
|
110 | + if (\is_array($this->_contentSeparator)) { |
|
111 | 111 | return @$this->_contentSeparator[$index]; |
112 | 112 | } |
113 | 113 | return $this->_contentSeparator; |
@@ -97,10 +97,11 @@ |
||
97 | 97 | |
98 | 98 | protected function setDivider($divider,$index){ |
99 | 99 | if(isset($index)){ |
100 | - if(!\is_array($this->_contentSeparator)) |
|
101 | - $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
100 | + if(!\is_array($this->_contentSeparator)) { |
|
101 | + $this->_contentSeparator=array_fill (0, $this->count()-1,$this->_contentSeparator); |
|
102 | + } |
|
102 | 103 | $this->_contentSeparator[$index]=$divider; |
103 | - }else{ |
|
104 | + } else{ |
|
104 | 105 | $this->_contentSeparator=$divider; |
105 | 106 | } |
106 | 107 | return $this; |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | $state=\explode(" ", $state); |
14 | 14 | } |
15 | 15 | if (\is_array($elements)) { |
16 | - foreach ( $elements as $element ) { |
|
16 | + foreach ($elements as $element) { |
|
17 | 17 | if ($element instanceof BaseHtml) { |
18 | 18 | self::_add($state, $element); |
19 | 19 | } |
@@ -22,8 +22,8 @@ discard block |
||
22 | 22 | } |
23 | 23 | |
24 | 24 | private static function _add($states, $element) { |
25 | - foreach ( $states as $state ) { |
|
26 | - $element->addToPropertyCtrl("class", $state, array ($state )); |
|
25 | + foreach ($states as $state) { |
|
26 | + $element->addToPropertyCtrl("class", $state, array($state)); |
|
27 | 27 | } |
28 | 28 | } |
29 | 29 | } |
30 | 30 | \ No newline at end of file |
@@ -8,34 +8,34 @@ discard block |
||
8 | 8 | private $page_count; |
9 | 9 | private $pages_visibles; |
10 | 10 | |
11 | - public function __construct($items_per_page=10,$pages_visibles=4,$page=1){ |
|
11 | + public function __construct($items_per_page=10, $pages_visibles=4, $page=1) { |
|
12 | 12 | $this->items_per_page=$items_per_page; |
13 | 13 | $this->page=$page; |
14 | 14 | $this->pages_visibles=$pages_visibles; |
15 | 15 | $this->visible=true; |
16 | 16 | } |
17 | 17 | |
18 | - public function getObjects($objects){ |
|
19 | - $offset = ($this->page - 1) * $this->items_per_page; |
|
18 | + public function getObjects($objects) { |
|
19 | + $offset=($this->page-1)*$this->items_per_page; |
|
20 | 20 | $os=$objects; |
21 | - if(!\is_array($os)){ |
|
21 | + if (!\is_array($os)) { |
|
22 | 22 | $os=[]; |
23 | - foreach ($objects as $o){ |
|
23 | + foreach ($objects as $o) { |
|
24 | 24 | $os[]=$o; |
25 | 25 | } |
26 | 26 | } |
27 | - $this->page_count = 0; |
|
27 | + $this->page_count=0; |
|
28 | 28 | $row_count=\sizeof($os); |
29 | - if (0 === $row_count) { |
|
29 | + if (0===$row_count) { |
|
30 | 30 | $this->visible=false; |
31 | 31 | } else { |
32 | 32 | $this->visible=true; |
33 | - $this->page_count = (int)ceil($row_count / $this->items_per_page); |
|
34 | - if($this->page > $this->page_count+1) { |
|
35 | - $this->page = 1; |
|
33 | + $this->page_count=(int)ceil($row_count/$this->items_per_page); |
|
34 | + if ($this->page>$this->page_count+1) { |
|
35 | + $this->page=1; |
|
36 | 36 | } |
37 | 37 | } |
38 | - return array_slice($os, $offset,$this->items_per_page); |
|
38 | + return array_slice($os, $offset, $this->items_per_page); |
|
39 | 39 | } |
40 | 40 | |
41 | 41 | public function getItemsPerPage() { |
@@ -69,14 +69,14 @@ discard block |
||
69 | 69 | return $this->page_count; |
70 | 70 | } |
71 | 71 | |
72 | - public function getPagesNumbers(){ |
|
73 | - $middle= (int)ceil(($this->pages_visibles-1)/ 2); |
|
72 | + public function getPagesNumbers() { |
|
73 | + $middle=(int)ceil(($this->pages_visibles-1)/2); |
|
74 | 74 | $first=$this->page-$middle; |
75 | - if($first<1){ |
|
75 | + if ($first<1) { |
|
76 | 76 | $first=1; |
77 | 77 | } |
78 | 78 | $last=$first+$this->pages_visibles-1; |
79 | - if($last>$this->page_count){ |
|
79 | + if ($last>$this->page_count) { |
|
80 | 80 | $last=$this->page_count; |
81 | 81 | } |
82 | 82 | return \range($first, $last); |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | protected $attr; |
20 | 20 | |
21 | 21 | |
22 | - public function __construct($identifier,$tagName){ |
|
23 | - parent::__construct($identifier,$tagName); |
|
22 | + public function __construct($identifier, $tagName) { |
|
23 | + parent::__construct($identifier, $tagName); |
|
24 | 24 | $this->root=""; |
25 | 25 | $this->attr="data-ajax"; |
26 | 26 | } |
@@ -31,11 +31,11 @@ discard block |
||
31 | 31 | * @param string $targetSelector the target of the get |
32 | 32 | * @return HtmlNavElement |
33 | 33 | */ |
34 | - public function autoGetOnClick($targetSelector){ |
|
35 | - return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr)); |
|
34 | + public function autoGetOnClick($targetSelector) { |
|
35 | + return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr)); |
|
36 | 36 | } |
37 | 37 | |
38 | - public function contentAsString(){ |
|
38 | + public function contentAsString() { |
|
39 | 39 | return implode("", $this->content); |
40 | 40 | } |
41 | 41 | |
@@ -43,15 +43,15 @@ discard block |
||
43 | 43 | * Generate the jquery script to set the elements to the HtmlNavElement |
44 | 44 | * @param JsUtils $jsUtils |
45 | 45 | */ |
46 | - public function jsSetContent(JsUtils $jsUtils){ |
|
47 | - $jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true); |
|
46 | + public function jsSetContent(JsUtils $jsUtils) { |
|
47 | + $jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | public function getRoot() { |
51 | 51 | return $this->root; |
52 | 52 | } |
53 | 53 | public function setRoot($root) { |
54 | - $this->root = $root; |
|
54 | + $this->root=$root; |
|
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | public function getAttr() { |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | * @return HtmlNavElement |
65 | 65 | */ |
66 | 66 | public function setAttr($attr) { |
67 | - $this->attr = $attr; |
|
67 | + $this->attr=$attr; |
|
68 | 68 | return $this; |
69 | 69 | } |
70 | 70 | |
71 | 71 | public function __call($method, $args) { |
72 | - if(isset($this->$method) && is_callable($this->$method)) { |
|
72 | + if (isset($this->$method) && is_callable($this->$method)) { |
|
73 | 73 | return call_user_func_array( |
74 | 74 | $this->$method, |
75 | 75 | $args |
@@ -77,6 +77,6 @@ discard block |
||
77 | 77 | } |
78 | 78 | } |
79 | 79 | |
80 | - abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0); |
|
80 | + abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0); |
|
81 | 81 | |
82 | 82 | } |
83 | 83 | \ No newline at end of file |