@@ -13,19 +13,19 @@ discard block |
||
| 13 | 13 | */ |
| 14 | 14 | protected $content; |
| 15 | 15 | |
| 16 | - protected $wrapContentBefore = ""; |
|
| 16 | + protected $wrapContentBefore=""; |
|
| 17 | 17 | |
| 18 | - protected $wrapContentAfter = ""; |
|
| 18 | + protected $wrapContentAfter=""; |
|
| 19 | 19 | |
| 20 | 20 | protected $_editableContent; |
| 21 | 21 | |
| 22 | - public function __construct($identifier, $tagName = "p") { |
|
| 22 | + public function __construct($identifier, $tagName="p") { |
|
| 23 | 23 | parent::__construct($identifier, $tagName); |
| 24 | - $this->_template = '<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>'; |
|
| 24 | + $this->_template='<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>'; |
|
| 25 | 25 | } |
| 26 | 26 | |
| 27 | 27 | public function setContent($content) { |
| 28 | - $this->content = $content; |
|
| 28 | + $this->content=$content; |
|
| 29 | 29 | return $this; |
| 30 | 30 | } |
| 31 | 31 | |
@@ -33,19 +33,19 @@ discard block |
||
| 33 | 33 | return $this->content; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function addContent($content, $before = false) { |
|
| 37 | - if (! \is_array($this->content)) { |
|
| 36 | + public function addContent($content, $before=false) { |
|
| 37 | + if (!\is_array($this->content)) { |
|
| 38 | 38 | if (isset($this->content)) |
| 39 | - $this->content = array( |
|
| 39 | + $this->content=array( |
|
| 40 | 40 | $this->content |
| 41 | 41 | ); |
| 42 | 42 | else |
| 43 | - $this->content = array(); |
|
| 43 | + $this->content=array(); |
|
| 44 | 44 | } |
| 45 | 45 | if ($before) |
| 46 | 46 | array_unshift($this->content, $content); |
| 47 | 47 | else |
| 48 | - $this->content[] = $content; |
|
| 48 | + $this->content[]=$content; |
|
| 49 | 49 | return $this; |
| 50 | 50 | } |
| 51 | 51 | |
@@ -68,9 +68,9 @@ discard block |
||
| 68 | 68 | |
| 69 | 69 | public function setValue($value) {} |
| 70 | 70 | |
| 71 | - public function wrapContent($before, $after = "") { |
|
| 72 | - $this->wrapContentBefore .= $before; |
|
| 73 | - $this->wrapContentAfter = $after . $this->wrapContentAfter; |
|
| 71 | + public function wrapContent($before, $after="") { |
|
| 72 | + $this->wrapContentBefore.=$before; |
|
| 73 | + $this->wrapContentAfter=$after.$this->wrapContentAfter; |
|
| 74 | 74 | return $this; |
| 75 | 75 | } |
| 76 | 76 | |
@@ -89,14 +89,14 @@ discard block |
||
| 89 | 89 | } |
| 90 | 90 | |
| 91 | 91 | protected function _getContentInstances($class, $content) { |
| 92 | - $instances = []; |
|
| 92 | + $instances=[]; |
|
| 93 | 93 | if ($content instanceof $class) { |
| 94 | - $instances[] = $content; |
|
| 94 | + $instances[]=$content; |
|
| 95 | 95 | } elseif ($content instanceof HtmlDoubleElement) { |
| 96 | - $instances = \array_merge($instances, $content->getContentInstances($class)); |
|
| 96 | + $instances=\array_merge($instances, $content->getContentInstances($class)); |
|
| 97 | 97 | } elseif (\is_array($content)) { |
| 98 | 98 | foreach ($content as $element) { |
| 99 | - $instances = \array_merge($instances, $this->_getContentInstances($class, $element)); |
|
| 99 | + $instances=\array_merge($instances, $this->_getContentInstances($class, $element)); |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | return $instances; |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * |
| 108 | 108 | * @return HtmlDoubleElement |
| 109 | 109 | */ |
| 110 | - public function asLink($href = NULL, $target = NULL) { |
|
| 110 | + public function asLink($href=NULL, $target=NULL) { |
|
| 111 | 111 | if (isset($href)) |
| 112 | 112 | $this->setProperty("href", $href); |
| 113 | 113 | if (isset($target)) |
@@ -122,28 +122,28 @@ discard block |
||
| 122 | 122 | return strip_tags($this->content); |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - public function asEditable(HtmlFormField $field, $asForm = false, $setValueProperty = "val()") { |
|
| 126 | - $idF = $field->getIdentifier(); |
|
| 127 | - $idE = $idF; |
|
| 125 | + public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") { |
|
| 126 | + $idF=$field->getIdentifier(); |
|
| 127 | + $idE=$idF; |
|
| 128 | 128 | if ($asForm) { |
| 129 | - $frm = new HtmlForm("frm-" . $field->getIdentifier()); |
|
| 129 | + $frm=new HtmlForm("frm-".$field->getIdentifier()); |
|
| 130 | 130 | $frm->setProperty("onsubmit", "return false;"); |
| 131 | - $fields = $frm->addFields(); |
|
| 132 | - $idE = $frm->getIdentifier(); |
|
| 131 | + $fields=$frm->addFields(); |
|
| 132 | + $idE=$frm->getIdentifier(); |
|
| 133 | 133 | $fields->addItem($field); |
| 134 | - $fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});"); |
|
| 135 | - $fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#" . $idE . "').trigger('endEdit');"); |
|
| 136 | - $this->_editableContent = $frm; |
|
| 137 | - $keypress = ""; |
|
| 138 | - $focusOut = ""; |
|
| 134 | + $fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});"); |
|
| 135 | + $fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');"); |
|
| 136 | + $this->_editableContent=$frm; |
|
| 137 | + $keypress=""; |
|
| 138 | + $focusOut=""; |
|
| 139 | 139 | } else { |
| 140 | - $focusOut = "if(e.relatedTarget==null)elm.trigger('endEdit');"; |
|
| 141 | - $this->_editableContent = $field; |
|
| 142 | - $keypress = "$('#" . $idF . "').keyup(function(e){if(e.which == 13) {\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#" . $idE . "').trigger('endEdit');}});"; |
|
| 140 | + $focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');"; |
|
| 141 | + $this->_editableContent=$field; |
|
| 142 | + $keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});"; |
|
| 143 | 143 | } |
| 144 | 144 | $this->_editableContent->setProperty("style", "display:none;"); |
| 145 | - $this->onCreate("let idF='" . $idF . "';let idE='" . $idE . "';let elm=$('#'+idE);let self=$('#" . $this->getIdentifier() . "');" . $keypress . "elm.on('validate',function(){self.html($('#'+idE+' input')." . $setValueProperty . ");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){" . $focusOut . "});"); |
|
| 146 | - $this->onClick("let self=$(this);self.hide();" . $field->setJsContent("self.html()") . ";$('#" . $idF . " input').trigger('change');elm.show();$('#'+idE+' input').focus();"); |
|
| 145 | + $this->onCreate("let idF='".$idF."';let idE='".$idE."';let elm=$('#'+idE);let self=$('#".$this->getIdentifier()."');".$keypress."elm.on('validate',function(){self.html($('#'+idE+' input').".$setValueProperty.");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){".$focusOut."});"); |
|
| 146 | + $this->onClick("let self=$(this);self.hide();".$field->setJsContent("self.html()").";$('#".$idF." input').trigger('change');elm.show();$('#'+idE+' input').focus();"); |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | /** |
@@ -151,8 +151,8 @@ discard block |
||
| 151 | 151 | * {@inheritdoc} |
| 152 | 152 | * @see \Ajax\common\html\BaseHtml::compile_once() |
| 153 | 153 | */ |
| 154 | - protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) { |
|
| 155 | - if (! $this->_compiled && isset($this->_editableContent)) { |
|
| 154 | + protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) { |
|
| 155 | + if (!$this->_compiled && isset($this->_editableContent)) { |
|
| 156 | 156 | $this->wrap("", $this->_editableContent); |
| 157 | 157 | } |
| 158 | 158 | parent::compile_once($js, $view); |
@@ -35,17 +35,19 @@ discard block |
||
| 35 | 35 | |
| 36 | 36 | public function addContent($content, $before = false) { |
| 37 | 37 | if (! \is_array($this->content)) { |
| 38 | - if (isset($this->content)) |
|
| 39 | - $this->content = array( |
|
| 38 | + if (isset($this->content)) { |
|
| 39 | + $this->content = array( |
|
| 40 | 40 | $this->content |
| 41 | 41 | ); |
| 42 | - else |
|
| 43 | - $this->content = array(); |
|
| 42 | + } else { |
|
| 43 | + $this->content = array(); |
|
| 44 | + } |
|
| 45 | + } |
|
| 46 | + if ($before) { |
|
| 47 | + array_unshift($this->content, $content); |
|
| 48 | + } else { |
|
| 49 | + $this->content[] = $content; |
|
| 44 | 50 | } |
| 45 | - if ($before) |
|
| 46 | - array_unshift($this->content, $content); |
|
| 47 | - else |
|
| 48 | - $this->content[] = $content; |
|
| 49 | 51 | return $this; |
| 50 | 52 | } |
| 51 | 53 | |
@@ -108,10 +110,12 @@ discard block |
||
| 108 | 110 | * @return HtmlDoubleElement |
| 109 | 111 | */ |
| 110 | 112 | public function asLink($href = NULL, $target = NULL) { |
| 111 | - if (isset($href)) |
|
| 112 | - $this->setProperty("href", $href); |
|
| 113 | - if (isset($target)) |
|
| 114 | - $this->setProperty("target", $target); |
|
| 113 | + if (isset($href)) { |
|
| 114 | + $this->setProperty("href", $href); |
|
| 115 | + } |
|
| 116 | + if (isset($target)) { |
|
| 117 | + $this->setProperty("target", $target); |
|
| 118 | + } |
|
| 115 | 119 | return $this->setTagName("a"); |
| 116 | 120 | } |
| 117 | 121 | |