Skip to content

Commit

Permalink
Updated JavaScript casing and JsHelper references in doc blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
Bryan Crowe committed Sep 26, 2013
1 parent 1c148c2 commit 915b51b
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions app/Config/core.php
Expand Up @@ -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
Expand Down Expand Up @@ -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');

Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Console/Templates/skel/Config/core.php
Expand Up @@ -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
Expand Down Expand Up @@ -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');

Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Component/CookieComponent.php
Expand Up @@ -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
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Controller/Controller.php
Expand Up @@ -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', 'JavaScript', '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
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/Test/Case/Controller/ControllerMergeVarsTest.php
Expand Up @@ -94,7 +94,7 @@ class MergeVarPluginAppController extends MergeVarsAppController {
*
* @var array
*/
public $helpers = array('Javascript');
public $helpers = array('JavaScript');

/**
* parent for mergeVars
Expand Down Expand Up @@ -205,7 +205,7 @@ public function testMergeVarsWithPlugin() {

$expected = array(
'MergeVar' => array('format' => 'html', 'terse'),
'Javascript' => null
'JavaScript' => null
);
$this->assertEquals($expected, $Controller->helpers, 'Helpers are unexpected.');

Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/Test/Case/View/Helper/JsHelperTest.php
Expand Up @@ -699,7 +699,7 @@ public function testValuePassThrough() {
}

/**
* 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
*/
Expand Down
2 changes: 1 addition & 1 deletion lib/Cake/View/Helper/HtmlHelper.php
Expand Up @@ -618,7 +618,7 @@ public function scriptStart($options = array()) {
}

/**
* 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
*
Expand Down
8 changes: 4 additions & 4 deletions lib/Cake/View/Helper/JqueryEngineHelper.php
Expand Up @@ -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
Expand Down Expand Up @@ -30,7 +30,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
Expand Down Expand Up @@ -167,7 +167,7 @@ public function get($selector) {
* - '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
*/
Expand Down Expand Up @@ -340,7 +340,7 @@ public function slider($options = array()) {

/**
* 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.
Expand Down
12 changes: 6 additions & 6 deletions lib/Cake/View/Helper/JsBaseEngineHelper.php
Expand Up @@ -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()
Expand All @@ -68,7 +68,7 @@ public function alert($message) {

/**
* 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
Expand Down Expand Up @@ -101,7 +101,7 @@ public function confirmReturn($message) {
}

/**
* Create a `prompt()` Javascript function
* Create a `prompt()` JavaScript function
*
* @param string $message Message you want to prompt.
* @param string $default Default message
Expand Down Expand Up @@ -297,7 +297,7 @@ abstract public function get($selector);
* - `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
*/
Expand Down Expand Up @@ -363,7 +363,7 @@ abstract public function effect($name, $options = array());
* - `type` - Data type for response. 'json' and 'html' are supported. Default is html for most libraries.
* - `evalScripts` - Whether or not <script> tags should be eval'ed.
* - `dataExpression` - Should the `data` key be treated as a callback. Useful for supplying `$options['data']` as
* another Javascript expression.
* another JavaScript expression.
*
* @param string|array $url Array or String URL to target with the request.
* @param array $options Array of options. See above for cross library supported options
Expand Down Expand Up @@ -475,7 +475,7 @@ abstract public function slider($options = array());
abstract public function serializeForm($options = array());

/**
* Parse an options assoc array into an Javascript object literal.
* Parse an options assoc array into an JavaScript object literal.
* Similar to object() but treats any non-integer value as a string,
* does not include `{ }`
*
Expand Down
4 changes: 2 additions & 2 deletions lib/Cake/View/Helper/MootoolsEngineHelper.php
Expand Up @@ -19,7 +19,7 @@
/**
* MooTools Engine Helper for JsHelper
*
* Provides MooTools specific Javascript for JsHelper.
* Provides MooTools specific JavaScript for JsHelper.
* Assumes that you have the following MooTools packages
*
* - Remote, Remote.HTML, Remote.JSON
Expand Down Expand Up @@ -144,7 +144,7 @@ public function get($selector) {
* - '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
*/
Expand Down
6 changes: 3 additions & 3 deletions lib/Cake/View/Helper/PrototypeEngineHelper.php
Expand Up @@ -2,7 +2,7 @@
/**
* Prototype Engine Helper for JsHelper
*
* Provides Prototype specific Javascript for JsHelper. Requires at least
* Provides Prototype specific JavaScript for JsHelper. Requires at least
* Prototype 1.6
*
* PHP 5
Expand All @@ -26,7 +26,7 @@
/**
* Prototype Engine Helper for JsHelper
*
* Provides Prototype specific Javascript for JsHelper. Requires at least
* Provides Prototype specific JavaScript for JsHelper. Requires at least
* Prototype 1.6
*
* @package Cake.View.Helper
Expand Down Expand Up @@ -142,7 +142,7 @@ public function get($selector) {
* - `stop` - Whether you want the event to stopped. (defaults true)
*
* @param string $type Type of event to bind to the current 946 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
*/
Expand Down

0 comments on commit 915b51b

Please sign in to comment.