phpMv /
phpMv-UI
@@ -30,9 +30,9 @@ discard block |
||
| 30 | 30 | * @param string $onClick |
| 31 | 31 | * JS Code for click event |
| 32 | 32 | */ |
| 33 | - public function __construct($identifier, $value = null, $cssStyle = null, $onClick = null) { |
|
| 33 | + public function __construct($identifier, $value=null, $cssStyle=null, $onClick=null) { |
|
| 34 | 34 | parent::__construct($identifier, "button", "ui button"); |
| 35 | - $this->content = $value; |
|
| 35 | + $this->content=$value; |
|
| 36 | 36 | if (isset($cssStyle)) { |
| 37 | 37 | $this->setStyle($cssStyle); |
| 38 | 38 | } |
@@ -51,12 +51,12 @@ discard block |
||
| 51 | 51 | if (is_array($this->content)) { |
| 52 | 52 | foreach ($this->content as $i => $content) { |
| 53 | 53 | if (is_string($content)) { |
| 54 | - $this->content[$i] = $value; |
|
| 54 | + $this->content[$i]=$value; |
|
| 55 | 55 | return $this; |
| 56 | 56 | } |
| 57 | 57 | } |
| 58 | 58 | } |
| 59 | - $this->content = $value; |
|
| 59 | + $this->content=$value; |
|
| 60 | 60 | return $this; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -70,8 +70,8 @@ discard block |
||
| 70 | 70 | return $this->addToProperty("class", $cssStyle); |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function setFocusable($value = true) { |
|
| 74 | - if ($value === true) |
|
| 73 | + public function setFocusable($value=true) { |
|
| 74 | + if ($value===true) |
|
| 75 | 75 | $this->setProperty("tabindex", "0"); |
| 76 | 76 | else { |
| 77 | 77 | $this->removeProperty("tabindex"); |
@@ -79,16 +79,16 @@ discard block |
||
| 79 | 79 | return $this; |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | - public function setAnimated($content, $animation = "") { |
|
| 82 | + public function setAnimated($content, $animation="") { |
|
| 83 | 83 | $this->setTagName("div"); |
| 84 | - $this->addToProperty("class", "animated " . $animation); |
|
| 85 | - $visible = new HtmlSemDoubleElement("visible-" . $this->identifier, "div"); |
|
| 84 | + $this->addToProperty("class", "animated ".$animation); |
|
| 85 | + $visible=new HtmlSemDoubleElement("visible-".$this->identifier, "div"); |
|
| 86 | 86 | $visible->setClass("visible content"); |
| 87 | 87 | $visible->setContent($this->content); |
| 88 | - $hidden = new HtmlSemDoubleElement("hidden-" . $this->identifier, "div"); |
|
| 88 | + $hidden=new HtmlSemDoubleElement("hidden-".$this->identifier, "div"); |
|
| 89 | 89 | $hidden->setClass("hidden content"); |
| 90 | 90 | $hidden->setContent($content); |
| 91 | - $this->content = array( |
|
| 91 | + $this->content=array( |
|
| 92 | 92 | $visible, |
| 93 | 93 | $hidden |
| 94 | 94 | ); |
@@ -101,12 +101,12 @@ discard block |
||
| 101 | 101 | * @return HtmlButton |
| 102 | 102 | */ |
| 103 | 103 | public function asIcon($icon) { |
| 104 | - $iconO = $icon; |
|
| 104 | + $iconO=$icon; |
|
| 105 | 105 | if (\is_string($icon)) { |
| 106 | - $iconO = new HtmlIcon("icon-" . $this->identifier, $icon); |
|
| 106 | + $iconO=new HtmlIcon("icon-".$this->identifier, $icon); |
|
| 107 | 107 | } |
| 108 | 108 | $this->addToProperty("class", "icon"); |
| 109 | - $this->content = $iconO; |
|
| 109 | + $this->content=$iconO; |
|
| 110 | 110 | return $this; |
| 111 | 111 | } |
| 112 | 112 | |
@@ -123,19 +123,19 @@ discard block |
||
| 123 | 123 | * @param string $icon |
| 124 | 124 | * @return HtmlLabel |
| 125 | 125 | */ |
| 126 | - public function addLabel($label, $before = false, $icon = NULL) { |
|
| 127 | - $this->tagName = "div"; |
|
| 128 | - $prefix = ""; |
|
| 126 | + public function addLabel($label, $before=false, $icon=NULL) { |
|
| 127 | + $this->tagName="div"; |
|
| 128 | + $prefix=""; |
|
| 129 | 129 | if ($before) |
| 130 | - $prefix = "left "; |
|
| 131 | - $this->addToProperty("class", $prefix . "labeled"); |
|
| 132 | - $isIcon = (isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
|
| 133 | - $this->content = new HtmlButton("button-" . $this->identifier, $this->content); |
|
| 130 | + $prefix="left "; |
|
| 131 | + $this->addToProperty("class", $prefix."labeled"); |
|
| 132 | + $isIcon=(isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
|
| 133 | + $this->content=new HtmlButton("button-".$this->identifier, $this->content); |
|
| 134 | 134 | if ($isIcon) { |
| 135 | 135 | $this->content->addClass("icon"); |
| 136 | 136 | } |
| 137 | 137 | $this->content->setTagName("div"); |
| 138 | - $label = new HtmlLabel("label-" . $this->identifier, $label, $icon, "a"); |
|
| 138 | + $label=new HtmlLabel("label-".$this->identifier, $label, $icon, "a"); |
|
| 139 | 139 | $label->setBasic(); |
| 140 | 140 | $this->addContent($label, $before); |
| 141 | 141 | return $label; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | * @see \Ajax\common\html\BaseHtml::fromArray() |
| 147 | 147 | */ |
| 148 | 148 | public function fromArray($array) { |
| 149 | - $array = parent::fromArray($array); |
|
| 149 | + $array=parent::fromArray($array); |
|
| 150 | 150 | foreach ($array as $key => $value) { |
| 151 | 151 | $this->setProperty($key, $value); |
| 152 | 152 | } |
@@ -187,9 +187,9 @@ discard block |
||
| 187 | 187 | * |
| 188 | 188 | * @return HtmlButton |
| 189 | 189 | */ |
| 190 | - public function setToggle($active = "") { |
|
| 191 | - $this->onCreate("$('#" . $this->identifier . "').state();"); |
|
| 192 | - return $this->addToProperty("class", "toggle " . $active); |
|
| 190 | + public function setToggle($active="") { |
|
| 191 | + $this->onCreate("$('#".$this->identifier."').state();"); |
|
| 192 | + return $this->addToProperty("class", "toggle ".$active); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -225,10 +225,10 @@ discard block |
||
| 225 | 225 | * @param string $value |
| 226 | 226 | * @return HtmlButton |
| 227 | 227 | */ |
| 228 | - public static function social($identifier, $social, $value = NULL) { |
|
| 229 | - if ($value === NULL) |
|
| 230 | - $value = \ucfirst($social); |
|
| 231 | - $return = new HtmlButton($identifier, $value); |
|
| 228 | + public static function social($identifier, $social, $value=NULL) { |
|
| 229 | + if ($value===NULL) |
|
| 230 | + $value=\ucfirst($social); |
|
| 231 | + $return=new HtmlButton($identifier, $value); |
|
| 232 | 232 | $return->addIcon($social); |
| 233 | 233 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
| 234 | 234 | } |
@@ -242,8 +242,8 @@ discard block |
||
| 242 | 242 | * @param boolean $before |
| 243 | 243 | * @return \Ajax\semantic\html\elements\HtmlButton |
| 244 | 244 | */ |
| 245 | - public static function labeled($identifier, $value, $icon, $before = true) { |
|
| 246 | - $result = new HtmlButton($identifier, $value); |
|
| 245 | + public static function labeled($identifier, $value, $icon, $before=true) { |
|
| 246 | + $result=new HtmlButton($identifier, $value); |
|
| 247 | 247 | $result->addIcon($icon, $before, true); |
| 248 | 248 | return $result; |
| 249 | 249 | } |
@@ -256,7 +256,7 @@ discard block |
||
| 256 | 256 | * @return HtmlButton |
| 257 | 257 | */ |
| 258 | 258 | public static function icon($identifier, $icon) { |
| 259 | - $result = new HtmlButton($identifier); |
|
| 259 | + $result=new HtmlButton($identifier); |
|
| 260 | 260 | $result->asIcon($icon); |
| 261 | 261 | return $result; |
| 262 | 262 | } |
@@ -266,7 +266,7 @@ discard block |
||
| 266 | 266 | * {@inheritdoc} |
| 267 | 267 | * @see HtmlSemDoubleElement::asLink() |
| 268 | 268 | */ |
| 269 | - public function asLink($href = NULL, $target = NULL) { |
|
| 269 | + public function asLink($href=NULL, $target=NULL) { |
|
| 270 | 270 | parent::asLink($href, $target); |
| 271 | 271 | return $this; |
| 272 | 272 | } |
@@ -281,20 +281,20 @@ discard block |
||
| 281 | 281 | * @param string $icon |
| 282 | 282 | * @return HtmlButtonGroups |
| 283 | 283 | */ |
| 284 | - public static function dropdown($identifier, $value, $items = [], $asCombo = false, $icon = null) { |
|
| 285 | - $result = new HtmlButtonGroups($identifier, [ |
|
| 284 | + public static function dropdown($identifier, $value, $items=[], $asCombo=false, $icon=null) { |
|
| 285 | + $result=new HtmlButtonGroups($identifier, [ |
|
| 286 | 286 | $value |
| 287 | 287 | ]); |
| 288 | - $dd = $result->addDropdown($items, $asCombo); |
|
| 288 | + $dd=$result->addDropdown($items, $asCombo); |
|
| 289 | 289 | if (isset($icon) && $dd instanceof HtmlDropdown) |
| 290 | 290 | $dd->setIcon($icon); |
| 291 | 291 | return $result; |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | - public function addPopupConfirmation($message, $buttons = ["Okay","Cancel"]) { |
|
| 295 | - $elm = new HtmlSemDoubleElement('popup-confirm-' . $this->_identifier); |
|
| 294 | + public function addPopupConfirmation($message, $buttons=["Okay", "Cancel"]) { |
|
| 295 | + $elm=new HtmlSemDoubleElement('popup-confirm-'.$this->_identifier); |
|
| 296 | 296 | $elm->setContent([ |
| 297 | - 'message' => new HtmlSemDoubleElement('popup-confirm-message-' . $this->_identifier, 'p', '', $message) |
|
| 297 | + 'message' => new HtmlSemDoubleElement('popup-confirm-message-'.$this->_identifier, 'p', '', $message) |
|
| 298 | 298 | ]); |
| 299 | 299 | $this->addPopupHtml($elm, null, [ |
| 300 | 300 | 'on' => 'click' |
@@ -71,9 +71,9 @@ discard block |
||
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | public function setFocusable($value = true) { |
| 74 | - if ($value === true) |
|
| 75 | - $this->setProperty("tabindex", "0"); |
|
| 76 | - else { |
|
| 74 | + if ($value === true) { |
|
| 75 | + $this->setProperty("tabindex", "0"); |
|
| 76 | + } else { |
|
| 77 | 77 | $this->removeProperty("tabindex"); |
| 78 | 78 | } |
| 79 | 79 | return $this; |
@@ -126,8 +126,9 @@ discard block |
||
| 126 | 126 | public function addLabel($label, $before = false, $icon = NULL) { |
| 127 | 127 | $this->tagName = "div"; |
| 128 | 128 | $prefix = ""; |
| 129 | - if ($before) |
|
| 130 | - $prefix = "left "; |
|
| 129 | + if ($before) { |
|
| 130 | + $prefix = "left "; |
|
| 131 | + } |
|
| 131 | 132 | $this->addToProperty("class", $prefix . "labeled"); |
| 132 | 133 | $isIcon = (isset($this->content[0]) && $this->content[0] instanceof HtmlIcon); |
| 133 | 134 | $this->content = new HtmlButton("button-" . $this->identifier, $this->content); |
@@ -165,11 +166,13 @@ discard block |
||
| 165 | 166 | public function setColor($color) { |
| 166 | 167 | if (\is_array($this->content)) { |
| 167 | 168 | foreach ($this->content as $content) { |
| 168 | - if ($content instanceof HtmlButton) |
|
| 169 | - $content->setColor($color); |
|
| 169 | + if ($content instanceof HtmlButton) { |
|
| 170 | + $content->setColor($color); |
|
| 171 | + } |
|
| 170 | 172 | } |
| 171 | - } else |
|
| 172 | - parent::setColor($color); |
|
| 173 | + } else { |
|
| 174 | + parent::setColor($color); |
|
| 175 | + } |
|
| 173 | 176 | return $this; |
| 174 | 177 | } |
| 175 | 178 | |
@@ -226,8 +229,9 @@ discard block |
||
| 226 | 229 | * @return HtmlButton |
| 227 | 230 | */ |
| 228 | 231 | public static function social($identifier, $social, $value = NULL) { |
| 229 | - if ($value === NULL) |
|
| 230 | - $value = \ucfirst($social); |
|
| 232 | + if ($value === NULL) { |
|
| 233 | + $value = \ucfirst($social); |
|
| 234 | + } |
|
| 231 | 235 | $return = new HtmlButton($identifier, $value); |
| 232 | 236 | $return->addIcon($social); |
| 233 | 237 | return $return->addToPropertyCtrl("class", $social, Social::getConstants()); |
@@ -286,8 +290,9 @@ discard block |
||
| 286 | 290 | $value |
| 287 | 291 | ]); |
| 288 | 292 | $dd = $result->addDropdown($items, $asCombo); |
| 289 | - if (isset($icon) && $dd instanceof HtmlDropdown) |
|
| 290 | - $dd->setIcon($icon); |
|
| 293 | + if (isset($icon) && $dd instanceof HtmlDropdown) { |
|
| 294 | + $dd->setIcon($icon); |
|
| 295 | + } |
|
| 291 | 296 | return $result; |
| 292 | 297 | } |
| 293 | 298 | |
@@ -41,12 +41,12 @@ discard block |
||
| 41 | 41 | * @return HtmlMenu |
| 42 | 42 | */ |
| 43 | 43 | public function setType($type="") { |
| 44 | - return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
|
| 44 | + return $this->addToPropertyCtrl("class", $type, array("", "item", "text")); |
|
| 45 | 45 | } |
| 46 | 46 | |
| 47 | 47 | public function setActiveItem($index) { |
| 48 | 48 | $item=$this->getItem($index); |
| 49 | - if ($item !== null) { |
|
| 49 | + if ($item!==null) { |
|
| 50 | 50 | $item->addToProperty("class", "active"); |
| 51 | 51 | } |
| 52 | 52 | return $this; |
@@ -54,7 +54,7 @@ discard block |
||
| 54 | 54 | |
| 55 | 55 | private function getItemToInsert($item) { |
| 56 | 56 | if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) { |
| 57 | - $itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item); |
|
| 57 | + $itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item); |
|
| 58 | 58 | $itemO->addClass("no-active"); |
| 59 | 59 | $item=$itemO; |
| 60 | 60 | } |
@@ -63,7 +63,7 @@ discard block |
||
| 63 | 63 | |
| 64 | 64 | private function afterInsert($item) { |
| 65 | 65 | if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
| 66 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
| 66 | + $item->addToPropertyCtrl("class", "item", array("item")); |
|
| 67 | 67 | else { |
| 68 | 68 | $this->setSecondary(); |
| 69 | 69 | } |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | public function addItem($item) { |
| 80 | 80 | $number=$item; |
| 81 | 81 | $item=parent::addItem($this->getItemToInsert($item)); |
| 82 | - if(\is_int($number)) |
|
| 82 | + if (\is_int($number)) |
|
| 83 | 83 | $item->setProperty("data-page", $number); |
| 84 | 84 | return $this->afterInsert($item); |
| 85 | 85 | } |
@@ -97,15 +97,15 @@ discard block |
||
| 97 | 97 | |
| 98 | 98 | public function generateMenuAsItem($menu, $header=null) { |
| 99 | 99 | $count=$this->count(); |
| 100 | - $item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div"); |
|
| 100 | + $item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div"); |
|
| 101 | 101 | if (isset($header)) { |
| 102 | - $headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header"); |
|
| 102 | + $headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header"); |
|
| 103 | 103 | $headerItem->setContent($header); |
| 104 | 104 | $item->addContent($headerItem); |
| 105 | 105 | $this->_itemHeader=$headerItem; |
| 106 | 106 | } |
| 107 | - if(\is_array($menu)){ |
|
| 108 | - $menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu); |
|
| 107 | + if (\is_array($menu)) { |
|
| 108 | + $menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu); |
|
| 109 | 109 | } |
| 110 | 110 | $menu->setClass("menu"); |
| 111 | 111 | $item->addContent($menu); |
@@ -117,11 +117,11 @@ discard block |
||
| 117 | 117 | * @param String|HtmlDoubleElement $caption |
| 118 | 118 | * @return \Ajax\common\html\HtmlDoubleElement |
| 119 | 119 | */ |
| 120 | - public function addHeader($caption){ |
|
| 121 | - if(!($caption instanceof HtmlDoubleElement)){ |
|
| 122 | - $header=new HtmlDoubleElement('','div'); |
|
| 120 | + public function addHeader($caption) { |
|
| 121 | + if (!($caption instanceof HtmlDoubleElement)) { |
|
| 122 | + $header=new HtmlDoubleElement('', 'div'); |
|
| 123 | 123 | $header->setContent($caption); |
| 124 | - }else{ |
|
| 124 | + } else { |
|
| 125 | 125 | $header=$caption; |
| 126 | 126 | } |
| 127 | 127 | $header->addClass('item header'); |
@@ -137,7 +137,7 @@ discard block |
||
| 137 | 137 | $value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value); |
| 138 | 138 | $value->addContent(new HtmlIcon("", "dropdown")); |
| 139 | 139 | $value=$this->addItem($value); |
| 140 | - $popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content); |
|
| 140 | + $popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content); |
|
| 141 | 141 | $popup->setFlowing()->setPosition("bottom left")->setOn("click"); |
| 142 | 142 | $this->wrap("", $popup); |
| 143 | 143 | return $popup; |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | public function addDropdownAsItem($value, $items=NULL) { |
| 147 | 147 | $dd=$value; |
| 148 | 148 | if (\is_string($value)) { |
| 149 | - $dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items); |
|
| 149 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items); |
|
| 150 | 150 | } |
| 151 | 151 | $this->addItem($dd); |
| 152 | 152 | return $dd; |
@@ -159,14 +159,14 @@ discard block |
||
| 159 | 159 | * @see HtmlCollection::createItem() |
| 160 | 160 | */ |
| 161 | 161 | protected function createItem($value) { |
| 162 | - $itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),""); |
|
| 162 | + $itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), ""); |
|
| 163 | 163 | $itemO->setTagName("a"); |
| 164 | 164 | $itemO->setContent($value); |
| 165 | 165 | return $itemO; |
| 166 | 166 | } |
| 167 | 167 | |
| 168 | 168 | public function setSecondary($value=true) { |
| 169 | - if($value) |
|
| 169 | + if ($value) |
|
| 170 | 170 | $this->addToProperty("class", "secondary"); |
| 171 | 171 | else |
| 172 | 172 | $this->removePropertyValue("class", "secondary"); |
@@ -174,28 +174,28 @@ discard block |
||
| 174 | 174 | } |
| 175 | 175 | |
| 176 | 176 | public function setVertical() { |
| 177 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical" )); |
|
| 177 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
| 178 | 178 | } |
| 179 | 179 | |
| 180 | 180 | public function setPosition($value="right") { |
| 181 | - return $this->addToPropertyCtrl("class", $value, array ("right","left" )); |
|
| 181 | + return $this->addToPropertyCtrl("class", $value, array("right", "left")); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | public function setPointing($value=Direction::NONE) { |
| 185 | - return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing")); |
|
| 185 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | public function asTab($vertical=false) { |
| 189 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
| 189 | + $this->apply(function(HtmlDoubleElement &$item) { |
|
| 190 | 190 | $item->setTagName("a"); |
| 191 | 191 | }); |
| 192 | - if ($vertical === true) |
|
| 192 | + if ($vertical===true) |
|
| 193 | 193 | $this->setVertical(); |
| 194 | 194 | return $this->addToProperty("class", "tabular"); |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | 197 | public function asPagination() { |
| 198 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
| 198 | + $this->apply(function(HtmlDoubleElement &$item) { |
|
| 199 | 199 | $item->setTagName("a"); |
| 200 | 200 | }); |
| 201 | 201 | return $this->addToProperty("class", "pagination"); |
@@ -232,10 +232,10 @@ discard block |
||
| 232 | 232 | */ |
| 233 | 233 | public function setWidth($width) { |
| 234 | 234 | if (\is_int($width)) { |
| 235 | - $width=Wide::getConstants()["W" . $width]; |
|
| 235 | + $width=Wide::getConstants()["W".$width]; |
|
| 236 | 236 | } |
| 237 | 237 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
| 238 | - return $this->addToPropertyCtrl("class", "item", array ("item" )); |
|
| 238 | + return $this->addToPropertyCtrl("class", "item", array("item")); |
|
| 239 | 239 | } |
| 240 | 240 | |
| 241 | 241 | public function addImage($identifier, $src="", $alt="") { |
@@ -250,14 +250,14 @@ discard block |
||
| 250 | 250 | return $this->_itemHeader; |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - public function setHasContainer(){ |
|
| 254 | - return $this->wrapContent("<div class='ui container'>","</div>"); |
|
| 253 | + public function setHasContainer() { |
|
| 254 | + return $this->wrapContent("<div class='ui container'>", "</div>"); |
|
| 255 | 255 | } |
| 256 | 256 | |
| 257 | - public function run(JsUtils $js){ |
|
| 258 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
| 259 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
| 260 | - $result= parent::run($js); |
|
| 257 | + public function run(JsUtils $js) { |
|
| 258 | + if ($this->identifier!=="" && !isset($this->_bsComponent)) |
|
| 259 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false); |
|
| 260 | + $result=parent::run($js); |
|
| 261 | 261 | return $result->setItemSelector(">.item:not(.header)"); |
| 262 | 262 | } |
| 263 | 263 | } |
@@ -62,9 +62,9 @@ discard block |
||
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | private function afterInsert($item) { |
| 65 | - if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
|
| 66 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
| 67 | - else { |
|
| 65 | + if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) { |
|
| 66 | + $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
| 67 | + } else { |
|
| 68 | 68 | $this->setSecondary(); |
| 69 | 69 | } |
| 70 | 70 | return $item; |
@@ -79,8 +79,9 @@ discard block |
||
| 79 | 79 | public function addItem($item) { |
| 80 | 80 | $number=$item; |
| 81 | 81 | $item=parent::addItem($this->getItemToInsert($item)); |
| 82 | - if(\is_int($number)) |
|
| 83 | - $item->setProperty("data-page", $number); |
|
| 82 | + if(\is_int($number)) { |
|
| 83 | + $item->setProperty("data-page", $number); |
|
| 84 | + } |
|
| 84 | 85 | return $this->afterInsert($item); |
| 85 | 86 | } |
| 86 | 87 | |
@@ -121,7 +122,7 @@ discard block |
||
| 121 | 122 | if(!($caption instanceof HtmlDoubleElement)){ |
| 122 | 123 | $header=new HtmlDoubleElement('','div'); |
| 123 | 124 | $header->setContent($caption); |
| 124 | - }else{ |
|
| 125 | + } else{ |
|
| 125 | 126 | $header=$caption; |
| 126 | 127 | } |
| 127 | 128 | $header->addClass('item header'); |
@@ -166,10 +167,11 @@ discard block |
||
| 166 | 167 | } |
| 167 | 168 | |
| 168 | 169 | public function setSecondary($value=true) { |
| 169 | - if($value) |
|
| 170 | - $this->addToProperty("class", "secondary"); |
|
| 171 | - else |
|
| 172 | - $this->removePropertyValue("class", "secondary"); |
|
| 170 | + if($value) { |
|
| 171 | + $this->addToProperty("class", "secondary"); |
|
| 172 | + } else { |
|
| 173 | + $this->removePropertyValue("class", "secondary"); |
|
| 174 | + } |
|
| 173 | 175 | return $this; |
| 174 | 176 | } |
| 175 | 177 | |
@@ -189,8 +191,9 @@ discard block |
||
| 189 | 191 | $this->apply(function (HtmlDoubleElement &$item) { |
| 190 | 192 | $item->setTagName("a"); |
| 191 | 193 | }); |
| 192 | - if ($vertical === true) |
|
| 193 | - $this->setVertical(); |
|
| 194 | + if ($vertical === true) { |
|
| 195 | + $this->setVertical(); |
|
| 196 | + } |
|
| 194 | 197 | return $this->addToProperty("class", "tabular"); |
| 195 | 198 | } |
| 196 | 199 | |
@@ -219,10 +222,11 @@ discard block |
||
| 219 | 222 | */ |
| 220 | 223 | public function fromDatabaseObject($object, $function) { |
| 221 | 224 | $return=$function($object); |
| 222 | - if (\is_array($return)) |
|
| 223 | - $this->addItems($return); |
|
| 224 | - else |
|
| 225 | - $this->addItem($return); |
|
| 225 | + if (\is_array($return)) { |
|
| 226 | + $this->addItems($return); |
|
| 227 | + } else { |
|
| 228 | + $this->addItem($return); |
|
| 229 | + } |
|
| 226 | 230 | } |
| 227 | 231 | |
| 228 | 232 | /** |
@@ -255,8 +259,9 @@ discard block |
||
| 255 | 259 | } |
| 256 | 260 | |
| 257 | 261 | public function run(JsUtils $js){ |
| 258 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
| 259 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
| 262 | + if($this->identifier!=="" && !isset($this->_bsComponent)) { |
|
| 263 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
| 264 | + } |
|
| 260 | 265 | $result= parent::run($js); |
| 261 | 266 | return $result->setItemSelector(">.item:not(.header)"); |
| 262 | 267 | } |
@@ -12,15 +12,15 @@ discard block |
||
| 12 | 12 | use Ajax\service\Javascript; |
| 13 | 13 | |
| 14 | 14 | class HtmlInput extends HtmlSemDoubleElement { |
| 15 | - use IconTrait,TextFieldsTrait,FieldTrait; |
|
| 15 | + use IconTrait, TextFieldsTrait, FieldTrait; |
|
| 16 | 16 | |
| 17 | 17 | public function __construct($identifier, $type="text", $value="", $placeholder="") { |
| 18 | - parent::__construct("div-" . $identifier, "div", "ui input"); |
|
| 18 | + parent::__construct("div-".$identifier, "div", "ui input"); |
|
| 19 | 19 | $this->_identifier=$identifier; |
| 20 | 20 | $this->_libraryId=$identifier; |
| 21 | - $this->content=[ "field" => new HtmlInput5($identifier, $type, $value, $placeholder) ]; |
|
| 22 | - $this->_states=[ State::DISABLED,State::FOCUS,State::ERROR ]; |
|
| 23 | - $this->_variations=[ Variation::TRANSPARENT ]; |
|
| 21 | + $this->content=["field" => new HtmlInput5($identifier, $type, $value, $placeholder)]; |
|
| 22 | + $this->_states=[State::DISABLED, State::FOCUS, State::ERROR]; |
|
| 23 | + $this->_variations=[Variation::TRANSPARENT]; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | public function getField() { |
@@ -40,17 +40,17 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function run(JsUtils $js) { |
| 42 | 42 | $result=parent::run($js); |
| 43 | - $result->attach("#" . $this->getDataField()->getIdentifier()); |
|
| 43 | + $result->attach("#".$this->getDataField()->getIdentifier()); |
|
| 44 | 44 | return $result; |
| 45 | 45 | } |
| 46 | 46 | |
| 47 | - public function setTransparent(){ |
|
| 47 | + public function setTransparent() { |
|
| 48 | 48 | return $this->addToProperty("class", "transparent"); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL){ |
|
| 52 | - parent::compile_once($js,$view); |
|
| 53 | - if(isset($this->content['file'])){ |
|
| 51 | + public function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) { |
|
| 52 | + parent::compile_once($js, $view); |
|
| 53 | + if (isset($this->content['file'])) { |
|
| 54 | 54 | $this->onCreate(Javascript::fileUploadBehavior($this->identifier)); |
| 55 | 55 | } |
| 56 | 56 | } |
@@ -6,23 +6,23 @@ discard block |
||
| 6 | 6 | public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n"; |
| 7 | 7 | public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n"; |
| 8 | 8 | |
| 9 | - public static function draggable($attr="id"){ |
|
| 9 | + public static function draggable($attr="id") { |
|
| 10 | 10 | return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));'; |
| 11 | 11 | } |
| 12 | 12 | |
| 13 | - public static function dropZone($jqueryDone,$jsCallback=""){ |
|
| 13 | + public static function dropZone($jqueryDone, $jsCallback="") { |
|
| 14 | 14 | return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));$(event.target).'.$jqueryDone.'($("#"+_data.id));var data=_data.data;'.$jsCallback; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | - public static function containsCode($expression){ |
|
| 18 | - return strrpos($expression, 'this')!==false||strrpos($expression, 'event')!==false||strrpos($expression, 'self')!==false; |
|
| 17 | + public static function containsCode($expression) { |
|
| 18 | + return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public static function isFunction($jsCode){ |
|
| 21 | + public static function isFunction($jsCode) { |
|
| 22 | 22 | return JString::startswith($jsCode, "function"); |
| 23 | 23 | } |
| 24 | 24 | |
| 25 | - public static function fileUploadBehavior($id=''){ |
|
| 25 | + public static function fileUploadBehavior($id='') { |
|
| 26 | 26 | return "$('input:text, .ui.button', '#{$id}').on('click', function (e) {e.preventDefault();\$('input:file', '#{$id}').click();}); |
| 27 | 27 | $('input:file', '#{$id}').on('change', function (e) {if(e.target.files.length){var name = e.target.files[0].name;$('input:text', $(e.target).parent()).val(name);}});"; |
| 28 | 28 | } |
@@ -55,14 +55,14 @@ discard block |
||
| 55 | 55 | $value=implode(",", $value); |
| 56 | 56 | } |
| 57 | 57 | if (self::containsCode($value)===false) { |
| 58 | - $value=\str_replace(["\\","\""], ["\\\\","\\\""], $value); |
|
| 58 | + $value=\str_replace(["\\", "\""], ["\\\\", "\\\""], $value); |
|
| 59 | 59 | $value='"'.$value.'"'; |
| 60 | 60 | } |
| 61 | - return trim($value,"%"); |
|
| 61 | + return trim($value, "%"); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | - public static function prep_jquery_selector($value){ |
|
| 65 | - if(JString::startswith($value, '$(')===false){ |
|
| 64 | + public static function prep_jquery_selector($value) { |
|
| 65 | + if (JString::startswith($value, '$(')===false) { |
|
| 66 | 66 | return '$('.self::prep_value($value).')'; |
| 67 | 67 | } |
| 68 | 68 | return $value; |
@@ -15,56 +15,56 @@ discard block |
||
| 15 | 15 | |
| 16 | 16 | protected $ajaxTransition; |
| 17 | 17 | |
| 18 | - protected $ajaxLoader = "<div class=\"ui active centered inline text loader\">Loading</div>"; |
|
| 18 | + protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>"; |
|
| 19 | 19 | |
| 20 | 20 | abstract public function getUrl($url); |
| 21 | 21 | |
| 22 | - abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true); |
|
| 22 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
| 23 | 23 | |
| 24 | - abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true); |
|
| 24 | + abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true); |
|
| 25 | 25 | |
| 26 | - protected function _ajax($method, $url, $responseElement = "", $parameters = []) { |
|
| 26 | + protected function _ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 27 | 27 | if (isset($this->params["ajax"])) { |
| 28 | 28 | extract($this->params["ajax"]); |
| 29 | 29 | } |
| 30 | 30 | extract($parameters); |
| 31 | 31 | |
| 32 | - $jsCallback = isset($jsCallback) ? $jsCallback : ""; |
|
| 33 | - $retour = $this->_getAjaxUrl($url, $attr); |
|
| 34 | - $originalSelector = $responseElement; |
|
| 35 | - $responseElement = $this->_getResponseElement($responseElement); |
|
| 36 | - $retour .= "var self=this;\n"; |
|
| 37 | - $before = isset($before) ? $before : ""; |
|
| 38 | - $retour .= $before; |
|
| 39 | - if ($hasLoader === true && JString::isNotNull($responseElement)) { |
|
| 32 | + $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
|
| 33 | + $retour=$this->_getAjaxUrl($url, $attr); |
|
| 34 | + $originalSelector=$responseElement; |
|
| 35 | + $responseElement=$this->_getResponseElement($responseElement); |
|
| 36 | + $retour.="var self=this;\n"; |
|
| 37 | + $before=isset($before) ? $before : ""; |
|
| 38 | + $retour.=$before; |
|
| 39 | + if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
| 40 | 40 | $this->addLoading($retour, $responseElement, $ajaxLoader); |
| 41 | - } elseif ($hasLoader === "internal") { |
|
| 42 | - $retour .= "\n$(this).addClass('loading');"; |
|
| 41 | + } elseif ($hasLoader==="internal") { |
|
| 42 | + $retour.="\n$(this).addClass('loading');"; |
|
| 43 | 43 | } |
| 44 | - $ajaxParameters = [ |
|
| 44 | + $ajaxParameters=[ |
|
| 45 | 45 | "url" => "url", |
| 46 | - "method" => "'" . \strtoupper($method) . "'" |
|
| 46 | + "method" => "'".\strtoupper($method)."'" |
|
| 47 | 47 | ]; |
| 48 | 48 | |
| 49 | - $ajaxParameters["async"] = ($async ? "true" : "false"); |
|
| 49 | + $ajaxParameters["async"]=($async ? "true" : "false"); |
|
| 50 | 50 | |
| 51 | 51 | if (isset($params)) { |
| 52 | - $ajaxParameters["data"] = self::_correctParams($params, $parameters); |
|
| 52 | + $ajaxParameters["data"]=self::_correctParams($params, $parameters); |
|
| 53 | 53 | } |
| 54 | 54 | if (isset($headers)) { |
| 55 | - $ajaxParameters["headers"] = $headers; |
|
| 55 | + $ajaxParameters["headers"]=$headers; |
|
| 56 | 56 | } |
| 57 | 57 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 58 | - $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n"; |
|
| 59 | - $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n"; |
|
| 60 | - $retour = $this->_addJsCondition($jsCondition, $retour); |
|
| 58 | + $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
|
| 59 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n"; |
|
| 60 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
| 61 | 61 | if ($immediatly) |
| 62 | - $this->jquery_code_for_compile[] = $retour; |
|
| 62 | + $this->jquery_code_for_compile[]=$retour; |
|
| 63 | 63 | return $retour; |
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | protected function createAjaxParameters(&$original, $parameters) { |
| 67 | - $validParameters = [ |
|
| 67 | + $validParameters=[ |
|
| 68 | 68 | "contentType" => "%value%", |
| 69 | 69 | "dataType" => "'%value%'", |
| 70 | 70 | "beforeSend" => "function(jqXHR,settings){%value%}", |
@@ -73,21 +73,21 @@ discard block |
||
| 73 | 73 | ]; |
| 74 | 74 | foreach ($validParameters as $param => $mask) { |
| 75 | 75 | if (isset($parameters[$param])) { |
| 76 | - $original[$param] = \str_replace("%value%", $parameters[$param], $mask); |
|
| 76 | + $original[$param]=\str_replace("%value%", $parameters[$param], $mask); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | protected function implodeAjaxParameters($ajaxParameters) { |
| 82 | - $s = ''; |
|
| 82 | + $s=''; |
|
| 83 | 83 | foreach ($ajaxParameters as $k => $v) { |
| 84 | - if ($s !== '') { |
|
| 85 | - $s .= ','; |
|
| 84 | + if ($s!=='') { |
|
| 85 | + $s.=','; |
|
| 86 | 86 | } |
| 87 | 87 | if (is_array($v)) { |
| 88 | - $s .= "'{$k}':{" . self::implodeAjaxParameters($v) . "}"; |
|
| 88 | + $s.="'{$k}':{".self::implodeAjaxParameters($v)."}"; |
|
| 89 | 89 | } else { |
| 90 | - $s .= "'{$k}':{$v}"; |
|
| 90 | + $s.="'{$k}':{$v}"; |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | return $s; |
@@ -95,27 +95,27 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | protected function _addJsCondition($jsCondition, $jsSource) { |
| 97 | 97 | if (isset($jsCondition)) { |
| 98 | - return "if(" . $jsCondition . "){\n" . $jsSource . "\n}"; |
|
| 98 | + return "if(".$jsCondition."){\n".$jsSource."\n}"; |
|
| 99 | 99 | } |
| 100 | 100 | return $jsSource; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | protected function _getAjaxUrl($url, $attr) { |
| 104 | - $url = $this->_correctAjaxUrl($url); |
|
| 105 | - $retour = "url='" . $url . "';"; |
|
| 106 | - $slash = "/"; |
|
| 107 | - if (JString::endswith($url, "/") === true) { |
|
| 108 | - $slash = ""; |
|
| 104 | + $url=$this->_correctAjaxUrl($url); |
|
| 105 | + $retour="url='".$url."';"; |
|
| 106 | + $slash="/"; |
|
| 107 | + if (JString::endswith($url, "/")===true) { |
|
| 108 | + $slash=""; |
|
| 109 | 109 | } |
| 110 | 110 | if (JString::isNotNull($attr)) { |
| 111 | - if ($attr === "value") { |
|
| 112 | - $retour .= "url=url+'" . $slash . "'+$(this).val();\n"; |
|
| 113 | - } elseif ($attr === "html") { |
|
| 114 | - $retour .= "url=url+'" . $slash . "'+$(this).html();\n"; |
|
| 115 | - } elseif (\substr($attr, 0, 3) === "js:") { |
|
| 116 | - $retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n"; |
|
| 117 | - } elseif ($attr !== null && $attr !== "") |
|
| 118 | - $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
| 111 | + if ($attr==="value") { |
|
| 112 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
| 113 | + } elseif ($attr==="html") { |
|
| 114 | + $retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
| 115 | + } elseif (\substr($attr, 0, 3)==="js:") { |
|
| 116 | + $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
|
| 117 | + } elseif ($attr!==null && $attr!=="") |
|
| 118 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 119 | 119 | } |
| 120 | 120 | return $retour; |
| 121 | 121 | } |
@@ -124,91 +124,91 @@ discard block |
||
| 124 | 124 | return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};"; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - protected function autoActiveLinks($previousURL = "window.location.href") { |
|
| 128 | - $result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
| 129 | - $result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;"; |
|
| 127 | + protected function autoActiveLinks($previousURL="window.location.href") { |
|
| 128 | + $result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
| 129 | + $result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;"; |
|
| 130 | 130 | return $result; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) { |
|
| 134 | - $retour = ""; |
|
| 135 | - $call = null; |
|
| 133 | + protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) { |
|
| 134 | + $retour=""; |
|
| 135 | + $call=null; |
|
| 136 | 136 | if (JString::isNotNull($responseElement)) { |
| 137 | 137 | if (isset($ajaxTransition)) { |
| 138 | - $call = $this->setAjaxDataCall($ajaxTransition); |
|
| 138 | + $call=$this->setAjaxDataCall($ajaxTransition); |
|
| 139 | 139 | } elseif (isset($this->ajaxTransition)) { |
| 140 | - $call = $this->ajaxTransition; |
|
| 140 | + $call=$this->ajaxTransition; |
|
| 141 | 141 | } |
| 142 | 142 | if (\is_callable($call)) |
| 143 | - $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 143 | + $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
| 144 | 144 | else |
| 145 | - $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 145 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 146 | 146 | } |
| 147 | 147 | if (isset($history)) { |
| 148 | 148 | if ($this->params["autoActiveLinks"]) { |
| 149 | - $retour .= $this->autoActiveLinks("url"); |
|
| 149 | + $retour.=$this->autoActiveLinks("url"); |
|
| 150 | 150 | } |
| 151 | - $retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value($history) . ",'jqueryDone':'{$jqueryDone}'},'', url);"; |
|
| 151 | + $retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);"; |
|
| 152 | 152 | } |
| 153 | - if ($hasLoader === "internal") { |
|
| 154 | - $retour .= "\n$(self).removeClass('loading');"; |
|
| 153 | + if ($hasLoader==="internal") { |
|
| 154 | + $retour.="\n$(self).removeClass('loading');"; |
|
| 155 | 155 | } |
| 156 | - $retour .= "\t" . $jsCallback . "\n"; |
|
| 156 | + $retour.="\t".$jsCallback."\n"; |
|
| 157 | 157 | return $retour; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | protected function _getResponseElement($responseElement) { |
| 161 | 161 | if (JString::isNotNull($responseElement)) { |
| 162 | - $responseElement = Javascript::prep_jquery_selector($responseElement); |
|
| 162 | + $responseElement=Javascript::prep_jquery_selector($responseElement); |
|
| 163 | 163 | } |
| 164 | 164 | return $responseElement; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | protected function _correctAjaxUrl($url) { |
| 168 | - if ($url !== "/" && JString::endsWith($url, "/") === true) |
|
| 169 | - $url = substr($url, 0, strlen($url) - 1); |
|
| 170 | - if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) { |
|
| 171 | - $url = $this->getUrl($url); |
|
| 168 | + if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 169 | + $url=substr($url, 0, strlen($url)-1); |
|
| 170 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
| 171 | + $url=$this->getUrl($url); |
|
| 172 | 172 | } |
| 173 | 173 | return $url; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - public static function _correctParams($params, $ajaxParameters = []) { |
|
| 176 | + public static function _correctParams($params, $ajaxParameters=[]) { |
|
| 177 | 177 | if (JString::isNull($params)) { |
| 178 | 178 | return ""; |
| 179 | 179 | } |
| 180 | 180 | if (\preg_match("@^\{.*?\}$@", $params)) { |
| 181 | - if (! isset($ajaxParameters['contentType']) || ! JString::contains($ajaxParameters['contentType'], 'json')) { |
|
| 182 | - return '$.param(' . $params . ')'; |
|
| 181 | + if (!isset($ajaxParameters['contentType']) || !JString::contains($ajaxParameters['contentType'], 'json')) { |
|
| 182 | + return '$.param('.$params.')'; |
|
| 183 | 183 | } else { |
| 184 | - return 'JSON.stringify(' . $params . ')'; |
|
| 184 | + return 'JSON.stringify('.$params.')'; |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | return $params; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | public static function _implodeParams($parameters) { |
| 191 | - $allParameters = []; |
|
| 191 | + $allParameters=[]; |
|
| 192 | 192 | foreach ($parameters as $params) { |
| 193 | 193 | if (isset($params)) |
| 194 | - $allParameters[] = self::_correctParams($params); |
|
| 194 | + $allParameters[]=self::_correctParams($params); |
|
| 195 | 195 | } |
| 196 | 196 | return \implode("+'&'+", $allParameters); |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) { |
|
| 200 | - if (! isset($ajaxLoader)) { |
|
| 201 | - $ajaxLoader = $this->ajaxLoader; |
|
| 199 | + protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) { |
|
| 200 | + if (!isset($ajaxLoader)) { |
|
| 201 | + $ajaxLoader=$this->ajaxLoader; |
|
| 202 | 202 | } |
| 203 | - $loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>'; |
|
| 204 | - $retour .= "{$responseElement}.empty();\n"; |
|
| 205 | - $retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
|
| 203 | + $loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>'; |
|
| 204 | + $retour.="{$responseElement}.empty();\n"; |
|
| 205 | + $retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | protected function setAjaxDataCall($params) { |
| 209 | - $result = null; |
|
| 210 | - if (! \is_callable($params)) { |
|
| 211 | - $result = function ($responseElement, $jqueryDone = "html") use ($params) { |
|
| 209 | + $result=null; |
|
| 210 | + if (!\is_callable($params)) { |
|
| 211 | + $result=function($responseElement, $jqueryDone="html") use ($params) { |
|
| 212 | 212 | return AjaxTransition::{$params}($responseElement, $jqueryDone); |
| 213 | 213 | }; |
| 214 | 214 | } |
@@ -217,13 +217,13 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | protected function setDefaultParameters(&$parameters, $default) { |
| 219 | 219 | foreach ($default as $k => $v) { |
| 220 | - if (! isset($parameters[$k])) |
|
| 221 | - $parameters[$k] = $v; |
|
| 220 | + if (!isset($parameters[$k])) |
|
| 221 | + $parameters[$k]=$v; |
|
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | public function setAjaxLoader($loader) { |
| 226 | - $this->ajaxLoader = $loader; |
|
| 226 | + $this->ajaxLoader=$loader; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * @param string $responseElement |
| 235 | 235 | * selector of the HTML element displaying the answer |
| 236 | 236 | */ |
| 237 | - private function _get($url, $responseElement = "", $parameters = []) { |
|
| 237 | + private function _get($url, $responseElement="", $parameters=[]) { |
|
| 238 | 238 | return $this->_ajax("get", $url, $responseElement, $parameters); |
| 239 | 239 | } |
| 240 | 240 | |
@@ -248,8 +248,8 @@ discard block |
||
| 248 | 248 | * @param array $parameters |
| 249 | 249 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 250 | 250 | */ |
| 251 | - public function get($url, $responseElement = "", $parameters = []) { |
|
| 252 | - $parameters["immediatly"] = true; |
|
| 251 | + public function get($url, $responseElement="", $parameters=[]) { |
|
| 252 | + $parameters["immediatly"]=true; |
|
| 253 | 253 | return $this->_get($url, $responseElement, $parameters); |
| 254 | 254 | } |
| 255 | 255 | |
@@ -265,8 +265,8 @@ discard block |
||
| 265 | 265 | * @param array $parameters |
| 266 | 266 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 267 | 267 | */ |
| 268 | - public function ajax($method, $url, $responseElement = "", $parameters = []) { |
|
| 269 | - $parameters["immediatly"] = true; |
|
| 268 | + public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 269 | + $parameters["immediatly"]=true; |
|
| 270 | 270 | return $this->_ajax($method, $url, $responseElement, $parameters); |
| 271 | 271 | } |
| 272 | 272 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | * The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 287 | 287 | * @return string |
| 288 | 288 | */ |
| 289 | - public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = []) { |
|
| 289 | + public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) { |
|
| 290 | 290 | return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName); |
| 291 | 291 | } |
| 292 | 292 | |
@@ -302,8 +302,8 @@ discard block |
||
| 302 | 302 | * @param array $parameters |
| 303 | 303 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 304 | 304 | */ |
| 305 | - public function ajaxDeferred($method, $url, $responseElement = "", $parameters = []) { |
|
| 306 | - $parameters["immediatly"] = false; |
|
| 305 | + public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
| 306 | + $parameters["immediatly"]=false; |
|
| 307 | 307 | return $this->_ajax($method, $url, $responseElement, $parameters); |
| 308 | 308 | } |
| 309 | 309 | |
@@ -317,15 +317,15 @@ discard block |
||
| 317 | 317 | * @param array $parameters |
| 318 | 318 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 319 | 319 | */ |
| 320 | - private function _json($url, $method = "get", $parameters = []) { |
|
| 321 | - $parameters = \array_merge($parameters, [ |
|
| 320 | + private function _json($url, $method="get", $parameters=[]) { |
|
| 321 | + $parameters=\array_merge($parameters, [ |
|
| 322 | 322 | "hasLoader" => false |
| 323 | 323 | ]); |
| 324 | - $jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 325 | - $context = isset($parameters['context']) ? $parameters['context'] : "document"; |
|
| 326 | - $retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n"; |
|
| 327 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 328 | - $parameters["jsCallback"] = $retour; |
|
| 324 | + $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 325 | + $context=isset($parameters['context']) ? $parameters['context'] : "document"; |
|
| 326 | + $retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"."\n\tfor(var key in data){"."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n"; |
|
| 327 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 328 | + $parameters["jsCallback"]=$retour; |
|
| 329 | 329 | return $this->_ajax($method, $url, null, $parameters); |
| 330 | 330 | } |
| 331 | 331 | |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | * @param array $parameters |
| 340 | 340 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 341 | 341 | */ |
| 342 | - public function json($url, $method = "get", $parameters = []) { |
|
| 342 | + public function json($url, $method="get", $parameters=[]) { |
|
| 343 | 343 | return $this->_json($url, $method, $parameters); |
| 344 | 344 | } |
| 345 | 345 | |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | * @param array $parameters |
| 356 | 356 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
| 357 | 357 | */ |
| 358 | - public function jsonOn($event, $element, $url, $method = "get", $parameters = array()) { |
|
| 358 | + public function jsonOn($event, $element, $url, $method="get", $parameters=array()) { |
|
| 359 | 359 | $this->setDefaultParameters($parameters, [ |
| 360 | 360 | "preventDefault" => true, |
| 361 | 361 | "stopPropagation" => true, |
@@ -374,8 +374,8 @@ discard block |
||
| 374 | 374 | * @param array $parameters |
| 375 | 375 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 376 | 376 | */ |
| 377 | - public function jsonDeferred($url, $method = "get", $parameters = []) { |
|
| 378 | - $parameters["immediatly"] = false; |
|
| 377 | + public function jsonDeferred($url, $method="get", $parameters=[]) { |
|
| 378 | + $parameters["immediatly"]=false; |
|
| 379 | 379 | return $this->_json($url, $method, $parameters); |
| 380 | 380 | } |
| 381 | 381 | |
@@ -390,29 +390,29 @@ discard block |
||
| 390 | 390 | * @param array $parameters |
| 391 | 391 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
| 392 | 392 | */ |
| 393 | - private function _jsonArray($maskSelector, $url, $method = "get", $parameters = []) { |
|
| 394 | - $parameters = \array_merge($parameters, [ |
|
| 393 | + private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
|
| 394 | + $parameters=\array_merge($parameters, [ |
|
| 395 | 395 | "hasLoader" => false |
| 396 | 396 | ]); |
| 397 | - $rowClass = isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
|
| 398 | - $jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 399 | - $context = isset($parameters['context']) ? $parameters['context'] : null; |
|
| 400 | - if ($context === null) { |
|
| 401 | - $parent = "$('" . $maskSelector . "').parent()"; |
|
| 402 | - $newElm = "$('#'+newId)"; |
|
| 397 | + $rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
|
| 398 | + $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 399 | + $context=isset($parameters['context']) ? $parameters['context'] : null; |
|
| 400 | + if ($context===null) { |
|
| 401 | + $parent="$('".$maskSelector."').parent()"; |
|
| 402 | + $newElm="$('#'+newId)"; |
|
| 403 | 403 | } else { |
| 404 | - $parent = $context; |
|
| 405 | - $newElm = $context . ".find('#'+newId)"; |
|
| 404 | + $parent=$context; |
|
| 405 | + $newElm=$context.".find('#'+newId)"; |
|
| 406 | 406 | } |
| 407 | - $appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n"; |
|
| 408 | - $retour = $parent . ".find('.{$rowClass}').remove();"; |
|
| 409 | - $retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n" . "\tvar created=false;var maskElm=$('" . $maskSelector . "').first();maskElm.hide();" . "\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;" . "\tvar newElm=" . $newElm . ";\n" . "\tif(!newElm.length){\n" . "\t\tnewElm=maskElm.clone(); |
|
| 407 | + $appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
|
| 408 | + $retour=$parent.".find('.{$rowClass}').remove();"; |
|
| 409 | + $retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone(); |
|
| 410 | 410 | newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n"; |
| 411 | - $retour .= $appendTo; |
|
| 412 | - $retour .= "\t}\n" . "\tfor(var key in value){\n" . "\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n" . "\t\t\tif(html.indexOf('__'+key+'__')>-1){\n" . "\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n" . "\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n" . "\t\t\t}\n" . "\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n" . "\t\t\tvar selElm=$(sel,newElm);\n" . "\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n" . "\t\t}\n" . "}\n" . "\t$(newElm).show(true);" . "\n" . "\t$(newElm).removeClass('hide');" . "});\n"; |
|
| 413 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 414 | - $retour .= "\t" . $jsCallback; |
|
| 415 | - $parameters["jsCallback"] = $retour; |
|
| 411 | + $retour.=$appendTo; |
|
| 412 | + $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
|
| 413 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 414 | + $retour.="\t".$jsCallback; |
|
| 415 | + $parameters["jsCallback"]=$retour; |
|
| 416 | 416 | return $this->_ajax($method, $url, null, $parameters); |
| 417 | 417 | } |
| 418 | 418 | |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | * @param array $parameters |
| 428 | 428 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
| 429 | 429 | */ |
| 430 | - public function jsonArray($maskSelector, $url, $method = "get", $parameters = []) { |
|
| 430 | + public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
|
| 431 | 431 | return $this->_jsonArray($maskSelector, $url, $method, $parameters); |
| 432 | 432 | } |
| 433 | 433 | |
@@ -442,8 +442,8 @@ discard block |
||
| 442 | 442 | * @param array $parameters |
| 443 | 443 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json") |
| 444 | 444 | */ |
| 445 | - public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters) { |
|
| 446 | - $parameters["immediatly"] = false; |
|
| 445 | + public function jsonArrayDeferred($maskSelector, $url, $method="get", $parameters) { |
|
| 446 | + $parameters["immediatly"]=false; |
|
| 447 | 447 | return $this->jsonArray($maskSelector, $url, $method, $parameters); |
| 448 | 448 | } |
| 449 | 449 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | * @param array $parameters |
| 460 | 460 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
| 461 | 461 | */ |
| 462 | - public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array()) { |
|
| 462 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) { |
|
| 463 | 463 | $this->setDefaultParameters($parameters, [ |
| 464 | 464 | "preventDefault" => true, |
| 465 | 465 | "stopPropagation" => true, |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | * @param array $parameters |
| 480 | 480 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 481 | 481 | */ |
| 482 | - public function getDeferred($url, $responseElement = "", $parameters = []) { |
|
| 483 | - $parameters["immediatly"] = false; |
|
| 482 | + public function getDeferred($url, $responseElement="", $parameters=[]) { |
|
| 483 | + $parameters["immediatly"]=false; |
|
| 484 | 484 | return $this->_get($url, $responseElement, $parameters); |
| 485 | 485 | } |
| 486 | 486 | |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | * @param array $parameters |
| 500 | 500 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
| 501 | 501 | */ |
| 502 | - public function getOn($event, $element, $url, $responseElement = "", $parameters = array()) { |
|
| 502 | + public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
|
| 503 | 503 | $this->setDefaultParameters($parameters, [ |
| 504 | 504 | "preventDefault" => true, |
| 505 | 505 | "stopPropagation" => true, |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | * @param array $parameters |
| 524 | 524 | * default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 525 | 525 | */ |
| 526 | - public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array()) { |
|
| 526 | + public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
|
| 527 | 527 | $this->setDefaultParameters($parameters, [ |
| 528 | 528 | "preventDefault" => true, |
| 529 | 529 | "stopPropagation" => true, |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | * @param array $parameters |
| 547 | 547 | * default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 548 | 548 | */ |
| 549 | - public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array()) { |
|
| 549 | + public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) { |
|
| 550 | 550 | return $this->ajaxOn("click", $element, $url, $responseElement, $parameters); |
| 551 | 551 | } |
| 552 | 552 | |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | * @param array $parameters |
| 564 | 564 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 565 | 565 | */ |
| 566 | - public function getOnClick($element, $url, $responseElement = "", $parameters = array()) { |
|
| 566 | + public function getOnClick($element, $url, $responseElement="", $parameters=array()) { |
|
| 567 | 567 | return $this->getOn("click", $element, $url, $responseElement, $parameters); |
| 568 | 568 | } |
| 569 | 569 | |
@@ -578,15 +578,15 @@ discard block |
||
| 578 | 578 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true) |
| 579 | 579 | * @return $this |
| 580 | 580 | */ |
| 581 | - public function getHref($element, $responseElement = "", $parameters = array()) { |
|
| 582 | - $parameters["attr"] = "href"; |
|
| 581 | + public function getHref($element, $responseElement="", $parameters=array()) { |
|
| 582 | + $parameters["attr"]="href"; |
|
| 583 | 583 | if (JString::isNull($responseElement)) { |
| 584 | - $responseElement = '%$(self).attr("data-target")%'; |
|
| 584 | + $responseElement='%$(self).attr("data-target")%'; |
|
| 585 | 585 | } else { |
| 586 | - $responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%'; |
|
| 586 | + $responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%'; |
|
| 587 | 587 | } |
| 588 | - if (! isset($parameters["historize"])) { |
|
| 589 | - $parameters["historize"] = true; |
|
| 588 | + if (!isset($parameters["historize"])) { |
|
| 589 | + $parameters["historize"]=true; |
|
| 590 | 590 | } |
| 591 | 591 | return $this->getOnClick($element, "", $responseElement, $parameters); |
| 592 | 592 | } |
@@ -602,21 +602,21 @@ discard block |
||
| 602 | 602 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true) |
| 603 | 603 | * @return $this |
| 604 | 604 | */ |
| 605 | - public function postHref($element, $responseElement = "", $parameters = array()) { |
|
| 606 | - $parameters["attr"] = "href"; |
|
| 605 | + public function postHref($element, $responseElement="", $parameters=array()) { |
|
| 606 | + $parameters["attr"]="href"; |
|
| 607 | 607 | if (JString::isNull($responseElement)) { |
| 608 | - $responseElement = '%$(this).attr("data-target")%'; |
|
| 608 | + $responseElement='%$(this).attr("data-target")%'; |
|
| 609 | 609 | } else { |
| 610 | - $responseElement = '%$(self).attr("data-target") || "' . $responseElement . '"%'; |
|
| 610 | + $responseElement='%$(self).attr("data-target") || "'.$responseElement.'"%'; |
|
| 611 | 611 | } |
| 612 | - if (! isset($parameters["historize"])) { |
|
| 613 | - $parameters["historize"] = true; |
|
| 612 | + if (!isset($parameters["historize"])) { |
|
| 613 | + $parameters["historize"]=true; |
|
| 614 | 614 | } |
| 615 | 615 | return $this->postOnClick($element, "", "{}", $responseElement, $parameters); |
| 616 | 616 | } |
| 617 | 617 | |
| 618 | - private function _post($url, $params = "{}", $responseElement = "", $parameters = []) { |
|
| 619 | - $parameters["params"] = $params; |
|
| 618 | + private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 619 | + $parameters["params"]=$params; |
|
| 620 | 620 | return $this->_ajax("POST", $url, $responseElement, $parameters); |
| 621 | 621 | } |
| 622 | 622 | |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | * @param array $parameters |
| 633 | 633 | * default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 634 | 634 | */ |
| 635 | - public function post($url, $params = "{}", $responseElement = "", $parameters = []) { |
|
| 635 | + public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 636 | 636 | return $this->_post($url, $params, $responseElement, $parameters); |
| 637 | 637 | } |
| 638 | 638 | |
@@ -649,8 +649,8 @@ discard block |
||
| 649 | 649 | * @param array $parameters |
| 650 | 650 | * default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 651 | 651 | */ |
| 652 | - public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = []) { |
|
| 653 | - $parameters["immediatly"] = false; |
|
| 652 | + public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 653 | + $parameters["immediatly"]=false; |
|
| 654 | 654 | return $this->_post($url, $params, $responseElement, $parameters); |
| 655 | 655 | } |
| 656 | 656 | |
@@ -669,7 +669,7 @@ discard block |
||
| 669 | 669 | * @param array $parameters |
| 670 | 670 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 671 | 671 | */ |
| 672 | - public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array()) { |
|
| 672 | + public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 673 | 673 | $this->setDefaultParameters($parameters, [ |
| 674 | 674 | "preventDefault" => true, |
| 675 | 675 | "stopPropagation" => true, |
@@ -692,58 +692,58 @@ discard block |
||
| 692 | 692 | * @param array $parameters |
| 693 | 693 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 694 | 694 | */ |
| 695 | - public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array()) { |
|
| 695 | + public function postOnClick($element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 696 | 696 | return $this->postOn("click", $element, $url, $params, $responseElement, $parameters); |
| 697 | 697 | } |
| 698 | 698 | |
| 699 | - private function _postForm($url, $form, $responseElement, $parameters = []) { |
|
| 699 | + private function _postForm($url, $form, $responseElement, $parameters=[]) { |
|
| 700 | 700 | if (isset($this->params["ajax"])) { |
| 701 | 701 | extract($this->params["ajax"]); |
| 702 | 702 | } |
| 703 | - $params = "{}"; |
|
| 704 | - $validation = false; |
|
| 703 | + $params="{}"; |
|
| 704 | + $validation=false; |
|
| 705 | 705 | \extract($parameters); |
| 706 | - $async = ($async) ? "true" : "false"; |
|
| 707 | - $jsCallback = isset($jsCallback) ? $jsCallback : ""; |
|
| 708 | - $retour = $this->_getAjaxUrl($url, $attr); |
|
| 709 | - $retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');"; |
|
| 710 | - if(!isset($contentType) || $contentType!='false'){ |
|
| 711 | - $retour .= "\nvar params=$('#" . $form . "').serialize();\n"; |
|
| 706 | + $async=($async) ? "true" : "false"; |
|
| 707 | + $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
|
| 708 | + $retour=$this->_getAjaxUrl($url, $attr); |
|
| 709 | + $retour.="\n$('#".$form."').trigger('ajaxSubmit');"; |
|
| 710 | + if (!isset($contentType) || $contentType!='false') { |
|
| 711 | + $retour.="\nvar params=$('#".$form."').serialize();\n"; |
|
| 712 | 712 | if (isset($params)) { |
| 713 | - $retour .= "params+='&'+" . self::_correctParams($params) . ";\n"; |
|
| 713 | + $retour.="params+='&'+".self::_correctParams($params).";\n"; |
|
| 714 | 714 | } |
| 715 | - }else{ |
|
| 716 | - $retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n"; |
|
| 715 | + } else { |
|
| 716 | + $retour.="\nvar params=new FormData($('#".$form."')[0]);\n"; |
|
| 717 | 717 | } |
| 718 | - $responseElement = $this->_getResponseElement($responseElement); |
|
| 719 | - $retour .= "var self=this;\n"; |
|
| 720 | - if ($hasLoader === true) { |
|
| 718 | + $responseElement=$this->_getResponseElement($responseElement); |
|
| 719 | + $retour.="var self=this;\n"; |
|
| 720 | + if ($hasLoader===true) { |
|
| 721 | 721 | $this->addLoading($retour, $responseElement, $ajaxLoader); |
| 722 | - } elseif ($hasLoader === "internal") { |
|
| 723 | - $retour .= "\n$(this).addClass('loading');"; |
|
| 722 | + } elseif ($hasLoader==="internal") { |
|
| 723 | + $retour.="\n$(this).addClass('loading');"; |
|
| 724 | 724 | } |
| 725 | - $ajaxParameters = [ |
|
| 725 | + $ajaxParameters=[ |
|
| 726 | 726 | "url" => "url", |
| 727 | 727 | "method" => "'POST'", |
| 728 | 728 | "data" => "params", |
| 729 | 729 | "async" => $async |
| 730 | 730 | ]; |
| 731 | 731 | if (isset($headers)) { |
| 732 | - $ajaxParameters["headers"] = $headers; |
|
| 732 | + $ajaxParameters["headers"]=$headers; |
|
| 733 | 733 | } |
| 734 | 734 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 735 | - $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n"; |
|
| 736 | - $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n"; |
|
| 735 | + $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
|
| 736 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n"; |
|
| 737 | 737 | |
| 738 | 738 | if ($validation) { |
| 739 | - $retour = "$('#" . $form . "').validate({submitHandler: function(form) { |
|
| 740 | - " . $retour . " |
|
| 739 | + $retour="$('#".$form."').validate({submitHandler: function(form) { |
|
| 740 | + " . $retour." |
|
| 741 | 741 | }});\n"; |
| 742 | - $retour .= "$('#" . $form . "').submit();\n"; |
|
| 742 | + $retour.="$('#".$form."').submit();\n"; |
|
| 743 | 743 | } |
| 744 | - $retour = $this->_addJsCondition($jsCondition, $retour); |
|
| 744 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
| 745 | 745 | if ($immediatly) |
| 746 | - $this->jquery_code_for_compile[] = $retour; |
|
| 746 | + $this->jquery_code_for_compile[]=$retour; |
|
| 747 | 747 | return $retour; |
| 748 | 748 | } |
| 749 | 749 | |
@@ -759,8 +759,8 @@ discard block |
||
| 759 | 759 | * @param array $parameters |
| 760 | 760 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 761 | 761 | */ |
| 762 | - public function postForm($url, $form, $responseElement, $parameters = []) { |
|
| 763 | - $parameters["immediatly"] = true; |
|
| 762 | + public function postForm($url, $form, $responseElement, $parameters=[]) { |
|
| 763 | + $parameters["immediatly"]=true; |
|
| 764 | 764 | return $this->_postForm($url, $form, $responseElement, $parameters); |
| 765 | 765 | } |
| 766 | 766 | |
@@ -777,8 +777,8 @@ discard block |
||
| 777 | 777 | * @param array $parameters |
| 778 | 778 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 779 | 779 | */ |
| 780 | - public function postFormDeferred($url, $form, $responseElement, $parameters = []) { |
|
| 781 | - $parameters["immediatly"] = false; |
|
| 780 | + public function postFormDeferred($url, $form, $responseElement, $parameters=[]) { |
|
| 781 | + $parameters["immediatly"]=false; |
|
| 782 | 782 | return $this->_postForm($url, $form, $responseElement, $parameters); |
| 783 | 783 | } |
| 784 | 784 | |
@@ -795,7 +795,7 @@ discard block |
||
| 795 | 795 | * @param array $parameters |
| 796 | 796 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
| 797 | 797 | */ |
| 798 | - public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array()) { |
|
| 798 | + public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
| 799 | 799 | $this->setDefaultParameters($parameters, [ |
| 800 | 800 | "preventDefault" => true, |
| 801 | 801 | "stopPropagation" => true, |
@@ -816,7 +816,7 @@ discard block |
||
| 816 | 816 | * @param array $parameters |
| 817 | 817 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
| 818 | 818 | */ |
| 819 | - public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array()) { |
|
| 819 | + public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) { |
|
| 820 | 820 | return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters); |
| 821 | 821 | } |
| 822 | 822 | } |
@@ -58,8 +58,9 @@ discard block |
||
| 58 | 58 | $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n"; |
| 59 | 59 | $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n"; |
| 60 | 60 | $retour = $this->_addJsCondition($jsCondition, $retour); |
| 61 | - if ($immediatly) |
|
| 62 | - $this->jquery_code_for_compile[] = $retour; |
|
| 61 | + if ($immediatly) { |
|
| 62 | + $this->jquery_code_for_compile[] = $retour; |
|
| 63 | + } |
|
| 63 | 64 | return $retour; |
| 64 | 65 | } |
| 65 | 66 | |
@@ -114,8 +115,9 @@ discard block |
||
| 114 | 115 | $retour .= "url=url+'" . $slash . "'+$(this).html();\n"; |
| 115 | 116 | } elseif (\substr($attr, 0, 3) === "js:") { |
| 116 | 117 | $retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n"; |
| 117 | - } elseif ($attr !== null && $attr !== "") |
|
| 118 | - $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
| 118 | + } elseif ($attr !== null && $attr !== "") { |
|
| 119 | + $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
| 120 | + } |
|
| 119 | 121 | } |
| 120 | 122 | return $retour; |
| 121 | 123 | } |
@@ -139,10 +141,11 @@ discard block |
||
| 139 | 141 | } elseif (isset($this->ajaxTransition)) { |
| 140 | 142 | $call = $this->ajaxTransition; |
| 141 | 143 | } |
| 142 | - if (\is_callable($call)) |
|
| 143 | - $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 144 | - else |
|
| 145 | - $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 144 | + if (\is_callable($call)) { |
|
| 145 | + $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 146 | + } else { |
|
| 147 | + $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 148 | + } |
|
| 146 | 149 | } |
| 147 | 150 | if (isset($history)) { |
| 148 | 151 | if ($this->params["autoActiveLinks"]) { |
@@ -165,8 +168,9 @@ discard block |
||
| 165 | 168 | } |
| 166 | 169 | |
| 167 | 170 | protected function _correctAjaxUrl($url) { |
| 168 | - if ($url !== "/" && JString::endsWith($url, "/") === true) |
|
| 169 | - $url = substr($url, 0, strlen($url) - 1); |
|
| 171 | + if ($url !== "/" && JString::endsWith($url, "/") === true) { |
|
| 172 | + $url = substr($url, 0, strlen($url) - 1); |
|
| 173 | + } |
|
| 170 | 174 | if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) { |
| 171 | 175 | $url = $this->getUrl($url); |
| 172 | 176 | } |
@@ -190,8 +194,9 @@ discard block |
||
| 190 | 194 | public static function _implodeParams($parameters) { |
| 191 | 195 | $allParameters = []; |
| 192 | 196 | foreach ($parameters as $params) { |
| 193 | - if (isset($params)) |
|
| 194 | - $allParameters[] = self::_correctParams($params); |
|
| 197 | + if (isset($params)) { |
|
| 198 | + $allParameters[] = self::_correctParams($params); |
|
| 199 | + } |
|
| 195 | 200 | } |
| 196 | 201 | return \implode("+'&'+", $allParameters); |
| 197 | 202 | } |
@@ -217,8 +222,9 @@ discard block |
||
| 217 | 222 | |
| 218 | 223 | protected function setDefaultParameters(&$parameters, $default) { |
| 219 | 224 | foreach ($default as $k => $v) { |
| 220 | - if (! isset($parameters[$k])) |
|
| 221 | - $parameters[$k] = $v; |
|
| 225 | + if (! isset($parameters[$k])) { |
|
| 226 | + $parameters[$k] = $v; |
|
| 227 | + } |
|
| 222 | 228 | } |
| 223 | 229 | } |
| 224 | 230 | |
@@ -712,7 +718,7 @@ discard block |
||
| 712 | 718 | if (isset($params)) { |
| 713 | 719 | $retour .= "params+='&'+" . self::_correctParams($params) . ";\n"; |
| 714 | 720 | } |
| 715 | - }else{ |
|
| 721 | + } else{ |
|
| 716 | 722 | $retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n"; |
| 717 | 723 | } |
| 718 | 724 | $responseElement = $this->_getResponseElement($responseElement); |
@@ -742,8 +748,9 @@ discard block |
||
| 742 | 748 | $retour .= "$('#" . $form . "').submit();\n"; |
| 743 | 749 | } |
| 744 | 750 | $retour = $this->_addJsCondition($jsCondition, $retour); |
| 745 | - if ($immediatly) |
|
| 746 | - $this->jquery_code_for_compile[] = $retour; |
|
| 751 | + if ($immediatly) { |
|
| 752 | + $this->jquery_code_for_compile[] = $retour; |
|
| 753 | + } |
|
| 747 | 754 | return $retour; |
| 748 | 755 | } |
| 749 | 756 | |
