@@ -123,8 +123,9 @@ |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | public function run(JsUtils $js){ |
126 | - if(JString::isNotNull($this->_identifier)) |
|
127 | - $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
126 | + if(JString::isNotNull($this->_identifier)) { |
|
127 | + $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
128 | + } |
|
128 | 129 | parent::run($js); |
129 | 130 | } |
130 | 131 | } |
@@ -22,72 +22,72 @@ discard block |
||
22 | 22 | protected $_colWidths; |
23 | 23 | |
24 | 24 | public function __construct($identifier, $modelInstance=NULL) { |
25 | - parent::__construct($identifier, null,$modelInstance); |
|
26 | - $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
25 | + parent::__construct($identifier, null, $modelInstance); |
|
26 | + $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false); |
|
27 | 27 | $this->content["table"]->setDefinition()->addClass("_element"); |
28 | 28 | } |
29 | 29 | |
30 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
31 | - if(!$this->_generated){ |
|
30 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
31 | + if (!$this->_generated) { |
|
32 | 32 | $this->_instanceViewer->setInstance($this->_modelInstance); |
33 | 33 | |
34 | 34 | $table=$this->content["table"]; |
35 | 35 | $this->_generateContent($table); |
36 | 36 | |
37 | - if(isset($this->_toolbar)){ |
|
37 | + if (isset($this->_toolbar)) { |
|
38 | 38 | $this->_setToolbarPosition($table); |
39 | 39 | } |
40 | - if(isset($this->_colWidths)){ |
|
40 | + if (isset($this->_colWidths)) { |
|
41 | 41 | $this->_applyStyleAttributes($table); |
42 | 42 | } |
43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
44 | 44 | $this->_compileForm(); |
45 | 45 | $this->_generated=true; |
46 | 46 | } |
47 | - return parent::compile($js,$view); |
|
47 | + return parent::compile($js, $view); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | 51 | * @param HtmlTable $table |
52 | 52 | */ |
53 | - protected function _generateContent($table){ |
|
54 | - $values= $this->_instanceViewer->getValues(); |
|
53 | + protected function _generateContent($table) { |
|
54 | + $values=$this->_instanceViewer->getValues(); |
|
55 | 55 | $captions=$this->_instanceViewer->getCaptions(); |
56 | 56 | $fields=$this->_instanceViewer->getVisibleProperties(); |
57 | 57 | $count=$this->_instanceViewer->count(); |
58 | 58 | $this->setProperty("data-ajax", $this->_instanceViewer->getIdentifier()); |
59 | - for($i=0;$i<$count;$i++){ |
|
60 | - $row=$table->addRow([$captions[$i],$values[$i]]); |
|
59 | + for ($i=0; $i<$count; $i++) { |
|
60 | + $row=$table->addRow([$captions[$i], $values[$i]]); |
|
61 | 61 | $row->getItem(1)->setProperty("data-field", $fields[$i]); |
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - public function getFieldValue($index){ |
|
66 | - if(is_string($index)){ |
|
65 | + public function getFieldValue($index) { |
|
66 | + if (is_string($index)) { |
|
67 | 67 | $fields=$this->_instanceViewer->getVisibleProperties(); |
68 | 68 | $index=array_search($index, $fields); |
69 | 69 | } |
70 | - if(is_numeric($index)){ |
|
71 | - $values= $this->_instanceViewer->getValues(); |
|
72 | - if(isset($values[$index])){ |
|
70 | + if (is_numeric($index)) { |
|
71 | + $values=$this->_instanceViewer->getValues(); |
|
72 | + if (isset($values[$index])) { |
|
73 | 73 | return $values[$index]; |
74 | 74 | } |
75 | 75 | } |
76 | 76 | return null; |
77 | 77 | } |
78 | 78 | |
79 | - protected function _applyStyleAttributes(HtmlTable $table){ |
|
79 | + protected function _applyStyleAttributes(HtmlTable $table) { |
|
80 | 80 | $table->setColWidths($this->_colWidths); |
81 | 81 | } |
82 | - protected function _getFieldName($index){ |
|
82 | + protected function _getFieldName($index) { |
|
83 | 83 | return $this->_instanceViewer->getFieldName($index); |
84 | 84 | } |
85 | 85 | |
86 | - protected function _getFieldCaption($index){ |
|
86 | + protected function _getFieldCaption($index) { |
|
87 | 87 | return null; |
88 | 88 | } |
89 | 89 | |
90 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
90 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
91 | 91 | return $this->identifier."-{$prefix}-".$name; |
92 | 92 | } |
93 | 93 | |
@@ -119,11 +119,11 @@ discard block |
||
119 | 119 | return $this; |
120 | 120 | } |
121 | 121 | |
122 | - public function asForm(){ |
|
122 | + public function asForm() { |
|
123 | 123 | return $this->getForm(); |
124 | 124 | } |
125 | 125 | |
126 | - public function setColCaptionWidth($width){ |
|
126 | + public function setColCaptionWidth($width) { |
|
127 | 127 | $this->_colWidths[0]=$width; |
128 | 128 | return $this; |
129 | 129 | } |
@@ -133,13 +133,13 @@ discard block |
||
133 | 133 | return $this; |
134 | 134 | } |
135 | 135 | |
136 | - public function setColWidths($widths){ |
|
136 | + public function setColWidths($widths) { |
|
137 | 137 | $this->_colWidths=$widths; |
138 | 138 | return $this; |
139 | 139 | } |
140 | 140 | |
141 | - public function run(JsUtils $js){ |
|
142 | - if(JString::isNotNull($this->_identifier)) |
|
141 | + public function run(JsUtils $js) { |
|
142 | + if (JString::isNotNull($this->_identifier)) |
|
143 | 143 | $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
144 | 144 | parent::run($js); |
145 | 145 | } |
@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | namespace Ajax\common\traits; |
3 | 3 | use Ajax\common\BaseGui; |
4 | 4 | |
5 | -trait JsUtilsInternalTrait{ |
|
5 | +trait JsUtilsInternalTrait { |
|
6 | 6 | |
7 | - protected $jquery_code_for_compile=array (); |
|
8 | - protected $jquery_code_for_compile_at_last=array (); |
|
7 | + protected $jquery_code_for_compile=array(); |
|
8 | + protected $jquery_code_for_compile_at_last=array(); |
|
9 | 9 | |
10 | 10 | protected function _addToCompile($jsScript) { |
11 | 11 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -15,29 +15,29 @@ discard block |
||
15 | 15 | * @param BaseGui $library |
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | - protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
|
19 | - if(isset($view)) |
|
18 | + protected function _compileLibrary(BaseGui $library, &$view=NULL) { |
|
19 | + if (isset($view)) |
|
20 | 20 | $library->compileHtml($this, $view); |
21 | 21 | if ($library->isAutoCompile()) { |
22 | 22 | $library->compile(true); |
23 | 23 | } |
24 | 24 | } |
25 | 25 | |
26 | - protected function defer($script){ |
|
26 | + protected function defer($script) { |
|
27 | 27 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
28 | 28 | $result.="window.defer(function(){".$script."})"; |
29 | 29 | return $result; |
30 | 30 | } |
31 | 31 | |
32 | - protected function ready($script){ |
|
32 | + protected function ready($script) { |
|
33 | 33 | $result='$(document).ready(function() {'."\n"; |
34 | 34 | $result.=$script.'})'; |
35 | 35 | return $result; |
36 | 36 | } |
37 | 37 | |
38 | 38 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | - $input= preg_replace( |
|
39 | + if (trim($input)==="") return $input; |
|
40 | + $input=preg_replace( |
|
41 | 41 | array( |
42 | 42 | // Remove comment(s) |
43 | 43 | '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#', |
@@ -16,8 +16,9 @@ discard block |
||
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | 18 | protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
19 | - if(isset($view)) |
|
20 | - $library->compileHtml($this, $view); |
|
19 | + if(isset($view)) { |
|
20 | + $library->compileHtml($this, $view); |
|
21 | + } |
|
21 | 22 | if ($library->isAutoCompile()) { |
22 | 23 | $library->compile(true); |
23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
36 | 37 | } |
37 | 38 | |
38 | 39 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | + if(trim($input) === "") { |
|
41 | + return $input; |
|
42 | + } |
|
40 | 43 | $input= preg_replace( |
41 | 44 | array( |
42 | 45 | // Remove comment(s) |
@@ -10,12 +10,12 @@ |
||
10 | 10 | * @author jc |
11 | 11 | * |
12 | 12 | */ |
13 | -class Visibility extends SimpleSemExtComponent{ |
|
13 | +class Visibility extends SimpleSemExtComponent { |
|
14 | 14 | |
15 | 15 | public function __construct(JsUtils $js) { |
16 | 16 | parent::__construct($js); |
17 | 17 | $this->uiName="visibility"; |
18 | - $this->params=["once"=>false,"observeChanges"=>true]; |
|
18 | + $this->params=["once"=>false, "observeChanges"=>true]; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function setOnce($value=false) { |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | * @param string $event |
22 | 22 | * @param boolean $multiple |
23 | 23 | */ |
24 | - public function __construct($table,$class="active",$event="click",$multiple=false){ |
|
24 | + public function __construct($table, $class="active", $event="click", $multiple=false) { |
|
25 | 25 | $this->table=$table; |
26 | 26 | $this->class=$class; |
27 | 27 | $this->event=$event; |
@@ -55,12 +55,12 @@ discard block |
||
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
58 | - public function run(){ |
|
58 | + public function run() { |
|
59 | 59 | $multiple=""; |
60 | - if(!$this->multiple){ |
|
60 | + if (!$this->multiple) { |
|
61 | 61 | $multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');"; |
62 | 62 | } |
63 | - $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false); |
|
63 | + $this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false); |
|
64 | 64 | } |
65 | 65 | |
66 | 66 | } |
@@ -6,32 +6,32 @@ discard block |
||
6 | 6 | |
7 | 7 | use Ajax\semantic\html\elements\HtmlIcon; |
8 | 8 | |
9 | -class HtmlPaginationMenu extends HtmlMenu{ |
|
9 | +class HtmlPaginationMenu extends HtmlMenu { |
|
10 | 10 | private $_page; |
11 | 11 | private $_pages; |
12 | 12 | private $_max; |
13 | - public function __construct( $identifier, $items=array() ){ |
|
14 | - parent::__construct( $identifier,$items); |
|
13 | + public function __construct($identifier, $items=array()) { |
|
14 | + parent::__construct($identifier, $items); |
|
15 | 15 | $this->_pages=$items; |
16 | 16 | } |
17 | 17 | /** |
18 | 18 | * {@inheritDoc} |
19 | 19 | * @see \Ajax\common\html\BaseHtml::compile() |
20 | 20 | */ |
21 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
21 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
22 | 22 | $max=$this->_max; |
23 | - if(!$this->_compiled){ |
|
24 | - foreach ($this->content as $item){ |
|
23 | + if (!$this->_compiled) { |
|
24 | + foreach ($this->content as $item) { |
|
25 | 25 | $item->addClass("pageNum"); |
26 | 26 | } |
27 | - $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active"); |
|
28 | - $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active"); |
|
27 | + $this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active"); |
|
28 | + $this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active"); |
|
29 | 29 | $this->asPagination(); |
30 | 30 | } |
31 | - return parent::compile($js,$view); |
|
31 | + return parent::compile($js, $view); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function setActivePage($page){ |
|
34 | + public function setActivePage($page) { |
|
35 | 35 | $index=$page-$this->_pages[0]; |
36 | 36 | $this->setActiveItem($index); |
37 | 37 | $this->_page=$page; |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | * @param mixed $_max |
46 | 46 | */ |
47 | 47 | public function setMax($_max) { |
48 | - $this->_max = $_max; |
|
48 | + $this->_max=$_max; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | foreach ($items as $k=>$v){ |
25 | 25 | $this->addItem([$k,$v]); |
26 | 26 | } |
27 | - }else{ |
|
27 | + } else{ |
|
28 | 28 | foreach ($items as $item){ |
29 | 29 | $this->addItem($item); |
30 | 30 | } |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
84 | - return $this->content[$index]; |
|
85 | - else { |
|
83 | + if (is_int($index)&& isset($this->content[$index])) { |
|
84 | + return $this->content[$index]; |
|
85 | + } else { |
|
86 | 86 | $elm=$this->getElementById($index, $this->content); |
87 | 87 | return $elm; |
88 | 88 | } |
@@ -144,10 +144,11 @@ discard block |
||
144 | 144 | $i=0; |
145 | 145 | foreach ($properties as $k=>$v){ |
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
149 | - else |
|
150 | - return $this; |
|
147 | + if(isset($c)) { |
|
148 | + $c->setProperty($k,$v); |
|
149 | + } else { |
|
150 | + return $this; |
|
151 | + } |
|
151 | 152 | } |
152 | 153 | return $this; |
153 | 154 | } |
@@ -165,8 +166,7 @@ discard block |
||
165 | 166 | foreach ($values as $i=>$value){ |
166 | 167 | if(isset($this->content[$i])){ |
167 | 168 | $this->content[$i]->setProperty($property,$value); |
168 | - } |
|
169 | - else{ |
|
169 | + } else{ |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -186,8 +186,7 @@ discard block |
||
186 | 186 | foreach ($values as $i=>$value){ |
187 | 187 | if(isset($this->content[$i])){ |
188 | 188 | $this->content[$i++]->addToProperty($property,$value); |
189 | - } |
|
190 | - else{ |
|
189 | + } else{ |
|
191 | 190 | return $this; |
192 | 191 | } |
193 | 192 | } |
@@ -216,8 +215,9 @@ discard block |
||
216 | 215 | foreach ( $this->content as $index=>$item ) { |
217 | 216 | if($item instanceof HtmlDoubleElement){ |
218 | 217 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
220 | - $href=$hrefs[$index]; |
|
218 | + if(isset($hrefs[$index])) { |
|
219 | + $href=$hrefs[$index]; |
|
220 | + } |
|
221 | 221 | $item->asLink($href,$target); |
222 | 222 | } |
223 | 223 | } |
@@ -14,44 +14,44 @@ discard block |
||
14 | 14 | */ |
15 | 15 | abstract class HtmlCollection extends HtmlDoubleElement { |
16 | 16 | |
17 | - public function __construct($identifier,$tagName="div"){ |
|
18 | - parent::__construct($identifier,$tagName); |
|
17 | + public function __construct($identifier, $tagName="div") { |
|
18 | + parent::__construct($identifier, $tagName); |
|
19 | 19 | $this->content=array(); |
20 | 20 | } |
21 | 21 | |
22 | - public function addItems($items){ |
|
23 | - if(JArray::isAssociative($items)){ |
|
24 | - foreach ($items as $k=>$v){ |
|
25 | - $this->addItem([$k,$v]); |
|
22 | + public function addItems($items) { |
|
23 | + if (JArray::isAssociative($items)) { |
|
24 | + foreach ($items as $k=>$v) { |
|
25 | + $this->addItem([$k, $v]); |
|
26 | 26 | } |
27 | - }else{ |
|
28 | - foreach ($items as $item){ |
|
27 | + } else { |
|
28 | + foreach ($items as $item) { |
|
29 | 29 | $this->addItem($item); |
30 | 30 | } |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function setItems($items){ |
|
35 | + public function setItems($items) { |
|
36 | 36 | $this->content=$items; |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function getItems(){ |
|
40 | + public function getItems() { |
|
41 | 41 | return $this->content; |
42 | 42 | } |
43 | 43 | |
44 | - protected function getItemToAdd($item){ |
|
44 | + protected function getItemToAdd($item) { |
|
45 | 45 | $itemO=$item; |
46 | - if($this->createCondition($item)===true){ |
|
46 | + if ($this->createCondition($item)===true) { |
|
47 | 47 | $itemO=$this->createItem($item); |
48 | 48 | } |
49 | 49 | return $itemO; |
50 | 50 | } |
51 | 51 | |
52 | - protected function setItemIdentifier($item,$classname,$index){ |
|
53 | - if($item instanceof BaseWidget){ |
|
54 | - if(JString::isNull($item->getIdentifier())){ |
|
52 | + protected function setItemIdentifier($item, $classname, $index) { |
|
53 | + if ($item instanceof BaseWidget) { |
|
54 | + if (JString::isNull($item->getIdentifier())) { |
|
55 | 55 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
56 | 56 | } |
57 | 57 | } |
@@ -62,15 +62,15 @@ discard block |
||
62 | 62 | * @param HtmlDoubleElement|string|array $item |
63 | 63 | * @return \Ajax\common\html\HtmlDoubleElement |
64 | 64 | */ |
65 | - public function addItem($item){ |
|
65 | + public function addItem($item) { |
|
66 | 66 | $itemO=$this->getItemToAdd($item); |
67 | 67 | $this->addContent($itemO); |
68 | 68 | return $itemO; |
69 | 69 | } |
70 | 70 | |
71 | - public function insertItem($item,$position=0){ |
|
71 | + public function insertItem($item, $position=0) { |
|
72 | 72 | $itemO=$this->getItemToAdd($item); |
73 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
73 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
74 | 74 | return $itemO; |
75 | 75 | } |
76 | 76 | |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | * @return \Ajax\common\html\HtmlDoubleElement |
81 | 81 | */ |
82 | 82 | public function getItem($index) { |
83 | - if (is_int($index)&& isset($this->content[$index])) |
|
83 | + if (is_int($index) && isset($this->content[$index])) |
|
84 | 84 | return $this->content[$index]; |
85 | 85 | else { |
86 | 86 | $elm=$this->getElementById($index, $this->content); |
@@ -93,11 +93,11 @@ discard block |
||
93 | 93 | return $this; |
94 | 94 | } |
95 | 95 | |
96 | - public function removeItem($index){ |
|
96 | + public function removeItem($index) { |
|
97 | 97 | return array_splice($this->content, $index, 1); |
98 | 98 | } |
99 | 99 | |
100 | - public function count(){ |
|
100 | + public function count() { |
|
101 | 101 | return \sizeof($this->content); |
102 | 102 | } |
103 | 103 | |
@@ -108,8 +108,8 @@ discard block |
||
108 | 108 | return $this->addItem($function($object)); |
109 | 109 | } |
110 | 110 | |
111 | - public function apply($callBack){ |
|
112 | - foreach ($this->content as $item){ |
|
111 | + public function apply($callBack) { |
|
112 | + foreach ($this->content as $item) { |
|
113 | 113 | $callBack($item); |
114 | 114 | } |
115 | 115 | return $this; |
@@ -129,23 +129,23 @@ discard block |
||
129 | 129 | */ |
130 | 130 | abstract protected function createItem($value); |
131 | 131 | |
132 | - protected function createCondition($value){ |
|
132 | + protected function createCondition($value) { |
|
133 | 133 | return !($value instanceof BaseHtml); |
134 | 134 | } |
135 | 135 | |
136 | - protected function contentAs($tagName){ |
|
137 | - foreach ($this->content as $item){ |
|
136 | + protected function contentAs($tagName) { |
|
137 | + foreach ($this->content as $item) { |
|
138 | 138 | $item->setTagName($tagName); |
139 | 139 | } |
140 | 140 | return $this; |
141 | 141 | } |
142 | 142 | |
143 | - public function setProperties($properties){ |
|
143 | + public function setProperties($properties) { |
|
144 | 144 | $i=0; |
145 | - foreach ($properties as $k=>$v){ |
|
145 | + foreach ($properties as $k=>$v) { |
|
146 | 146 | $c=$this->content[$i++]; |
147 | - if(isset($c)) |
|
148 | - $c->setProperty($k,$v); |
|
147 | + if (isset($c)) |
|
148 | + $c->setProperty($k, $v); |
|
149 | 149 | else |
150 | 150 | return $this; |
151 | 151 | } |
@@ -158,15 +158,15 @@ discard block |
||
158 | 158 | * @param array|mixed $values |
159 | 159 | * @return $this |
160 | 160 | */ |
161 | - public function setPropertyValues($property,$values){ |
|
162 | - if(\is_array($values)===false){ |
|
163 | - $values=\array_fill(0, $this->count(),$values); |
|
161 | + public function setPropertyValues($property, $values) { |
|
162 | + if (\is_array($values)===false) { |
|
163 | + $values=\array_fill(0, $this->count(), $values); |
|
164 | 164 | } |
165 | - foreach ($values as $i=>$value){ |
|
166 | - if(isset($this->content[$i])){ |
|
167 | - $this->content[$i]->setProperty($property,$value); |
|
165 | + foreach ($values as $i=>$value) { |
|
166 | + if (isset($this->content[$i])) { |
|
167 | + $this->content[$i]->setProperty($property, $value); |
|
168 | 168 | } |
169 | - else{ |
|
169 | + else { |
|
170 | 170 | return $this; |
171 | 171 | } |
172 | 172 | } |
@@ -179,15 +179,15 @@ discard block |
||
179 | 179 | * @param array|mixed $values |
180 | 180 | * @return $this |
181 | 181 | */ |
182 | - public function addPropertyValues($property,$values){ |
|
183 | - if(\is_array($values)===false){ |
|
184 | - $values=\array_fill(0, $this->count(),$values); |
|
182 | + public function addPropertyValues($property, $values) { |
|
183 | + if (\is_array($values)===false) { |
|
184 | + $values=\array_fill(0, $this->count(), $values); |
|
185 | 185 | } |
186 | - foreach ($values as $i=>$value){ |
|
187 | - if(isset($this->content[$i])){ |
|
188 | - $this->content[$i++]->addToProperty($property,$value); |
|
186 | + foreach ($values as $i=>$value) { |
|
187 | + if (isset($this->content[$i])) { |
|
188 | + $this->content[$i++]->addToProperty($property, $value); |
|
189 | 189 | } |
190 | - else{ |
|
190 | + else { |
|
191 | 191 | return $this; |
192 | 192 | } |
193 | 193 | } |
@@ -197,13 +197,13 @@ discard block |
||
197 | 197 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
198 | 198 | $index=0; |
199 | 199 | $classname=\strtolower(JReflection::shortClassName($this)); |
200 | - foreach ($this->content as $item){ |
|
201 | - $this->setItemIdentifier($item,$classname,$index++); |
|
200 | + foreach ($this->content as $item) { |
|
201 | + $this->setItemIdentifier($item, $classname, $index++); |
|
202 | 202 | } |
203 | - return parent::compile($js,$view); |
|
203 | + return parent::compile($js, $view); |
|
204 | 204 | } |
205 | 205 | |
206 | - public function getItemById($identifier){ |
|
206 | + public function getItemById($identifier) { |
|
207 | 207 | return $this->getElementById($identifier, $this->content); |
208 | 208 | } |
209 | 209 | |
@@ -212,13 +212,13 @@ discard block |
||
212 | 212 | * @param string $target |
213 | 213 | * @return HtmlCollection |
214 | 214 | */ |
215 | - public function asLinks($hrefs=[],$target=NUll) { |
|
216 | - foreach ( $this->content as $index=>$item ) { |
|
217 | - if($item instanceof HtmlDoubleElement){ |
|
215 | + public function asLinks($hrefs=[], $target=NUll) { |
|
216 | + foreach ($this->content as $index=>$item) { |
|
217 | + if ($item instanceof HtmlDoubleElement) { |
|
218 | 218 | $href=""; |
219 | - if(isset($hrefs[$index])) |
|
219 | + if (isset($hrefs[$index])) |
|
220 | 220 | $href=$hrefs[$index]; |
221 | - $item->asLink($href,$target); |
|
221 | + $item->asLink($href, $target); |
|
222 | 222 | } |
223 | 223 | } |
224 | 224 | return $this; |
@@ -230,8 +230,8 @@ discard block |
||
230 | 230 | * @param int $length If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. |
231 | 231 | * @return $this |
232 | 232 | */ |
233 | - public function splice($offset,$length=null){ |
|
234 | - $this->content=array_slice($this->content, $offset,$length); |
|
233 | + public function splice($offset, $length=null) { |
|
234 | + $this->content=array_slice($this->content, $offset, $length); |
|
235 | 235 | return $this; |
236 | 236 | } |
237 | 237 | } |
@@ -8,12 +8,12 @@ discard block |
||
8 | 8 | * @author jc |
9 | 9 | * @property BaseWidget $_self |
10 | 10 | */ |
11 | -trait BaseHtmlPropertiesTrait{ |
|
11 | +trait BaseHtmlPropertiesTrait { |
|
12 | 12 | |
13 | - protected $properties=array (); |
|
13 | + protected $properties=array(); |
|
14 | 14 | abstract protected function ctrl($name, $value, $typeCtrl); |
15 | 15 | abstract protected function removeOldValues(&$oldValue, $allValues); |
16 | - abstract protected function _getElementBy($callback,$elements); |
|
16 | + abstract protected function _getElementBy($callback, $elements); |
|
17 | 17 | public function getProperties() { |
18 | 18 | return $this->_self->properties; |
19 | 19 | } |
@@ -45,14 +45,14 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function addToProperty($name, $value, $separator=" ") { |
47 | 47 | if (\is_array($value)) { |
48 | - foreach ( $value as $v ) { |
|
48 | + foreach ($value as $v) { |
|
49 | 49 | $this->_self->addToProperty($name, $v, $separator); |
50 | 50 | } |
51 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
52 | - if(isset($this->_self->properties[$name])){ |
|
51 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
52 | + if (isset($this->_self->properties[$name])) { |
|
53 | 53 | $v=$this->_self->properties[$name]; |
54 | - if (isset($v) && $v !== ""){ |
|
55 | - $value=$v . $separator . $value; |
|
54 | + if (isset($v) && $v!=="") { |
|
55 | + $value=$v.$separator.$value; |
|
56 | 56 | } |
57 | 57 | } |
58 | 58 | return $this->_self->setProperty($name, $value); |
@@ -89,7 +89,7 @@ discard block |
||
89 | 89 | } |
90 | 90 | |
91 | 91 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
92 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
92 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
93 | 93 | return $this->_self->addToProperty($name, $value); |
94 | 94 | } |
95 | 95 | return $this; |
@@ -110,12 +110,12 @@ discard block |
||
110 | 110 | } |
111 | 111 | |
112 | 112 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
113 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
114 | 114 | return $this->_self->setProperty($name, $value); |
115 | 115 | return $this; |
116 | 116 | } |
117 | 117 | |
118 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
119 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
118 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
119 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
120 | 120 | } |
121 | 121 | } |
@@ -33,8 +33,9 @@ discard block |
||
33 | 33 | } |
34 | 34 | |
35 | 35 | public function getProperty($name) { |
36 | - if (array_key_exists($name, $this->_self->properties)) |
|
37 | - return $this->_self->properties[$name]; |
|
36 | + if (array_key_exists($name, $this->_self->properties)) { |
|
37 | + return $this->_self->properties[$name]; |
|
38 | + } |
|
38 | 39 | } |
39 | 40 | |
40 | 41 | /** |
@@ -76,8 +77,9 @@ discard block |
||
76 | 77 | } |
77 | 78 | |
78 | 79 | protected function addToPropertyUnique($name, $value, $typeCtrl) { |
79 | - if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) |
|
80 | - $typeCtrl=$typeCtrl::getConstants(); |
|
80 | + if (is_string($typeCtrl) && @class_exists($typeCtrl, true)) { |
|
81 | + $typeCtrl=$typeCtrl::getConstants(); |
|
82 | + } |
|
81 | 83 | if (\is_array($typeCtrl)) { |
82 | 84 | $this->_self->removeOldValues($this->_self->properties[$name], $typeCtrl); |
83 | 85 | } |
@@ -96,8 +98,9 @@ discard block |
||
96 | 98 | } |
97 | 99 | |
98 | 100 | public function removeProperty($name) { |
99 | - if (\array_key_exists($name, $this->_self->properties)) |
|
100 | - unset($this->_self->properties[$name]); |
|
101 | + if (\array_key_exists($name, $this->_self->properties)) { |
|
102 | + unset($this->_self->properties[$name]); |
|
103 | + } |
|
101 | 104 | return $this; |
102 | 105 | } |
103 | 106 | |
@@ -110,8 +113,9 @@ discard block |
||
110 | 113 | } |
111 | 114 | |
112 | 115 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
113 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
114 | - return $this->_self->setProperty($name, $value); |
|
116 | + if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
117 | + return $this->_self->setProperty($name, $value); |
|
118 | + } |
|
115 | 119 | return $this; |
116 | 120 | } |
117 | 121 |
@@ -19,8 +19,8 @@ discard block |
||
19 | 19 | * @param array $instances |
20 | 20 | * @return DataTable |
21 | 21 | */ |
22 | - public function dataTable($identifier,$model, $instances=null){ |
|
23 | - return $this->addHtmlComponent(new DataTable($identifier,$model,$instances)); |
|
22 | + public function dataTable($identifier, $model, $instances=null) { |
|
23 | + return $this->addHtmlComponent(new DataTable($identifier, $model, $instances)); |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | /** |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * @param array $instances |
30 | 30 | * @return JsonDataTable |
31 | 31 | */ |
32 | - public function jsonDataTable($identifier,$model, $instances=null){ |
|
33 | - return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances)); |
|
32 | + public function jsonDataTable($identifier, $model, $instances=null) { |
|
33 | + return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances)); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | /** |
@@ -38,8 +38,8 @@ discard block |
||
38 | 38 | * @param object $instance |
39 | 39 | * @return DataElement |
40 | 40 | */ |
41 | - public function dataElement($identifier, $instance=null){ |
|
42 | - return $this->addHtmlComponent(new DataElement($identifier,$instance)); |
|
41 | + public function dataElement($identifier, $instance=null) { |
|
42 | + return $this->addHtmlComponent(new DataElement($identifier, $instance)); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | /** |
@@ -47,8 +47,8 @@ discard block |
||
47 | 47 | * @param object $instance |
48 | 48 | * @return DataForm |
49 | 49 | */ |
50 | - public function dataForm($identifier, $instance){ |
|
51 | - return $this->addHtmlComponent(new DataForm($identifier,$instance)); |
|
50 | + public function dataForm($identifier, $instance) { |
|
51 | + return $this->addHtmlComponent(new DataForm($identifier, $instance)); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | /** |
@@ -56,8 +56,8 @@ discard block |
||
56 | 56 | * @param object $instance |
57 | 57 | * @return FormLogin |
58 | 58 | */ |
59 | - public function defaultLogin($identifier,$instance=null){ |
|
60 | - return $this->addHtmlComponent(FormLogin::regular($identifier,$instance)); |
|
59 | + public function defaultLogin($identifier, $instance=null) { |
|
60 | + return $this->addHtmlComponent(FormLogin::regular($identifier, $instance)); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -65,8 +65,8 @@ discard block |
||
65 | 65 | * @param object $instance |
66 | 66 | * @return FormLogin |
67 | 67 | */ |
68 | - public function smallLogin($identifier,$instance=null){ |
|
69 | - return $this->addHtmlComponent(FormLogin::small($identifier,$instance)); |
|
68 | + public function smallLogin($identifier, $instance=null) { |
|
69 | + return $this->addHtmlComponent(FormLogin::small($identifier, $instance)); |
|
70 | 70 | } |
71 | 71 | |
72 | 72 | /** |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | * @param object $instance |
75 | 75 | * @return FormLogin |
76 | 76 | */ |
77 | - public function segmentedLogin($identifier,$instance=null){ |
|
78 | - return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance)); |
|
77 | + public function segmentedLogin($identifier, $instance=null) { |
|
78 | + return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | * @param object $instance |
84 | 84 | * @return FormAccount |
85 | 85 | */ |
86 | - public function defaultAccount($identifier,$instance=null){ |
|
87 | - return $this->addHtmlComponent(FormAccount::regular($identifier,$instance)); |
|
86 | + public function defaultAccount($identifier, $instance=null) { |
|
87 | + return $this->addHtmlComponent(FormAccount::regular($identifier, $instance)); |
|
88 | 88 | } |
89 | 89 | } |
@@ -22,25 +22,25 @@ discard block |
||
22 | 22 | $this->_rowClass="_json _element"; |
23 | 23 | } |
24 | 24 | |
25 | - protected function _generateContent($table){ |
|
25 | + protected function _generateContent($table) { |
|
26 | 26 | $this->_addRowModel($table); |
27 | 27 | parent::_generateContent($table); |
28 | 28 | } |
29 | 29 | |
30 | - protected function _addRowModel($table){ |
|
30 | + protected function _addRowModel($table) { |
|
31 | 31 | $fields=$this->_instanceViewer->getSimpleProperties(); |
32 | - $row=$this->_createRow($table, $this->_modelClass,$fields); |
|
33 | - $row->setProperty("style","display:none;"); |
|
32 | + $row=$this->_createRow($table, $this->_modelClass, $fields); |
|
33 | + $row->setProperty("style", "display:none;"); |
|
34 | 34 | $table->getBody()->_addRow($row); |
35 | 35 | } |
36 | 36 | |
37 | - protected function _createRow($table,$rowClass,$fields){ |
|
37 | + protected function _createRow($table, $rowClass, $fields) { |
|
38 | 38 | $object=JReflection::jsonObject($this->_model); |
39 | - if(isset($this->_rowModelCallback)){ |
|
39 | + if (isset($this->_rowModelCallback)) { |
|
40 | 40 | $callback=$this->_rowModelCallback; |
41 | 41 | $callback($object); |
42 | 42 | } |
43 | - $row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked"); |
|
43 | + $row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked"); |
|
44 | 44 | $row->setClass($rowClass." _element"); |
45 | 45 | return $row; |
46 | 46 | } |
@@ -49,24 +49,24 @@ discard block |
||
49 | 49 | * {@inheritDoc} |
50 | 50 | * @see DataTable::_associatePaginationBehavior() |
51 | 51 | */ |
52 | - protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){ |
|
52 | + protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) { |
|
53 | 53 | $callback=null; |
54 | 54 | $menu=$this->_pagination->getMenu(); |
55 | 55 | |
56 | - if(isset($js)){ |
|
56 | + if (isset($js)) { |
|
57 | 57 | $id=$this->identifier; |
58 | 58 | $callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript(); |
59 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
59 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
60 | 60 | $callback.=$this->_generatePaginationScript($id); |
61 | - if(isset($this->_urls["refresh"])){ |
|
62 | - if(isset($menu)) |
|
63 | - $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
61 | + if (isset($this->_urls["refresh"])) { |
|
62 | + if (isset($menu)) |
|
63 | + $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]); |
|
64 | 64 | } |
65 | 65 | } |
66 | 66 | |
67 | 67 | } |
68 | 68 | |
69 | - protected function _generatePaginationScript($id){ |
|
69 | + protected function _generatePaginationScript($id) { |
|
70 | 70 | return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2; |
71 | 71 | var lastPage=$('#pagination-{$id} ._lastPage'); |
72 | 72 | var middle= Math.ceil((pages_visibles-1)/ 2); |
@@ -86,16 +86,16 @@ discard block |
||
86 | 86 | lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1)); |
87 | 87 | $('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();"; |
88 | 88 | } |
89 | - protected function _compileSearchFieldBehavior(JsUtils $js=NULL){ |
|
89 | + protected function _compileSearchFieldBehavior(JsUtils $js=NULL) { |
|
90 | 90 | |
91 | 91 | } |
92 | - protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){ |
|
93 | - if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){ |
|
92 | + protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) { |
|
93 | + if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) { |
|
94 | 94 | $id=$this->identifier; |
95 | 95 | $callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript(); |
96 | - $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
96 | + $callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
|
97 | 97 | $callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);"; |
98 | - $js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
98 | + $js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]); |
|
99 | 99 | } |
100 | 100 | } |
101 | 101 | |
@@ -109,29 +109,29 @@ discard block |
||
109 | 109 | * @param string $jsCallback |
110 | 110 | * @return AjaxCall |
111 | 111 | */ |
112 | - public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
113 | - $parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]); |
|
112 | + public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
113 | + $parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]); |
|
114 | 114 | return new AjaxCall("jsonArray", $parameters); |
115 | 115 | } |
116 | 116 | |
117 | - public function jsClear(){ |
|
117 | + public function jsClear() { |
|
118 | 118 | return "$('#{$this->identifier} tbody').find('._json').remove();"; |
119 | 119 | } |
120 | 120 | |
121 | - public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){ |
|
122 | - return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault); |
|
121 | + public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) { |
|
122 | + return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault); |
|
123 | 123 | } |
124 | 124 | |
125 | - public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){ |
|
126 | - return $this->clearOn($element, "click",$stopPropagation,$preventDefault); |
|
125 | + public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) { |
|
126 | + return $this->clearOn($element, "click", $stopPropagation, $preventDefault); |
|
127 | 127 | } |
128 | 128 | |
129 | - public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
130 | - return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters)); |
|
129 | + public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
130 | + return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters)); |
|
131 | 131 | } |
132 | 132 | |
133 | - public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){ |
|
134 | - return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters); |
|
133 | + public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) { |
|
134 | + return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -142,8 +142,8 @@ discard block |
||
142 | 142 | * @param number $pages_visibles The number of visible pages in the Pagination component |
143 | 143 | * @return DataTable |
144 | 144 | */ |
145 | - public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){ |
|
146 | - return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles); |
|
145 | + public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) { |
|
146 | + return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles); |
|
147 | 147 | } |
148 | 148 | |
149 | 149 | public function setRowModelCallback($_rowModelCallback) { |
@@ -59,8 +59,9 @@ |
||
59 | 59 | $callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js)); |
60 | 60 | $callback.=$this->_generatePaginationScript($id); |
61 | 61 | if(isset($this->_urls["refresh"])){ |
62 | - if(isset($menu)) |
|
63 | - $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
62 | + if(isset($menu)) { |
|
63 | + $js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]); |
|
64 | + } |
|
64 | 65 | } |
65 | 66 | } |
66 | 67 |