diff --git a/app/Config/core.php b/app/Config/core.php index 99b3d744f..f6c16ff02 100644 --- a/app/Config/core.php +++ b/app/Config/core.php @@ -97,7 +97,7 @@ * /app/webroot/.htaccess * * And uncomment the App.baseUrl below. But keep in mind - * that plugin assets such as images, CSS and Javascript files + * that plugin assets such as images, CSS and JavaScript files * will not work without url rewriting! * To work around this issue you should either symlink or copy * the plugin assets into you app's webroot directory. This is @@ -254,7 +254,7 @@ * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the * output, and setting the config below to the name of the script. * - * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link(). + * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JsHelper::link(). */ //Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php'); diff --git a/lib/Cake/Console/Templates/skel/Config/core.php b/lib/Cake/Console/Templates/skel/Config/core.php index 012af933a..b867453ae 100644 --- a/lib/Cake/Console/Templates/skel/Config/core.php +++ b/lib/Cake/Console/Templates/skel/Config/core.php @@ -88,7 +88,7 @@ * /app/webroot/.htaccess * * And uncomment the App.baseUrl below. But keep in mind - * that plugin assets such as images, CSS and Javascript files + * that plugin assets such as images, CSS and JavaScript files * will not work without URL rewriting! * To work around this issue you should either symlink or copy * the plugin assets into you app's webroot directory. This is @@ -245,7 +245,7 @@ * Plug in your own custom JavaScript compressor by dropping a script in your webroot to handle the * output, and setting the config below to the name of the script. * - * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JavaScriptHelper::link(). + * To use, prefix your JavaScript link URLs with '/cjs/' instead of '/js/' or use JsHelper::link(). */ //Configure::write('Asset.filter.js', 'custom_javascript_output_filter.php'); diff --git a/lib/Cake/Controller/Component/CookieComponent.php b/lib/Cake/Controller/Component/CookieComponent.php index e2831783d..4259f7e9f 100644 --- a/lib/Cake/Controller/Component/CookieComponent.php +++ b/lib/Cake/Controller/Component/CookieComponent.php @@ -112,7 +112,7 @@ class CookieComponent extends Component { * HTTP only cookie * * Set to true to make HTTP only cookies. Cookies that are HTTP only - * are not accessible in Javascript. + * are not accessible in JavaScript. * * @var boolean */ diff --git a/lib/Cake/Controller/Controller.php b/lib/Cake/Controller/Controller.php index eb54a385a..b3982bfe4 100644 --- a/lib/Cake/Controller/Controller.php +++ b/lib/Cake/Controller/Controller.php @@ -88,7 +88,7 @@ class Controller extends Object implements CakeEventListener { * An array containing the names of helpers this controller uses. The array elements should * not contain the "Helper" part of the classname. * - * Example: `public $helpers = array('Html', 'Javascript', 'Time', 'Ajax');` + * Example: `public $helpers = array('Html', 'Js', 'Time', 'Ajax');` * * @var mixed A single name as a string or a list of names as an array. * @link http://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses diff --git a/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php index c41165a12..e030be1c0 100644 --- a/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php +++ b/lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php @@ -94,7 +94,7 @@ class MergeVarPluginAppController extends MergeVarsAppController { * * @var array */ - public $helpers = array('Javascript'); + public $helpers = array('Js'); /** * parent for mergeVars @@ -205,7 +205,7 @@ class ControllerMergeVarsTest extends CakeTestCase { $expected = array( 'MergeVar' => array('format' => 'html', 'terse'), - 'Javascript' => null + 'Js' => null ); $this->assertEquals($expected, $Controller->helpers, 'Helpers are unexpected.'); diff --git a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php index 9171db832..95279c903 100644 --- a/lib/Cake/Test/Case/View/Helper/JsHelperTest.php +++ b/lib/Cake/Test/Case/View/Helper/JsHelperTest.php @@ -699,7 +699,7 @@ class JsHelperTest extends CakeTestCase { } /** - * test set()'ing variables to the Javascript buffer and controlling the output var name. + * test set()'ing variables to the JavaScript buffer and controlling the output var name. * * @return void */ diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php index 7a704c108..79d7147cc 100644 --- a/lib/Cake/View/Helper/HtmlHelper.php +++ b/lib/Cake/View/Helper/HtmlHelper.php @@ -618,7 +618,7 @@ class HtmlHelper extends AppHelper { } /** - * End a Buffered section of Javascript capturing. + * End a Buffered section of JavaScript capturing. * Generates a script tag inline or in `$scripts_for_layout` depending on the settings * used when the scriptBlock was started * diff --git a/lib/Cake/View/Helper/JqueryEngineHelper.php b/lib/Cake/View/Helper/JqueryEngineHelper.php index b72144a0c..fe5bc77e5 100644 --- a/lib/Cake/View/Helper/JqueryEngineHelper.php +++ b/lib/Cake/View/Helper/JqueryEngineHelper.php @@ -2,7 +2,7 @@ /** * jQuery Engine Helper for JsHelper * - * Provides jQuery specific Javascript for JsHelper. + * Provides jQuery specific JavaScript for JsHelper. * * Implements the JsHelper interface for jQuery. All $options arrays * support all options found in the JsHelper, as well as those in the jQuery @@ -30,7 +30,7 @@ App::uses('JsBaseEngineHelper', 'View/Helper'); /** * jQuery Engine Helper for JsHelper * - * Provides jQuery specific Javascript for JsHelper. + * Provides jQuery specific JavaScript for JsHelper. * * Implements the JsHelper interface for jQuery. All $options arrays * support all options found in the JsHelper, as well as those in the jQuery @@ -167,7 +167,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper { * - 'stop' - Whether you want the event to stopped. (defaults true) * * @param string $type Type of event to bind to the current dom id - * @param string $callback The Javascript function you wish to trigger or the function literal + * @param string $callback The JavaScript function you wish to trigger or the function literal * @param array $options Options for the event. * @return string completed event handler */ @@ -340,7 +340,7 @@ class JqueryEngineHelper extends JsBaseEngineHelper { /** * Serialize a form attached to $selector. If the current selection is not an input or - * form, errors will be created in the Javascript. + * form, errors will be created in the JavaScript. * * @param array $options Options for the serialization * @return string completed form serialization script. diff --git a/lib/Cake/View/Helper/JsBaseEngineHelper.php b/lib/Cake/View/Helper/JsBaseEngineHelper.php index a7afce88c..29aeba971 100644 --- a/lib/Cake/View/Helper/JsBaseEngineHelper.php +++ b/lib/Cake/View/Helper/JsBaseEngineHelper.php @@ -57,7 +57,7 @@ abstract class JsBaseEngineHelper extends AppHelper { protected $_callbackArguments = array(); /** - * Create an `alert()` message in Javascript + * Create an `alert()` message in JavaScript * * @param string $message Message you want to alter. * @return string completed alert() @@ -68,7 +68,7 @@ abstract class JsBaseEngineHelper extends AppHelper { /** * Redirects to an URL. Creates a window.location modification snippet - * that can be used to trigger 'redirects' from Javascript. + * that can be used to trigger 'redirects' from JavaScript. * * @param string|array $url URL * @return string completed redirect in javascript @@ -101,7 +101,7 @@ abstract class JsBaseEngineHelper extends AppHelper { } /** - * Create a `prompt()` Javascript function + * Create a `prompt()` JavaScript function * * @param string $message Message you want to prompt. * @param string $default Default message @@ -297,7 +297,7 @@ abstract class JsBaseEngineHelper extends AppHelper { * - `stop` - Whether you want the event to stopped. (defaults to true) * * @param string $type Type of event to bind to the current dom id - * @param string $callback The Javascript function you wish to trigger or the function literal + * @param string $callback The JavaScript function you wish to trigger or the function literal * @param array $options Options for the event. * @return string completed event handler */ @@ -363,7 +363,7 @@ abstract class JsBaseEngineHelper extends AppHelper { * - `type` - Data type for response. 'json' and 'html' are supported. Default is html for most libraries. * - `evalScripts` - Whether or not