mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-01-31 09:06:17 +00:00
Implemented 'mech7' patch to AjaxHelper. Closes #2844
git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@7050 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
047c5fc040
commit
027a90fab3
1 changed files with 2 additions and 2 deletions
|
@ -98,7 +98,7 @@ class AjaxHelper extends AppHelper {
|
|||
*
|
||||
* @var array
|
||||
*/
|
||||
var $editorOptions = array('okText', 'cancelText', 'savingText', 'formId', 'externalControl', 'rows', 'cols', 'size', 'highlightcolor', 'highlightendcolor', 'savingClassName', 'formClassName', 'loadTextURL', 'loadingText', 'callback', 'ajaxOptions', 'clickToEditText', 'collection');
|
||||
var $editorOptions = array('okText', 'cancelText', 'savingText', 'formId', 'externalControl', 'rows', 'cols', 'size', 'highlightcolor', 'highlightendcolor', 'savingClassName', 'formClassName', 'loadTextURL', 'loadingText', 'callback', 'ajaxOptions', 'clickToEditText', 'collection', 'okButton', 'cancelLink');
|
||||
/**
|
||||
* Options for auto-complete editor.
|
||||
*
|
||||
|
@ -607,7 +607,7 @@ class AjaxHelper extends AppHelper {
|
|||
unset($options['var']);
|
||||
}
|
||||
|
||||
$options = $this->_optionsToString($options, array('okText', 'cancelText', 'savingText', 'formId', 'externalControl', 'highlightcolor', 'highlightendcolor', 'savingClassName', 'formClassName', 'loadTextURL', 'loadingText', 'clickToEditText'));
|
||||
$options = $this->_optionsToString($options, array('okText', 'cancelText', 'savingText', 'formId', 'externalControl', 'highlightcolor', 'highlightendcolor', 'savingClassName', 'formClassName', 'loadTextURL', 'loadingText', 'clickToEditText', 'okButton', 'cancelLink'));
|
||||
$options = $this->_buildOptions($options, $this->editorOptions);
|
||||
return $this->Javascript->codeBlock("{$var}new Ajax.{$type}('{$id}', '{$url}', {$options});");
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue