summaryrefslogtreecommitdiffstats
path: root/user_guide/libraries/javascript.html
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-04-27 08:47:47 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-04-27 08:47:47 +0200
commita6507905578f1cf209776ae3d53099a005a06823 (patch)
tree9f23bb557f920034cf65c86059c84e37efd34d79 /user_guide/libraries/javascript.html
parent60ef4ea72e169e174ff8dbb421609a178a3c0c48 (diff)
parent25d495b4a2598f771a858108a2cd2e96f0130412 (diff)
merging in changes
Diffstat (limited to 'user_guide/libraries/javascript.html')
-rw-r--r--user_guide/libraries/javascript.html32
1 files changed, 16 insertions, 16 deletions
diff --git a/user_guide/libraries/javascript.html b/user_guide/libraries/javascript.html
index 4e262279d..5929cbec9 100644
--- a/user_guide/libraries/javascript.html
+++ b/user_guide/libraries/javascript.html
@@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
-<title>CodeIgniter User Guide : JavaScript Class</title>
+<title>JavaScript Class : CodeIgniter User Guide</title>
<style type='text/css' media='all'>@import url('../userguide.css');</style>
<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
@@ -65,11 +65,11 @@ JavaScript Driver
<code>$this-&gt;load-&gt;library('javascript');</code>
-<p>The Javascript class also accepts parameters, <dfn>js_library_driver (string) default 'jquery'</dfn> and <dfn>autoload (bool) default TRUE</dfn>. You may override the defaults if you wish by sending an associative array:</p>
+<p>The Javascript class also accepts parameters, <dfn>js_library_driver (string) default 'jquery'</dfn> and <dfn>autoload (bool) default TRUE</dfn>. You may override the defaults if you wish by sending an associative array:</p>
<code>$this-&gt;load-&gt;library('javascript', array('js_library_driver' =&gt; 'scripto', 'autoload' =&gt; FALSE));</code>
-<p>Again, presently only 'jquery' is available. You may wish to set <dfn>autoload</dfn> to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.</p>
+<p>Again, presently only 'jquery' is available. You may wish to set <dfn>autoload</dfn> to FALSE, though, if you do not want the jQuery library to automatically include a script tag for the main jQuery script file. This is useful if you are loading it from a location outside of CodeIgniter, or already have the script tag in your markup.</p>
<p>Once loaded, the jQuery library object will be available using: <dfn>$this-&gt;javascript</dfn></p>
<h2>Setup and Configuration</h2>
@@ -93,7 +93,7 @@ JavaScript Driver
<code>$this-&gt;load-&gt;library('jquery');</code>
-<p>You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:</p>
+<p>You may send an optional parameter to determine whether or not a script tag for the main jQuery file will be automatically included when loading the library. It will be created by default. To prevent this, load the library as follows:</p>
<code>$this-&gt;load-&gt;library('jquery', FALSE);</code>
@@ -115,7 +115,7 @@ JavaScript Driver
<h2>Effects</h2>
-<p>The query library supports a powerful <a href="http://docs.jquery.com/Effects">Effects</a> repertoire. Before an effect can be used, it must be loaded:</p>
+<p>The query library supports a powerful <a href="http://docs.jquery.com/Effects">Effects</a> repertoire. Before an effect can be used, it must be loaded:</p>
<p><code>$this->jquery->effect([optional path] plugin name);
// for example
@@ -125,8 +125,8 @@ $this->jquery->effect('bounce');
<h3>hide() / show()</h3>
<p>Each of this functions will affect the visibility of an item on your page. hide() will set an item invisible, show() will reveal it.</p>
-<p><code>$this-&gt;jquery-&gt;hide(target, optional speed, optional extra information);<br />
- $this-&gt;jquery-&gt;show(target, optional speed, optional extra information);</code></p>
+<p><code>$this-&gt;jquery-&gt;hide(target, optional speed, optional extra information);<br />
+ $this-&gt;jquery-&gt;show(target, optional speed, optional extra information);</code></p>
<ul>
<li>&quot;target&quot; will be any valid jQuery selector or selectors.</li>
@@ -162,8 +162,8 @@ $this-&gt;jquery-&gt;click('#trigger', $this-&gt;jquery-&gt;animate('#note', $pa
<h3>fadeIn() / fadeOut()</h3>
-<p><code>$this-&gt;jquery-&gt;fadeIn(target, optional speed, optional extra information);<br />
- $this-&gt;jquery-&gt;fadeOut(target, optional speed, optional extra information);</code></p>
+<p><code>$this-&gt;jquery-&gt;fadeIn(target, optional speed, optional extra information);<br />
+ $this-&gt;jquery-&gt;fadeOut(target, optional speed, optional extra information);</code></p>
<ul>
<li>&quot;target&quot; will be any valid jQuery selector or selectors.</li>
<li>&quot;speed&quot; is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.</li>
@@ -182,8 +182,8 @@ $this-&gt;jquery-&gt;click('#trigger', $this-&gt;jquery-&gt;animate('#note', $pa
<h3>fadeIn() / fadeOut()</h3>
<p>These effects cause an element(s) to disappear or reappear over time.</p>
-<p><code>$this-&gt;jquery-&gt;fadeIn(target, optional speed, optional extra information);<br />
- $this-&gt;jquery-&gt;fadeOut(target, optional speed, optional extra information);</code></p>
+<p><code>$this-&gt;jquery-&gt;fadeIn(target, optional speed, optional extra information);<br />
+ $this-&gt;jquery-&gt;fadeOut(target, optional speed, optional extra information);</code></p>
<ul>
<li>&quot;target&quot; will be any valid jQuery selector or selectors.</li>
<li>&quot;speed&quot; is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.</li>
@@ -193,9 +193,9 @@ $this-&gt;jquery-&gt;click('#trigger', $this-&gt;jquery-&gt;animate('#note', $pa
<h3>slideUp() / slideDown() / slideToggle()</h3>
<p>These effects cause an element(s) to slide.</p>
-<p><code>$this-&gt;jquery-&gt;slideUp(target, optional speed, optional extra information);<br />
- $this-&gt;jquery-&gt;slideDown(target, optional speed, optional extra information);<br />
-$this-&gt;jquery-&gt;slideToggle(target, optional speed, optional extra information);</code></p>
+<p><code>$this-&gt;jquery-&gt;slideUp(target, optional speed, optional extra information);<br />
+ $this-&gt;jquery-&gt;slideDown(target, optional speed, optional extra information);<br />
+$this-&gt;jquery-&gt;slideToggle(target, optional speed, optional extra information);</code></p>
<ul>
<li>&quot;target&quot; will be any valid jQuery selector or selectors.</li>
<li>&quot;speed&quot; is optional, and is set to either slow, normal, fast, or alternatively a number of milliseconds.</li>
@@ -235,11 +235,11 @@ $this-&gt;jquery-&gt;slideToggle(target, optional speed, optional extra informa
<div id="footer">
<p>
-Previous Topic:&nbsp;&nbsp;<a href="input.html">Input Class</a>
+Previous Topic:&nbsp;&nbsp;<a href="../database/index.html">Database Class</a>
&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="#top">Top of Page</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
<a href="../index.html">User Guide Home</a>&nbsp;&nbsp;&nbsp;&middot;&nbsp;&nbsp;
-Next Topic:&nbsp;&nbsp;<a href="language.html">Language Class</a></p>
+Next Topic:&nbsp;&nbsp;<a href="../helpers/array_helper.html">Array Helper</a></p>
<p><a href="http://codeigniter.com">CodeIgniter</a> &nbsp;&middot;&nbsp; Copyright &#169; 2006 - 2011 &nbsp;&middot;&nbsp; <a href="http://ellislab.com/">EllisLab, Inc.</a></p>
</div>