adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-09-03 10:02:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Partial Revert "Adding optional param to remove colon on methods. Allows use inside"

Browse source 
This reverts commit b29e130606176e4ad4d834fdf42746b3c4085686.
This commit is contained in:
mark_story 2009-04-26 23:24:39 -04:00
parent e990c5ba37
commit 912f6589d5
2 changed files with 12 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

34
cake/libs/view/helpers/js.php
View file

@ -254,23 +254,18 @@ class JsBaseEngineHelper extends AppHelper {
* Create an alert message in Javascript
*
* @param string $message Message you want to alter.
* @param boolean $colon Whether you want a colon or not.
* @access public
* @return string Completed alert() call.
* @return string completed alert()
**/
function alert($message, $colon = true) {
$out = 'alert("' . $this->escape($message) . '")';
if ($colon) {
$out .= ';';
}
return $out;
function alert($message) {
return 'alert("' . $this->escape($message) . '");';
}
/**
* Redirects to a URL
*
* @param mixed $url
* @param array $options
* @return string
* @return string completed redirect in javascript
**/
function redirect($url = null) {
return 'window.location = "' . Router::url($url) . '";';
@ -279,16 +274,11 @@ class JsBaseEngineHelper extends AppHelper {
* Create a confirm() message
*
* @param string $message Message you want confirmed.
* @param boolean $colon Whether you want a colon or not.
* @access public
* @return string Completed confirm() call
* @return string completed confirm()
**/
function confirm($message, $colon = true) {
$out = 'confirm("' . $this->escape($message) . '")';
if ($colon) {
$out .= ';';
}
return $out;
function confirm($message) {
return 'confirm("' . $this->escape($message) . '");';
}
/**
* Create a prompt() Javascript function
@ -296,14 +286,10 @@ class JsBaseEngineHelper extends AppHelper {
* @param string $message Message you want to prompt.
* @param string $default Default message
* @access public
* @return string completed prompt() call
* @return string completed prompt()
**/
function prompt($message, $default = '', $colon = true) {
$out = 'prompt("' . $this->escape($message) . '", "' . $this->escape($default) . '")';
if ($colon) {
$out .= ';';
}
return $out;
function prompt($message, $default = '') {
return 'prompt("' . $this->escape($message) . '", "' . $this->escape($default) . '");';
}
/**
* Generates a JavaScript object in JavaScript Object Notation (JSON)

16
cake/tests/cases/libs/view/helpers/js.test.php
View file

@ -302,10 +302,6 @@ class JsBaseEngineTestCase extends CakeTestCase {
$expected = 'prompt("Hey, hey you", "hi!");';
$this->assertEqual($result, $expected);
$result = $this->JsEngine->prompt('Hey, hey you', 'hi!', false);
$expected = 'prompt("Hey, hey you", "hi!")';
$this->assertEqual($result, $expected);
$result = $this->JsEngine->prompt('"Hey"', '"hi"');
$expected = 'prompt("\"Hey\"", "\"hi\"");';
$this->assertEqual($result, $expected);
@ -322,11 +318,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
$result = $this->JsEngine->alert('"Hey"');
$expected = 'alert("\"Hey\"");';
$this->assertEqual($result, $expected);
$result = $this->JsEngine->alert('Hey there', false);
$expected = 'alert("Hey there")';
$this->assertEqual($result, $expected);
$this->assertEqual($result, $expected);
}
/**
* test confirm generation
@ -340,11 +332,7 @@ class JsBaseEngineTestCase extends CakeTestCase {
$result = $this->JsEngine->confirm('"Are you sure?"');
$expected = 'confirm("\"Are you sure?\"");';
$this->assertEqual($result, $expected);
$result = $this->JsEngine->confirm('"Are you sure?"', false);
$expected = 'confirm("\"Are you sure?\"")';
$this->assertEqual($result, $expected);
$this->assertEqual($result, $expected);
}
/**
* test Redirect