@@ -7,51 +7,51 @@ discard block |
||
7 | 7 | public $data; |
8 | 8 | public function __construct() { |
9 | 9 | $this->name = get_class($this); |
10 | - $this->modules = []; |
|
10 | + $this->modules = []; |
|
11 | 11 | $this->files = []; |
12 | - $this->required = []; |
|
12 | + $this->required = []; |
|
13 | 13 | $this->data = []; |
14 | 14 | } |
15 | 15 | // abstract public function config(); |
16 | 16 | // abstract public function init(); |
17 | 17 | // abstract public function draw(); |
18 | 18 | public function getCss() { |
19 | - return $this->getRequire("getCss",".css"); |
|
19 | + return $this->getRequire("getCss", ".css"); |
|
20 | 20 | } |
21 | 21 | public function getJs() { |
22 | - return $this->getRequire("getJs",".js"); |
|
22 | + return $this->getRequire("getJs", ".js"); |
|
23 | 23 | } |
24 | 24 | public function getJsVariables() { |
25 | 25 | $temp = []; |
26 | 26 | foreach ($this->required as $i) |
27 | 27 | if (is_array($i)) |
28 | - array_push($temp,$i); |
|
28 | + array_push($temp, $i); |
|
29 | 29 | foreach ($this->modules as $i) |
30 | - $temp = array_merge( $temp, $i->getJsVariables() ); |
|
30 | + $temp = array_merge($temp, $i->getJsVariables()); |
|
31 | 31 | foreach ($this->files as $i) |
32 | 32 | if (is_array($i)) |
33 | - array_push($temp,$i); |
|
33 | + array_push($temp, $i); |
|
34 | 34 | return $temp; |
35 | 35 | } |
36 | - public function addModules( $_mods ) { |
|
36 | + public function addModules($_mods) { |
|
37 | 37 | foreach ($_mods as $value) |
38 | 38 | $this->addModule($value); |
39 | 39 | } |
40 | - public function addModule( $_mod ) { |
|
40 | + public function addModule($_mod) { |
|
41 | 41 | $this->modules[$_mod->name] = $_mod; |
42 | 42 | } |
43 | - public function addFiles( $_files ) { |
|
43 | + public function addFiles($_files) { |
|
44 | 44 | foreach ($_files as $value) |
45 | 45 | $this->addFile($value); |
46 | 46 | } |
47 | - public function addFile( $_file ) { |
|
47 | + public function addFile($_file) { |
|
48 | 48 | array_push($this->files, $_file); |
49 | 49 | } |
50 | - public function addFilesRequired( $_files ) { |
|
50 | + public function addFilesRequired($_files) { |
|
51 | 51 | foreach ($_files as $value) |
52 | 52 | $this->addFileRequired($value); |
53 | 53 | } |
54 | - public function addFileRequired( $_file ) { |
|
54 | + public function addFileRequired($_file) { |
|
55 | 55 | array_push($this->required, $_file); |
56 | 56 | } |
57 | 57 | protected function addDipendences() { |
@@ -59,16 +59,16 @@ discard block |
||
59 | 59 | $this->data["js"] = $this->getJs(); |
60 | 60 | $this->data["jsVariables"] = $this->getJsVariables(); |
61 | 61 | } |
62 | - protected function getRequire( $_function, $_extenction) { |
|
62 | + protected function getRequire($_function, $_extenction) { |
|
63 | 63 | $temp = []; |
64 | 64 | foreach ($this->required as $i) |
65 | 65 | if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
66 | - array_push($temp,$i); |
|
66 | + array_push($temp, $i); |
|
67 | 67 | foreach ($this->modules as $i) |
68 | - $temp = array_merge( $temp, $i->$_function() ); |
|
68 | + $temp = array_merge($temp, $i->$_function()); |
|
69 | 69 | foreach ($this->files as $i) |
70 | 70 | if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
71 | - array_push($temp,$i); |
|
71 | + array_push($temp, $i); |
|
72 | 72 | return $temp; |
73 | 73 | } |
74 | 74 | } |
@@ -23,33 +23,39 @@ discard block |
||
23 | 23 | } |
24 | 24 | public function getJsVariables() { |
25 | 25 | $temp = []; |
26 | - foreach ($this->required as $i) |
|
27 | - if (is_array($i)) |
|
26 | + foreach ($this->required as $i) { |
|
27 | + if (is_array($i)) |
|
28 | 28 | array_push($temp,$i); |
29 | - foreach ($this->modules as $i) |
|
30 | - $temp = array_merge( $temp, $i->getJsVariables() ); |
|
31 | - foreach ($this->files as $i) |
|
32 | - if (is_array($i)) |
|
29 | + } |
|
30 | + foreach ($this->modules as $i) { |
|
31 | + $temp = array_merge( $temp, $i->getJsVariables() ); |
|
32 | + } |
|
33 | + foreach ($this->files as $i) { |
|
34 | + if (is_array($i)) |
|
33 | 35 | array_push($temp,$i); |
36 | + } |
|
34 | 37 | return $temp; |
35 | 38 | } |
36 | 39 | public function addModules( $_mods ) { |
37 | - foreach ($_mods as $value) |
|
38 | - $this->addModule($value); |
|
40 | + foreach ($_mods as $value) { |
|
41 | + $this->addModule($value); |
|
42 | + } |
|
39 | 43 | } |
40 | 44 | public function addModule( $_mod ) { |
41 | 45 | $this->modules[$_mod->name] = $_mod; |
42 | 46 | } |
43 | 47 | public function addFiles( $_files ) { |
44 | - foreach ($_files as $value) |
|
45 | - $this->addFile($value); |
|
48 | + foreach ($_files as $value) { |
|
49 | + $this->addFile($value); |
|
50 | + } |
|
46 | 51 | } |
47 | 52 | public function addFile( $_file ) { |
48 | 53 | array_push($this->files, $_file); |
49 | 54 | } |
50 | 55 | public function addFilesRequired( $_files ) { |
51 | - foreach ($_files as $value) |
|
52 | - $this->addFileRequired($value); |
|
56 | + foreach ($_files as $value) { |
|
57 | + $this->addFileRequired($value); |
|
58 | + } |
|
53 | 59 | } |
54 | 60 | public function addFileRequired( $_file ) { |
55 | 61 | array_push($this->required, $_file); |
@@ -61,14 +67,17 @@ discard block |
||
61 | 67 | } |
62 | 68 | protected function getRequire( $_function, $_extenction) { |
63 | 69 | $temp = []; |
64 | - foreach ($this->required as $i) |
|
65 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
70 | + foreach ($this->required as $i) { |
|
71 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
66 | 72 | array_push($temp,$i); |
67 | - foreach ($this->modules as $i) |
|
68 | - $temp = array_merge( $temp, $i->$_function() ); |
|
69 | - foreach ($this->files as $i) |
|
70 | - if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
73 | + } |
|
74 | + foreach ($this->modules as $i) { |
|
75 | + $temp = array_merge( $temp, $i->$_function() ); |
|
76 | + } |
|
77 | + foreach ($this->files as $i) { |
|
78 | + if (!is_array($i) && strpos($i, $_extenction) !== FALSE) |
|
71 | 79 | array_push($temp,$i); |
80 | + } |
|
72 | 81 | return $temp; |
73 | 82 | } |
74 | 83 | } |