@@ -11,14 +11,27 @@ discard block |
||
| 11 | 11 | * @property InstanceViewer $_instanceViewer |
| 12 | 12 | */ |
| 13 | 13 | trait DataTableFieldAsTrait{ |
| 14 | + |
|
| 15 | + /** |
|
| 16 | + * @param \Closure $field |
|
| 17 | + */ |
|
| 14 | 18 | abstract public function addField($field); |
| 19 | + |
|
| 20 | + /** |
|
| 21 | + * @param integer $index |
|
| 22 | + * @param \Closure $field |
|
| 23 | + */ |
|
| 15 | 24 | abstract public function insertField($index,$field); |
| 25 | + |
|
| 26 | + /** |
|
| 27 | + * @param \Closure $field |
|
| 28 | + */ |
|
| 16 | 29 | abstract public function insertInField($index,$field); |
| 17 | 30 | /** |
| 18 | 31 | * @param string $caption |
| 19 | 32 | * @param callable $callback |
| 20 | 33 | * @param boolean $visibleHover |
| 21 | - * @return callable |
|
| 34 | + * @return \Closure |
|
| 22 | 35 | */ |
| 23 | 36 | private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){ |
| 24 | 37 | return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback); |
@@ -28,7 +41,7 @@ discard block |
||
| 28 | 41 | * @param callable $thisCallback |
| 29 | 42 | * @param array $parameters |
| 30 | 43 | * @param callable $callback |
| 31 | - * @return callable |
|
| 44 | + * @return \Closure |
|
| 32 | 45 | */ |
| 33 | 46 | private function getCallable($thisCallback,$parameters,$callback=null){ |
| 34 | 47 | $result=function($instance) use($thisCallback,$parameters,$callback){ |
@@ -66,7 +79,7 @@ discard block |
||
| 66 | 79 | * @param string $caption |
| 67 | 80 | * @param callable $callback |
| 68 | 81 | * @param boolean $visibleHover |
| 69 | - * @return \Ajax\semantic\widgets\datatable\DataTable |
|
| 82 | + * @return DataTableFieldAsTrait |
|
| 70 | 83 | */ |
| 71 | 84 | public function addFieldButton($caption,$visibleHover=true,$callback=null){ |
| 72 | 85 | $this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback)); |
@@ -78,7 +91,7 @@ discard block |
||
| 78 | 91 | * @param int $index |
| 79 | 92 | * @param string $caption |
| 80 | 93 | * @param callable $callback |
| 81 | - * @return \Ajax\semantic\widgets\datatable\DataTable |
|
| 94 | + * @return DataTableFieldAsTrait |
|
| 82 | 95 | */ |
| 83 | 96 | public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
| 84 | 97 | $this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
@@ -90,18 +103,26 @@ discard block |
||
| 90 | 103 | * @param int $index |
| 91 | 104 | * @param string $caption |
| 92 | 105 | * @param callable $callback |
| 93 | - * @return \Ajax\semantic\widgets\datatable\DataTable |
|
| 106 | + * @return DataTableFieldAsTrait |
|
| 94 | 107 | */ |
| 95 | 108 | public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
| 96 | 109 | $this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
| 97 | 110 | return $this; |
| 98 | 111 | } |
| 99 | 112 | |
| 113 | + /** |
|
| 114 | + * @param string $icon |
|
| 115 | + * @param string $class |
|
| 116 | + */ |
|
| 100 | 117 | private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){ |
| 101 | 118 | $this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
| 102 | 119 | return $this; |
| 103 | 120 | } |
| 104 | 121 | |
| 122 | + /** |
|
| 123 | + * @param string $icon |
|
| 124 | + * @param string $class |
|
| 125 | + */ |
|
| 105 | 126 | private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){ |
| 106 | 127 | $this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
| 107 | 128 | return $this; |
@@ -10,18 +10,18 @@ discard block |
||
| 10 | 10 | * @property boolean $_visibleHover; |
| 11 | 11 | * @property InstanceViewer $_instanceViewer |
| 12 | 12 | */ |
| 13 | -trait DataTableFieldAsTrait{ |
|
| 13 | +trait DataTableFieldAsTrait { |
|
| 14 | 14 | abstract public function addField($field); |
| 15 | - abstract public function insertField($index,$field); |
|
| 16 | - abstract public function insertInField($index,$field); |
|
| 15 | + abstract public function insertField($index, $field); |
|
| 16 | + abstract public function insertInField($index, $field); |
|
| 17 | 17 | /** |
| 18 | 18 | * @param string $caption |
| 19 | 19 | * @param callable $callback |
| 20 | 20 | * @param boolean $visibleHover |
| 21 | 21 | * @return callable |
| 22 | 22 | */ |
| 23 | - private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){ |
|
| 24 | - return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback); |
|
| 23 | + private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) { |
|
| 24 | + return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback); |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | /** |
@@ -30,19 +30,19 @@ discard block |
||
| 30 | 30 | * @param callable $callback |
| 31 | 31 | * @return callable |
| 32 | 32 | */ |
| 33 | - private function getCallable($thisCallback,$parameters,$callback=null){ |
|
| 34 | - $result=function($instance) use($thisCallback,$parameters,$callback){ |
|
| 35 | - $object=call_user_func_array(array($this,$thisCallback), $parameters); |
|
| 36 | - if(isset($callback)){ |
|
| 37 | - if(\is_callable($callback)){ |
|
| 38 | - $callback($object,$instance); |
|
| 33 | + private function getCallable($thisCallback, $parameters, $callback=null) { |
|
| 34 | + $result=function($instance) use($thisCallback, $parameters, $callback){ |
|
| 35 | + $object=call_user_func_array(array($this, $thisCallback), $parameters); |
|
| 36 | + if (isset($callback)) { |
|
| 37 | + if (\is_callable($callback)) { |
|
| 38 | + $callback($object, $instance); |
|
| 39 | 39 | } |
| 40 | 40 | } |
| 41 | - if($object instanceof HtmlSemDoubleElement){ |
|
| 42 | - $object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier()); |
|
| 43 | - if($object->propertyContains("class","visibleover")){ |
|
| 41 | + if ($object instanceof HtmlSemDoubleElement) { |
|
| 42 | + $object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier()); |
|
| 43 | + if ($object->propertyContains("class", "visibleover")) { |
|
| 44 | 44 | $this->_visibleHover=true; |
| 45 | - $object->setProperty("style","visibility:hidden;"); |
|
| 45 | + $object->setProperty("style", "visibility:hidden;"); |
|
| 46 | 46 | } |
| 47 | 47 | } |
| 48 | 48 | return $object; |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | * @param string $caption |
| 55 | 55 | * @return HtmlButton |
| 56 | 56 | */ |
| 57 | - private function getFieldButton($caption,$visibleHover=true){ |
|
| 58 | - $bt= new HtmlButton("",$caption); |
|
| 59 | - if($visibleHover) |
|
| 57 | + private function getFieldButton($caption, $visibleHover=true) { |
|
| 58 | + $bt=new HtmlButton("", $caption); |
|
| 59 | + if ($visibleHover) |
|
| 60 | 60 | $this->_visibleOver($bt); |
| 61 | 61 | return $bt; |
| 62 | 62 | } |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @param boolean $visibleHover |
| 69 | 69 | * @return \Ajax\semantic\widgets\datatable\DataTable |
| 70 | 70 | */ |
| 71 | - public function addFieldButton($caption,$visibleHover=true,$callback=null){ |
|
| 72 | - $this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback)); |
|
| 71 | + public function addFieldButton($caption, $visibleHover=true, $callback=null) { |
|
| 72 | + $this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback)); |
|
| 73 | 73 | return $this; |
| 74 | 74 | } |
| 75 | 75 | |
@@ -80,8 +80,8 @@ discard block |
||
| 80 | 80 | * @param callable $callback |
| 81 | 81 | * @return \Ajax\semantic\widgets\datatable\DataTable |
| 82 | 82 | */ |
| 83 | - public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
| 84 | - $this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
| 83 | + public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
| 84 | + $this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
| 85 | 85 | return $this; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -92,53 +92,53 @@ discard block |
||
| 92 | 92 | * @param callable $callback |
| 93 | 93 | * @return \Ajax\semantic\widgets\datatable\DataTable |
| 94 | 94 | */ |
| 95 | - public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){ |
|
| 96 | - $this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback)); |
|
| 95 | + public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) { |
|
| 96 | + $this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback)); |
|
| 97 | 97 | return $this; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){ |
|
| 101 | - $this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
|
| 100 | + private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) { |
|
| 101 | + $this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback)); |
|
| 102 | 102 | return $this; |
| 103 | 103 | } |
| 104 | 104 | |
| 105 | - private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){ |
|
| 106 | - $this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback)); |
|
| 105 | + private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) { |
|
| 106 | + $this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback)); |
|
| 107 | 107 | return $this; |
| 108 | 108 | } |
| 109 | 109 | |
| 110 | - private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
|
| 111 | - $bt=$this->getFieldButton("",$visibleHover); |
|
| 110 | + private function getDefaultButton($icon, $class=null, $visibleHover=true) { |
|
| 111 | + $bt=$this->getFieldButton("", $visibleHover); |
|
| 112 | 112 | $bt->asIcon($icon); |
| 113 | - if(isset($class)) |
|
| 113 | + if (isset($class)) |
|
| 114 | 114 | $bt->addClass($class); |
| 115 | 115 | return $bt; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - public function addDeleteButton($visibleHover=true,$generateBehavior=true,$callback=null){ |
|
| 118 | + public function addDeleteButton($visibleHover=true, $generateBehavior=true, $callback=null) { |
|
| 119 | 119 | $this->_hasDelete=$generateBehavior; |
| 120 | - return $this->addDefaultButton("remove","delete red basic",$visibleHover,$callback); |
|
| 120 | + return $this->addDefaultButton("remove", "delete red basic", $visibleHover, $callback); |
|
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - public function addEditButton($visibleHover=true,$generateBehavior=true,$callback=null){ |
|
| 123 | + public function addEditButton($visibleHover=true, $generateBehavior=true, $callback=null) { |
|
| 124 | 124 | $this->_hasEdit=$generateBehavior; |
| 125 | - return $this->addDefaultButton("edit","edit basic",$visibleHover,$callback); |
|
| 125 | + return $this->addDefaultButton("edit", "edit basic", $visibleHover, $callback); |
|
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - public function addEditDeleteButtons($visibleHover=true,$generateBehavior=true,$callbackEdit=null,$callbackDelete=null){ |
|
| 129 | - $this->addEditButton($visibleHover,$generateBehavior,$callbackEdit); |
|
| 128 | + public function addEditDeleteButtons($visibleHover=true, $generateBehavior=true, $callbackEdit=null, $callbackDelete=null) { |
|
| 129 | + $this->addEditButton($visibleHover, $generateBehavior, $callbackEdit); |
|
| 130 | 130 | $index=$this->_instanceViewer->visiblePropertiesCount()-1; |
| 131 | - $this->insertDeleteButtonIn($index,$visibleHover,$generateBehavior,$callbackDelete); |
|
| 131 | + $this->insertDeleteButtonIn($index, $visibleHover, $generateBehavior, $callbackDelete); |
|
| 132 | 132 | return $this; |
| 133 | 133 | } |
| 134 | 134 | |
| 135 | - public function insertDeleteButtonIn($index,$visibleHover=true,$generateBehavior=true,$callback=null){ |
|
| 135 | + public function insertDeleteButtonIn($index, $visibleHover=true, $generateBehavior=true, $callback=null) { |
|
| 136 | 136 | $this->_hasDelete=$generateBehavior; |
| 137 | - return $this->insertDefaultButtonIn($index,"remove","delete red basic",$visibleHover,$callback); |
|
| 137 | + return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $visibleHover, $callback); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | - public function insertEditButtonIn($index,$visibleHover=true,$generateBehavior=true,$callback=null){ |
|
| 140 | + public function insertEditButtonIn($index, $visibleHover=true, $generateBehavior=true, $callback=null) { |
|
| 141 | 141 | $this->_hasEdit=$generateBehavior; |
| 142 | - return $this->insertDefaultButtonIn($index,"edit","edit basic",$visibleHover,$callback); |
|
| 142 | + return $this->insertDefaultButtonIn($index, "edit", "edit basic", $visibleHover, $callback); |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | \ No newline at end of file |
@@ -56,8 +56,9 @@ discard block |
||
| 56 | 56 | */ |
| 57 | 57 | private function getFieldButton($caption,$visibleHover=true){ |
| 58 | 58 | $bt= new HtmlButton("",$caption); |
| 59 | - if($visibleHover) |
|
| 60 | - $this->_visibleOver($bt); |
|
| 59 | + if($visibleHover) { |
|
| 60 | + $this->_visibleOver($bt); |
|
| 61 | + } |
|
| 61 | 62 | return $bt; |
| 62 | 63 | } |
| 63 | 64 | |
@@ -110,8 +111,9 @@ discard block |
||
| 110 | 111 | private function getDefaultButton($icon,$class=null,$visibleHover=true){ |
| 111 | 112 | $bt=$this->getFieldButton("",$visibleHover); |
| 112 | 113 | $bt->asIcon($icon); |
| 113 | - if(isset($class)) |
|
| 114 | - $bt->addClass($class); |
|
| 114 | + if(isset($class)) { |
|
| 115 | + $bt->addClass($class); |
|
| 116 | + } |
|
| 115 | 117 | return $bt; |
| 116 | 118 | } |
| 117 | 119 | |