Skip to content

Commit

Permalink
fixing rest syntax errors, and deleting obsolete files
Browse files Browse the repository at this point in the history
  • Loading branch information
wkeese committed Jun 5, 2012
1 parent b4bb639 commit b4e85f1
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 32 deletions.
6 changes: 3 additions & 3 deletions build/webkit-mobile.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ It should be used when:

To create this special build:

.. code-block :: shell
.. code-block :: bash
cd util/buildscripts/
./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile
$ cd util/buildscripts/
$ ./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile
4 changes: 2 additions & 2 deletions developer/bugs.rst
Original file line number Diff line number Diff line change
Expand Up @@ -78,15 +78,15 @@ When working in DojoX, if no Component is more accurate than the top level ``doj
Do this recursively in projects with components.
eg: If a bug is against ``dojox.layout.FloatingPane``, the Component would be ``DojoX Layout`` and the meta tag would be: ``[FloatingPane]``, making the summary look something like:

.. code-block :: bash
::

[patch][cla][FloatingPane] Fails to start when created in an iframe

This indicates to the ``FloatingPane`` owner a fix covered under CLA lives in this ticket.

Dijit prefers the module name be included in the summary, when in the "component" ``Dijit``, eg:

.. code-block :: bash
::

[regression] TabContainer: Title Heights collapse when ...
Expand Down
2 changes: 1 addition & 1 deletion developer/metadoc.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.. _developer/rstwiki:
.. _developer/metadoc:

======================================
Editing Dojo's Reference Documentation
Expand Down
3 changes: 0 additions & 3 deletions developer/rstwiki.rst

This file was deleted.

1 change: 1 addition & 0 deletions dijit/form/CurrencyTextBox.rst
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ In this example using euros with German formatting, the invalid message contains
:djConfig: async: true, parseOnLoad: false
.. js ::
require(["dijit/form/CurrencyTextBox", "dojo/currency", "dojo/i18n!dojo/cldr/nls/de/currency", "dojo/i18n!dojo/cldr/nls/de/number", "dojo/domReady!"
], function(CurrencyTextBox, currency){
var example = currency.format(54775.53, {locale: 'de-de', currency: "EUR"});
Expand Down
10 changes: 5 additions & 5 deletions dijit/themes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ Thus, by modifying variables.less and rebuilding the CSS files, you could make y

The beginning of variables.less looks like:

.. code-block :: less
.. code-block :: css
@primary-color: #cfe5fa; // Base color for entire theme
@secondary-color: #efefef; // Base color for bar-backgrounds
Expand All @@ -389,7 +389,7 @@ The beginning of variables.less looks like:
To compile all the less files into CSS files, on mac or other UNIX boxes do:

.. code-block :: shell
.. code-block :: bash
$ cd dijit/themes/claro
$ node compile.js
Expand All @@ -401,14 +401,14 @@ This requires Node.js. If you don't have it, then

2. Edit .bash_profile etc. to add node to your path

.. code-block :: shell
.. code-block :: bash
export PATH=$PATH:/opt/less/bin
$ export PATH=$PATH:/opt/less/bin
On a PC, do:

.. code-block :: shell
::

C:\> cd C:\myworkspace\dijit\themes\claro
C:\> node compile.js
Expand Down
2 changes: 1 addition & 1 deletion dojox/image/SlideShow.rst
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ parameter to "false". e.g.
This causes a delay when the user attempts to view an image, since it must wait to be loaded.

Enabling Autostart (autoplay)
----------------------
-----------------------------

The Slideshow widget does not automatically play by default. The autoStart parameter overrides this behavior:

Expand Down
3 changes: 0 additions & 3 deletions quickstart/arrays.rst

This file was deleted.

3 changes: 0 additions & 3 deletions quickstart/browser-sniffing.rst

This file was deleted.

6 changes: 0 additions & 6 deletions quickstart/module-returns.rst

This file was deleted.

6 changes: 3 additions & 3 deletions releasenotes/1.8.rst
Original file line number Diff line number Diff line change
Expand Up @@ -802,10 +802,10 @@ webkit-mobile devices.

To create this special build:

.. code-block :: shell
.. code-block :: bash
cd util/buildscripts/
./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile
$ cd util/buildscripts/
$ ./build.sh releaseDir=... action=release optimize=closure profile=webkitMobile
Expand Down
4 changes: 2 additions & 2 deletions releasenotes/migration-17.rst
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Previously, one would ``dojo.require()`` modules into a page. Take this basic ex
alert("wait! DOM might not be ready yet?!")
});
The ``require()`` call follows the `requirejs <>`_ API. It does lots of amazing things. That is beyond the scope of this document, currently.
The ``require()`` call follows the `requirejs <http://requirejs.org/docs/api.html>`_ API. It does lots of amazing things. That is beyond the scope of this document, currently.

Take notice of the difference in the two examples:

Expand All @@ -85,7 +85,7 @@ The ``require()`` callback function is important. In the former example, we ``al
alert("okay, NOW the modules I wanted AND DOM are ready! phew.");
})
So to summarize: instead of calling dojo.require() N times, call require() once, passing an array of module names you want. If you need DOMReady, use ``"dojo/domReady!"``. Note the ``!`` following the module name. That puts the ``dojo/domReady`` module into "plugin" mode. (more on `loader plugins`_ later)
So to summarize: instead of calling dojo.require() N times, call require() once, passing an array of module names you want. If you need DOMReady, use ``"dojo/domReady!"``. Note the ``!`` following the module name. That puts the ``dojo/domReady`` module into "plugin" mode.

The special ``Thinger`` and ``cookie`` variables created for our ``require()`` callback are whatever the return values from ``dojo/cookie.js`` and ``my/Thinger.js`` were, respectively. We will discuss the return value of ``my/Thinger`` while we deprecate dojo.provide_ in the next section.

Expand Down

0 comments on commit b4e85f1

Please sign in to comment.