mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 03:18:26 +00:00
merging changes from [614]
git-svn-id: https://svn.cakephp.org/repo/trunk/cake@616 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut
parent
fbf4d9ee27
commit
e2af5c8608
7 changed files with 595 additions and 15 deletions
|
|
@ -496,7 +496,9 @@ class Controller extends Object
|
|||
|
||||
// get all of the column names.
|
||||
$classRegistry = ClassRegistry::getInstance();
|
||||
foreach ($classRegistry->getObject($table)->_table_info as $tables)
|
||||
$objRegistryModel = $classRegistry->getObject($table);
|
||||
|
||||
foreach ($objRegistryModel->_table_info as $tables)
|
||||
{
|
||||
foreach ($tables as $tabl)
|
||||
{
|
||||
|
|
@ -528,8 +530,8 @@ class Controller extends Object
|
|||
$fieldNames[ $tabl['name']]['tagName'] = $table.'/'.$tabl['name'];
|
||||
|
||||
// Now, find out if this is a required field.
|
||||
$validationFields = $classRegistry->getObject($table)->validate;
|
||||
|
||||
//$validationFields = $classRegistry->getObject($table)->validate;
|
||||
$validationFields = $objRegistryModel->validate;
|
||||
if( isset( $validationFields[ $tabl['name'] ] ) )
|
||||
{
|
||||
// Now, we know that this field has some validation set.
|
||||
|
|
@ -601,6 +603,8 @@ class Controller extends Object
|
|||
break;
|
||||
case "int":
|
||||
case "decimal":
|
||||
case "float":
|
||||
case "double":
|
||||
{
|
||||
//BUGBUG: Need a better way to determine if this field is an auto increment foreign key.
|
||||
// If it is a number, and it is a foreign key, we'll make a HUGE assumption that it is an auto increment field.
|
||||
|
|
@ -665,6 +669,7 @@ class Controller extends Object
|
|||
case "date":
|
||||
case "datetime":
|
||||
{
|
||||
if( 0 != strncmp( "created", $tabl['name'], 6 ) && 0 != strncmp("modified",$tabl['name'], 8) )
|
||||
$fieldNames[ $tabl['name']]['type'] = $type;
|
||||
}
|
||||
break;
|
||||
|
|
@ -675,7 +680,46 @@ class Controller extends Object
|
|||
|
||||
} // end switch
|
||||
}
|
||||
// now, add any necessary hasAndBelongsToMany list boxes
|
||||
// loop through the many to many relations to make a list box.
|
||||
foreach( $objRegistryModel->_manyToMany as $relation )
|
||||
{
|
||||
list($tableName, $field, $value, $joinTable, $key1, $key2) = $relation;
|
||||
|
||||
$otherModelName = Inflector::singularize($tableName);
|
||||
$otherModel = new $otherModelName();
|
||||
|
||||
if( $doCreateOptions )
|
||||
{
|
||||
$otherDisplayField = $otherModel->getDisplayField();
|
||||
$fieldNames[$tableName]['model'] = $tableName;
|
||||
$fieldNames[$tableName]['prompt'] = "Related ".Inflector::humanize($tableName);
|
||||
$fieldNames[$tableName]['type'] = "selectMultiple";
|
||||
$fieldNames[$tableName]['tagName'] = $tableName;
|
||||
|
||||
foreach( $otherModel->findAll() as $pass )
|
||||
{
|
||||
foreach( $pass as $key=>$value )
|
||||
{
|
||||
if( $key == $otherModelName && isset( $value['id'] ) && isset( $value[$otherDisplayField] ) )
|
||||
{
|
||||
$fieldNames[$tableName]['options'][$value['id']] = $value[$otherDisplayField];
|
||||
}
|
||||
}
|
||||
}
|
||||
if( isset( $data[$tableName] ) )
|
||||
{
|
||||
foreach( $data[$tableName] as $row )
|
||||
{
|
||||
$fieldNames[$tableName]['selected'][$row['id']] = $row['id'];
|
||||
}
|
||||
}
|
||||
}
|
||||
} // end loop through manytomany relations.
|
||||
}
|
||||
|
||||
|
||||
|
||||
return $fieldNames;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ uses('helpers/form');
|
|||
echo $html->formTag('/'.$this->name.'/update');
|
||||
|
||||
echo $form->generateFields( $html, $fieldNames );
|
||||
|
||||
|
||||
echo $form->generateSubmitDiv( $html, 'Save' )
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -38,13 +38,53 @@
|
|||
?>
|
||||
</ul>
|
||||
|
||||
<!--hasOne relationships -->
|
||||
<?php
|
||||
$objModel = $registry->getObject($modelName);
|
||||
|
||||
foreach ($objModel->_oneToOne as $relation)
|
||||
{
|
||||
list($table, $field, $value) = $relation;
|
||||
$otherModelName = Inflector::singularize($table);
|
||||
|
||||
echo "<div class='related'><H2>Related ".Inflector::humanize($otherModelName)."</H2>";
|
||||
echo "<dl>";
|
||||
if( isset($data[$otherModelName]) && is_array($data[$otherModelName]) )
|
||||
{
|
||||
foreach( $data[$otherModelName] as $field=>$value )
|
||||
{
|
||||
echo "<dt>".Inflector::humanize($field)."</dt>";
|
||||
if( isset($value) )
|
||||
{
|
||||
echo "<dd>".$value."</dd>";
|
||||
} else {
|
||||
echo "<dd> </dd>";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
echo "</dl>";
|
||||
echo "<ul class='actions'><li>".$html->linkTo('Edit '.Inflector::humanize($otherModelName),"/".Inflector::underscore($table)."/edit/{$data[$otherModelName]['id']}")."</li></ul>";
|
||||
}
|
||||
?>
|
||||
|
||||
<!-- HAS MANY AND HASANDBELONGSTOMANY -->
|
||||
<?php
|
||||
$relations = array();
|
||||
foreach( $objModel->_oneToMany as $relation )
|
||||
{
|
||||
|
||||
$count = 0;
|
||||
$relations[] = $relation;
|
||||
} // end loop through onetomany relations.
|
||||
|
||||
foreach( $objModel->_manyToMany as $relation )
|
||||
{
|
||||
$relations[] = $relation;
|
||||
} // end loop through manytomany relations.
|
||||
|
||||
foreach( $relations as $relation )
|
||||
{
|
||||
list($table, $field, $value) = $relation;
|
||||
$count = 0;
|
||||
$otherModelName = Inflector::singularize($table);
|
||||
|
||||
echo "<div class='related'><H2>Related ".Inflector::humanize($table)."</H2>";
|
||||
|
|
@ -90,6 +130,8 @@
|
|||
|
||||
echo "<li>".$html->linkTo('New '.Inflector::humanize($otherModelName),"/".Inflector::underscore($table)."/new/")."</li>";
|
||||
// echo "<li>".$html->linkTo( "View ".Inflector::humanize($table), "/".Inflector::underscore($table)."/list/".$modelName."/".$data[$modelName]['id'])."</li>";
|
||||
} // end loop through onetomany relations.
|
||||
?>
|
||||
</ul></div>
|
||||
</ul></div>
|
||||
|
||||
<?php } // end loop through relations
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
* @link https://trac.cakephp.org/wiki/Authors Authors/Developers
|
||||
* @package cake
|
||||
* @subpackage cake.libs.helpers
|
||||
* @since CakePHP v 0.9.1
|
||||
* @since CakePHP v 0.9.2
|
||||
* @version $Revision$
|
||||
* @modifiedby $LastChangedBy$
|
||||
* @lastmodified $Date$
|
||||
|
|
@ -39,11 +39,427 @@
|
|||
*
|
||||
* @package cake
|
||||
* @subpackage cake.libs.helpers
|
||||
* @since CakePHP v 0.9.1
|
||||
* @since CakePHP v 0.9.2
|
||||
*
|
||||
*/
|
||||
class AjaxHelper
|
||||
|
||||
uses('helpers/html', 'helpers/javascript');
|
||||
|
||||
|
||||
class AjaxHelper extends Helper
|
||||
{
|
||||
|
||||
/**
|
||||
* Returns link to remote action
|
||||
*
|
||||
* Returns a link to a remote action defined by <i>options[url]</i>
|
||||
* (using the urlFor format) that's called in the background using
|
||||
* XMLHttpRequest. The result of that request can then be inserted into a
|
||||
* DOM object whose id can be specified with <i>options[update]</i>.
|
||||
* Usually, the result would be a partial prepared by the controller with
|
||||
* either renderPartial or renderPartialCollection.
|
||||
*
|
||||
* Examples:
|
||||
* <code>
|
||||
* linkToRemote("Delete this post",
|
||||
* array("update" => "posts", "url" => "delete/{$postid->id}"));
|
||||
* linkToRemote(imageTag("refresh"),
|
||||
* array("update" => "emails", "url" => "list_emails" ));
|
||||
* </code>
|
||||
*
|
||||
* By default, these remote requests are processed asynchronous during
|
||||
* which various callbacks can be triggered (for progress indicators and
|
||||
* the likes).
|
||||
*
|
||||
* Example:
|
||||
* <code>
|
||||
* linkToRemote (word,
|
||||
* array("url" => "undo", "n" => word_counter),
|
||||
* array("complete" => "undoRequestCompleted(request)"));
|
||||
* </code>
|
||||
*
|
||||
* The callbacks that may be specified are:
|
||||
*
|
||||
* - <i>loading</i>:: Called when the remote document is being
|
||||
* loaded with data by the browser.
|
||||
* - <i>loaded</i>:: Called when the browser has finished loading
|
||||
* the remote document.
|
||||
* - <i>interactive</i>:: Called when the user can interact with the
|
||||
* remote document, even though it has not
|
||||
* finished loading.
|
||||
* - <i>complete</i>:: Called when the XMLHttpRequest is complete.
|
||||
*
|
||||
* If you for some reason or another need synchronous processing (that'll
|
||||
* block the browser while the request is happening), you can specify
|
||||
* <i>options[type] = synchronous</i>.
|
||||
*
|
||||
* You can customize further browser side call logic by passing
|
||||
* in Javascript code snippets via some optional parameters. In
|
||||
* their order of use these are:
|
||||
*
|
||||
* - <i>confirm</i>:: Adds confirmation dialog.
|
||||
* -<i>condition</i>:: Perform remote request conditionally
|
||||
* by this expression. Use this to
|
||||
* describe browser-side conditions when
|
||||
* request should not be initiated.
|
||||
* - <i>before</i>:: Called before request is initiated.
|
||||
* - <i>after</i>:: Called immediately after request was
|
||||
* initiated and before <i>loading</i>.
|
||||
*
|
||||
* @param HtmlHelper $html The HtmlHelper object which is creating link.
|
||||
* @param string $title title of link
|
||||
* @param array $options options for javascript function
|
||||
* @param array $html_options options for link
|
||||
* @return string html code for link to remote action
|
||||
*/
|
||||
function linkToRemote ($html, $title, $options = null, $html_options = null) {
|
||||
return $html->link($title, $this->remoteFunction($html, $options), $html_options);
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates javascript function for remote AJAX call
|
||||
*
|
||||
* This function creates the javascript needed to make a remote call
|
||||
* it is primarily used as a helper for linkToRemote.
|
||||
*
|
||||
* @see linkToRemote() for docs on options parameter.
|
||||
*
|
||||
* @param array $options options for javascript
|
||||
* @return string html code for link to remote action
|
||||
*/
|
||||
function remoteFunction ($html, $options = null) {
|
||||
$javascript_options = $this->__optionsForAjax($options);
|
||||
$func = isset($options['update']) ? "new Ajax.Updater('{$options['update']}', " : "new Ajax.Request(";
|
||||
|
||||
$func .= "'" . $html->url(isset($options['url']) ? $options['url'] : "") . "'";
|
||||
$func .= ", $javascript_options)";
|
||||
|
||||
if (isset($options['before'])) {
|
||||
$func .= "{$options['before']}; $function";
|
||||
}
|
||||
if (isset($options['after'])) {
|
||||
$func .= "$func; {$options['before']};";
|
||||
}
|
||||
if (isset($options['condition'])) {
|
||||
$func .= "if ({$options['condition']}) { $func; }";
|
||||
}
|
||||
if (isset($options['confirm'])) {
|
||||
$func .= "if (confirm('" . $this->escapeScript($options['confirm']) . "')) { $func; }";
|
||||
}
|
||||
return $func;
|
||||
}
|
||||
|
||||
/**
|
||||
* Periodically call remote url via AJAX.
|
||||
*
|
||||
* Periodically calls the specified url (<i>options[url]</i>) every <i>options[frequency]</i> seconds (default is 10).
|
||||
* Usually used to update a specified div (<i>options[update]</i>) with the results of the remote call.
|
||||
* The options for specifying the target with url and defining callbacks is the same as linkToRemote.
|
||||
*
|
||||
* @param JavascriptHelper $script script helper generating the block
|
||||
* @param array $options callback options
|
||||
* @return string javascript code
|
||||
*/
|
||||
function remoteTimer ($script, $options = null)
|
||||
{
|
||||
$frequency = (isset($options['frequency']))? $options['frequency'] : 10;
|
||||
$code = "new PeriodicalExecuter(function() {" . $this->remote_function($options) . "}, $frequency)";
|
||||
return $script->codeBlock($code);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns form tag that will submit using Ajax.
|
||||
*
|
||||
* Returns a form tag that will submit using XMLHttpRequest in the background instead of the regular
|
||||
* reloading POST arrangement. Even though it's using Javascript to serialize the form elements, the form submission
|
||||
* will work just like a regular submission as viewed by the receiving side (all elements available in params).
|
||||
* The options for specifying the target with :url and defining callbacks is the same as link_to_remote.
|
||||
*
|
||||
* @param HtmlHelper $html HtmlHelper creating this form
|
||||
* @param JavascriptHelper $script JavascriptHelper creating this form
|
||||
* @param string $id form id
|
||||
* @param array $options callback options
|
||||
* @return string javascript code
|
||||
*/
|
||||
function form ($html, $script, $id, $options = null) {
|
||||
$options['form'] = true;
|
||||
$options['html']['id'] = $id;
|
||||
//$options['html']['onsubmit'] = $this->remoteFunction($options) . "; return false;";
|
||||
return $html->formTag(null, "post", $options) . $script->event("$('$id')", "submit", "function(){" . $this->remoteFunction($options) . "; return false;}");
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a button input tag that will submit using Ajax
|
||||
*
|
||||
* Returns a button input tag that will submit form using XMLHttpRequest in the background instead of regular
|
||||
* reloading POST arrangement. <i>options</i> argument is the same as in <i>form_remote_tag</i>
|
||||
*
|
||||
* @param HtmlHelper $html
|
||||
* @param string $name input button name
|
||||
* @param string $value input button value
|
||||
* @param array $options callback options
|
||||
* @return string ajaxed input button
|
||||
*/
|
||||
function submit ($html, $name, $value, $options = null)
|
||||
{
|
||||
$options['with'] = 'Form.serialize(this.form)';
|
||||
$options['html']['type'] = 'button';
|
||||
$options['html']['onclick'] = $this->remoteFunction($html, $options) . "; return false;";
|
||||
$options['html']['name'] = $name;
|
||||
$options['html']['value'] = $value;
|
||||
return $html->tag("input", $options['html'], false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Observe field and call ajax on change.
|
||||
*
|
||||
* Observes the field with the DOM ID specified by <i>field_id</i> and makes
|
||||
* an Ajax when its contents have changed.
|
||||
*
|
||||
* Required +options+ are:
|
||||
* - <i>frequency</i>:: The frequency (in seconds) at which changes to
|
||||
* this field will be detected.
|
||||
* - <i>url</i>:: @see urlFor() -style options for the action to call
|
||||
* when the field has changed.
|
||||
*
|
||||
* Additional options are:
|
||||
* - <i>update</i>:: Specifies the DOM ID of the element whose
|
||||
* innerHTML should be updated with the
|
||||
* XMLHttpRequest response text.
|
||||
* - <i>with</i>:: A Javascript expression specifying the
|
||||
* parameters for the XMLHttpRequest. This defaults
|
||||
* to Form.Element.serialize('$field_id'), which can be
|
||||
* accessed from params['form']['field_id'].
|
||||
*
|
||||
* Additionally, you may specify any of the options documented in
|
||||
* @see linkToRemote().
|
||||
*
|
||||
* @param JavaScriptHelper $script
|
||||
* @param string $field_id DOM ID of field to observe
|
||||
* @param array $options ajax options
|
||||
* @return string ajax script
|
||||
*/
|
||||
function observeField ($html, $script, $field_id, $options = null) {
|
||||
if (!isset($options['with'])) {
|
||||
$options['with'] = "Form.Element.serialize('$field_id')";
|
||||
}
|
||||
return $script->codeBlock($this->__buildObserver($html, 'Form.Element.Observer', $field_id, $options));
|
||||
}
|
||||
|
||||
/**
|
||||
* Observe entire form and call ajax on change.
|
||||
*
|
||||
* Like @see observeField(), but operates on an entire form identified by the
|
||||
* DOM ID <b>form_id</b>. <b>options</b> are the same as <b>observe_field</b>, except
|
||||
* the default value of the <i>with</i> option evaluates to the
|
||||
* serialized (request string) value of the form.
|
||||
*
|
||||
* @param JavaScriptHelper $script
|
||||
* @param string $field_id DOM ID of field to observe
|
||||
* @param array $options ajax options
|
||||
* @return string ajax script
|
||||
*/
|
||||
function observeForm ($html, $script, $field_id, $options = array()) {
|
||||
if (!isset($options['with'])) {
|
||||
$options['with'] = 'Form.serialize(this.form)';
|
||||
}
|
||||
return $script->codeBlock($this->__buildObserver($html, 'Form.Observer', $field_id, $options));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a text field with Autocomplete.
|
||||
*
|
||||
* Creates an autocomplete field with the given ID and options
|
||||
*
|
||||
* options['with'] defaults to "Form.Element.serialize('$field_id')",
|
||||
* but can be any valid javascript expression defining the
|
||||
*
|
||||
* @param HtmlHelper $html
|
||||
* @param JavascriptHelper $script
|
||||
* @param string $field_id DOM ID of field to observe
|
||||
* @param array $options ajax options
|
||||
* @return string ajax script
|
||||
*/
|
||||
function autoComplete ($html, $script, $field, $url = "", $options = array())
|
||||
{
|
||||
if (!isset($options['id'])) {
|
||||
$options['id'] = str_replace("/", "_", $field);
|
||||
}
|
||||
|
||||
$htmlOptions = $options;
|
||||
$ajaxOptions = array('with', 'asynchronous', 'synchronous', 'method', 'position', 'form');
|
||||
foreach($ajaxOptions as $key) {
|
||||
if(isset($htmlOptions[$key])) {
|
||||
unset($htmlOptions[$key]);
|
||||
}
|
||||
}
|
||||
$htmlOptions['autocomplete'] = "off";
|
||||
|
||||
foreach($ajaxOptions as $key) {
|
||||
if(isset($options[$key])) {
|
||||
$ajaxOptions[$key] = $options[$key];
|
||||
} else {
|
||||
unset($ajaxOptions[$key]);
|
||||
}
|
||||
}
|
||||
|
||||
$divOptions = array('id' => $options['id'] . "_autoComplete", 'class' => "auto_complete");
|
||||
return $html->input($field, $htmlOptions) .
|
||||
$html->tag("div", $divOptions, true) . "</div>" .
|
||||
$script->codeBlock("new Ajax.Autocompleter('" . $options['id'] . "', '" . $divOptions['id'] . "', '" . $html->url($url) . "', " . $this->__optionsForAjax($ajaxOptions) . ");");
|
||||
}
|
||||
|
||||
function drag($script, $id, $options = array())
|
||||
{
|
||||
return $script->codeBlock("new Draggable('$id', " . $this->__optionsForDraggable($options) . ");");
|
||||
}
|
||||
|
||||
/**
|
||||
* For a reference on the options for this function, check out
|
||||
* http://wiki.script.aculo.us/scriptaculous/show/Droppables.add
|
||||
*
|
||||
*/
|
||||
function drop($html, $script, $id, $options = array())
|
||||
{
|
||||
return $script->codeBlock("Droppables.add('$id', " . $this->__optionsForDroppable($options) . ");");
|
||||
}
|
||||
|
||||
|
||||
function dropRemote($html, $script, $id, $options = array(), $ajaxOptions = array())
|
||||
{
|
||||
$options['onDrop'] = "function(element){" . $this->remoteFunction($html, $ajaxOptions) . "}";
|
||||
}
|
||||
|
||||
function __optionsForDraggable ($options)
|
||||
{
|
||||
$opts = array("handle" => "", "revert" => "true", "constraint" => "", "change" => "");
|
||||
foreach($opts as $key => $val) {
|
||||
if(isset($options[$key])) {
|
||||
$opts[$key] = $options[$key];
|
||||
} else {
|
||||
if($val == "") { unset($opts[$key]); }
|
||||
}
|
||||
}
|
||||
if(isset($opts['handle'])) { $opts['handle'] = "'" . $opts['handle'] . "'"; }
|
||||
if(isset($opts['constraint'])) { $opts['constraint'] = "'" . $opts['constraint'] . "'"; }
|
||||
|
||||
$out = array();
|
||||
foreach ($opts as $k => $v)
|
||||
{
|
||||
$out[] = "$k:$v";
|
||||
}
|
||||
|
||||
$out = join(', ', $out);
|
||||
$out = '{' . $out . '}';
|
||||
return $out;
|
||||
}
|
||||
|
||||
|
||||
function __optionsForDroppable ($options)
|
||||
{
|
||||
$opts = array("accept" => "", "containment" => "", "overlap" => "", "greedy" => "", "hoverclass" => "", "onHover" => "", "onDrop" => "");
|
||||
foreach($opts as $key => $val) {
|
||||
if(isset($options[$key])) {
|
||||
$opts[$key] = $options[$key];
|
||||
} else {
|
||||
if($val == "") { unset($opts[$key]); }
|
||||
}
|
||||
}
|
||||
if(isset($opts['accept'])) { $opts['accept'] = "'" . $opts['accept'] . "'"; }
|
||||
if(isset($opts['overlap'])) { $opts['overlap'] = "'" . $opts['overlap'] . "'"; }
|
||||
if(isset($opts['hoverclass'])) { $opts['hoverclass'] = "'" . $opts['hoverclass'] . "'"; }
|
||||
|
||||
$out = array();
|
||||
foreach ($opts as $k => $v)
|
||||
{
|
||||
$out[] = "$k:$v";
|
||||
}
|
||||
|
||||
$out = join(', ', $out);
|
||||
$out = '{' . $out . '}';
|
||||
return $out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Javascript helper function (private).
|
||||
*
|
||||
*/
|
||||
function __optionsForAjax ($options)
|
||||
{
|
||||
$js_options = $this->__buildCallbacks($options);
|
||||
$js_options['asynchronous'] = 'true';
|
||||
if (isset($options['type'])) {
|
||||
if ($options['type'] == 'synchronous') {
|
||||
$js_options['asynchronous'] = 'false';
|
||||
}
|
||||
}
|
||||
|
||||
if (isset($options['method'])) {
|
||||
$js_options['method'] = $this->__methodOptionToString($options['method']);
|
||||
}
|
||||
|
||||
if (isset($options['position'])) {
|
||||
$js_options['insertion'] = "Insertion." . Inflector::camelize($options['position']);
|
||||
}
|
||||
|
||||
if (isset($options['form'])) {
|
||||
$js_options['parameters'] = 'Form.serialize(this)';
|
||||
} elseif (isset($options['with'])) {
|
||||
$js_options['parameters'] = $options['with'];
|
||||
}
|
||||
|
||||
if (isset($options['evalScripts'])) {
|
||||
$js_options['evalScripts'] = "true";
|
||||
} else {
|
||||
$js_options['evalScripts'] = "false";
|
||||
}
|
||||
|
||||
$out = array();
|
||||
foreach ($js_options as $k => $v)
|
||||
{
|
||||
$out[] = "$k:$v";
|
||||
}
|
||||
|
||||
$out = join(', ', $out);
|
||||
$out = '{' . $out . '}';
|
||||
return $out;
|
||||
}
|
||||
|
||||
function __methodOptionToString ($method)
|
||||
{
|
||||
return (is_string($method) && !$method[0]=="'") ? $method : "'$method'";
|
||||
}
|
||||
|
||||
function __buildObserver ($html, $klass, $name, $options=null)
|
||||
{
|
||||
if(!isset($options['with']) && isset($options['update']))
|
||||
{
|
||||
$options['with'] = 'value';
|
||||
}
|
||||
|
||||
$callback = $this->remoteFunction($html, $options);
|
||||
$javascript = "new $klass('$name', ";
|
||||
$javascript .= (isset($options['frequency']) ? $options['frequency'] : 2) . ", function(element, value) {";
|
||||
$javascript .= "$callback})";
|
||||
return $javascript;
|
||||
}
|
||||
|
||||
function __buildCallbacks($options)
|
||||
{
|
||||
$actions = array('uninitialized', 'loading', 'loaded', 'interactive', 'complete');
|
||||
$callbacks = array();
|
||||
foreach($actions as $callback)
|
||||
{
|
||||
if(isset($options[$callback]))
|
||||
{
|
||||
$name = 'on' . ucfirst($callback);
|
||||
$code = $options[$callback];
|
||||
$callbacks[$name] = "function(request){".$code."}";
|
||||
}
|
||||
}
|
||||
return $callbacks;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ class FormHelper
|
|||
return $this->divTag( $divClass, $divTagInside );
|
||||
|
||||
}
|
||||
|
||||
|
||||
function generateSubmitDiv($html, $displayText, $htmlOptions = null)
|
||||
{
|
||||
return $this->divTag( 'submit', $html->submitTag( $displayText, $htmlOptions) );
|
||||
|
|
@ -340,7 +340,13 @@ class FormHelper
|
|||
$strFormFields = $strFormFields.$this->generateInputDiv( $html, $field['tagName'], $field['prompt'], $field['required'], $field['errorMsg'], $field['size'], $field['htmlOptions'] );
|
||||
break;
|
||||
case "select";
|
||||
case "selectMultiple";
|
||||
{
|
||||
if( "selectMultiple" == $field['type'] )
|
||||
{
|
||||
$field['selectAttr']['multiple'] = 'multiple';
|
||||
$field['selectAttr']['class'] = 'selectMultiple';
|
||||
}
|
||||
// If the selected attribute has not been set, initialize it to null.
|
||||
if( !isset( $field['selected'] ) )
|
||||
$field['selected'] = null;
|
||||
|
|
|
|||
|
|
@ -413,7 +413,7 @@ class HtmlHelper extends Helper
|
|||
{
|
||||
$url = $this->base.IMAGES_URL.$path;
|
||||
$alt = $htmlAttributes['alt'];
|
||||
return $this->output(sprintf(TAG_IMAGE, $url, $alt, $this->parseHtmlOptions($htmlAttributes, null, '', ' ')), $return);
|
||||
return $this->output(sprintf($this->tags['image'], $url, $alt, $this->parseHtmlOptions($htmlAttributes, null, '', ' ')), $return);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1003,8 +1003,12 @@ class HtmlHelper extends Helper
|
|||
$options_here = $optionAttr;
|
||||
|
||||
if ($selected == $name)
|
||||
$options_here['selected'] = 'selected';
|
||||
|
||||
{
|
||||
$options_here['selected'] = 'selected';
|
||||
} else if ( is_array($selected) && array_key_exists($name, $selected) )
|
||||
{
|
||||
$options_here['selected'] = 'selected';
|
||||
}
|
||||
$select[] = sprintf($this->tags['selectoption'], $name, $this->parseHtmlOptions($options_here), $title);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -29,6 +29,15 @@
|
|||
* @license http://www.opensource.org/licenses/mit-license.php The MIT License
|
||||
*/
|
||||
|
||||
|
||||
if(!defined("TAG_JAVASCRIPT")) {
|
||||
define("TAG_JAVASCRIPT", '<script type="text/javascript">%s</script>');
|
||||
}
|
||||
|
||||
if(!defined("TAG_JAVASCRIPT_INCLUDE")) {
|
||||
define("TAG_JAVASCRIPT_INCLUDE", '<script type="text/javascript" src="%s"></script>');
|
||||
}
|
||||
|
||||
/**
|
||||
* Javascript Helper class for easy use of javascript.
|
||||
*
|
||||
|
|
@ -61,6 +70,65 @@ class JavascriptHelper extends Helper
|
|||
{
|
||||
return sprintf(TAG_JAVASCRIPT_INCLUDE, $this->base.$url);
|
||||
}
|
||||
|
||||
/**
|
||||
* Escape carrier returns and single and double quotes for Javascript segments.
|
||||
*
|
||||
* @param string $script string that might have javascript elements
|
||||
* @return string escaped string
|
||||
*/
|
||||
function escapeScript ($script)
|
||||
{
|
||||
$script = str_replace(array("\r\n","\n","\r"),'\n', $script);
|
||||
$script = str_replace(array('"', "'"), array('\"', "\\'"), $script);
|
||||
return $script;
|
||||
}
|
||||
|
||||
/**
|
||||
* Attach an event to an element
|
||||
*
|
||||
* @param string $object Object to be observed
|
||||
* @param string $event event to observe
|
||||
* @param string $observer function to call
|
||||
* @param boolean $useCapture default true
|
||||
* @return boolean true on success
|
||||
*/
|
||||
function event ($object, $event, $observer, $useCapture = true)
|
||||
{
|
||||
return $this->codeBlock("Event.observe($object, '$event', $observer, $useCapture);");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Includes the Prototype Javascript library (and anything else) inside a single script tag
|
||||
*
|
||||
* Note: The recommended approach is to copy the contents of
|
||||
* lib/javascripts/ into your application's
|
||||
* public/javascripts/ directory, and use @see javascriptIncludeTag() to
|
||||
* create remote script links.
|
||||
* @return string script with all javascript in /javascripts folder
|
||||
*/
|
||||
function includeScript ($script = "")
|
||||
{
|
||||
$dir = VENDORS . "/javascript";
|
||||
if($script == "") {
|
||||
$files = scandir($dir);
|
||||
$javascript = '';
|
||||
foreach($files as $file)
|
||||
{
|
||||
if (substr($file, -3) == '.js')
|
||||
{
|
||||
$javascript .= file_get_contents("$dir/$file") . "\n\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
$javascript = file_get_contents("$dir/$script.js") . "\n\n";
|
||||
}
|
||||
return $this->codeBlock("\n\n" . $javascript);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
||||
Loading…
Reference in a new issue