Skip to content

Commit

Permalink
dijit, dojo, util: fix more dojodoc misformatting, refs #13101 !strict
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.dojotoolkit.org/src/dojo/trunk@29358 560b804f-0ae3-0310-86f3-f6aa0a117693
  • Loading branch information
wkeese committed Jul 21, 2012
1 parent 3703e2d commit 328be70
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 64 deletions.
4 changes: 2 additions & 2 deletions _base/lang.js
Original file line number Diff line number Diff line change
Expand Up @@ -534,8 +534,8 @@ define(["./kernel", "../has", "../sniff"], function(dojo, has){
// String to be used as a template.
// map: Object|Function
// If an object, it is used as a dictionary to look up substitutions.
// If a function, it is called for every substitution with following
// parameters: a whole match, a name, an offset, and the whole template
// If a function, it is called for every substitution with following parameters:
// a whole match, a name, an offset, and the whole template
// string (see https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Global_Objects/String/replace
// for more details).
// pattern: RegEx?
Expand Down
26 changes: 13 additions & 13 deletions _base/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -517,25 +517,25 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
has.add("config-publishRequireResult", 1, 0, 0);

dojo.require = function(moduleName, omitModuleCheck) {
// summary:
// summary:
// loads a Javascript module from the appropriate URI
//
// moduleName: String
// moduleName: String
// module name to load, using periods for separators,
// e.g. "dojo.date.locale". Module paths are de-referenced by dojo's
// internal mapping of locations to names and are disambiguated by
// longest prefix. See `dojo.registerModulePath()` for details on
// registering new modules.
//
// omitModuleCheck: Boolean?
// omitModuleCheck: Boolean?
// if `true`, omitModuleCheck skips the step of ensuring that the
// loaded file actually defines the symbol it is referenced by.
// For example if it called as `dojo.require("a.b.c")` and the
// file located at `a/b/c.js` does not define an object `a.b.c`,
// and exception will be throws whereas no exception is raised
// when called as `dojo.require("a.b.c", true)`
//
// description:
// description:
// Modules are loaded via dojo.require by using one of two loaders: the normal loader
// and the xdomain loader. The xdomain loader is used when dojo was built with a
// custom build that specified loader=xdomain and the module lives on a modulePath
Expand Down Expand Up @@ -585,7 +585,7 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
// the current namespace. It is presumed that the caller will
// take care of that.
//
// example:
// example:
// To use dojo.require in conjunction with dojo.ready:
//
// | dojo.require("foo");
Expand All @@ -594,7 +594,7 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
// | //you can now safely do something with foo and bar
// | });
//
// example:
// example:
// For example, to import all symbols into a local block, you might write:
//
// | with (dojo.require("A.B")) {
Expand All @@ -606,7 +606,7 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
// | var B = dojo.require("A.B");
// | ...
//
// returns:
// returns:
// the required namespace object
function doRequire(mid, omitModuleCheck){
var module = getModule(slashName(mid), require.module);
Expand Down Expand Up @@ -678,14 +678,14 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
};

dojo.registerModulePath = function(/*String*/moduleName, /*String*/prefix){
// summary:
// summary:
// Maps a module name to a path
// description:
// description:
// An unregistered module is given the default path of ../[module],
// relative to Dojo root. For example, module acme is mapped to
// ../acme. If you want to use a different module name, use
// dojo.registerModulePath.
// example:
// example:
// If your dojo.js is located at this location in the web root:
// | /myapp/js/dojo/dojo/dojo.js
// and your modules are located at:
Expand All @@ -712,10 +712,10 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
};

dojo.platformRequire = function(/*Object*/modMap){
// summary:
// summary:
// require one or more modules based on which host environment
// Dojo is currently operating in
// description:
// description:
// This method takes a "map" of arrays which one can use to
// optionally load dojo modules. The map is indexed by the
// possible dojo.name_ values, with two additional values:
Expand All @@ -724,7 +724,7 @@ define(["./kernel", "../has", "require", "module", "./json", "./lang", "./array"
// dojo.name_, set by your host environment. The items in the
// "common" array will *always* be loaded, regardless of which
// list is chosen.
// example:
// example:
// | dojo.platformRequire({
// | browser: [
// | "foo.sample", // simple module
Expand Down
7 changes: 4 additions & 3 deletions _base/xhr.js
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ define([
dojo._ioCancelAll = watch.cancelAll;
/*=====
dojo._ioCancelAll = function(){
//summary:
// summary:
// Cancels all pending IO requests, regardless of IO type
// (xhr, script, iframe).
};
Expand Down Expand Up @@ -512,8 +512,9 @@ define([
var _defaultContentType = "application/x-www-form-urlencoded";

dojo._ioAddQueryToUrl = function(/*dojo.__IoCallbackArgs*/ioArgs){
//summary: Adds query params discovered by the io deferred construction to the URL.
//Only use this for operations which are fundamentally GET-type operations.
// summary:
// Adds query params discovered by the io deferred construction to the URL.
// Only use this for operations which are fundamentally GET-type operations.
if(ioArgs.query.length){
ioArgs.url += (ioArgs.url.indexOf("?") == -1 ? "?" : "&") + ioArgs.query;
ioArgs.query = null;
Expand Down
15 changes: 8 additions & 7 deletions back.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ define(["./_base/config", "./_base/lang", "./sniff", "./dom", "./dom-construct",
back.goBack = handleBackButton;

function handleForwardButton(){
//summary: private method. Do not call this directly.
// summary:
// private method. Do not call this directly.
var last = forwardStack.pop();
if(!last){ return; }
if(last.kwArgs["forward"]){
Expand Down Expand Up @@ -141,10 +142,10 @@ define(["./_base/config", "./_base/lang", "./sniff", "./dom", "./dom-construct",
}

back.init = function(){
//summary:
// summary:
// Initializes the undo stack. This must be called from a <script>
// block that lives inside the `<body>` tag to prevent bugs on IE.
// description:
//
// Only call this method before the page's DOM is finished loading. Otherwise
// it will not work. Be careful with xdomain loading or djConfig.debugAtAllCosts scenarios,
// in order for this method to work, dojo/back will need to be part of a build layer.
Expand All @@ -162,13 +163,13 @@ define(["./_base/config", "./_base/lang", "./sniff", "./dom", "./dom-construct",
};

back.setInitialState = function(/*Object*/args){
//summary:
// summary:
// Sets the state object and back callback for the very first page
// that is loaded.
//description:
//
// It is recommended that you call this method as part of an event
// listener that is registered via dojo/ready.
//args: Object
// args: Object
// See the addToHistory() function for the list of valid args properties.
initialState = createState(initialHref, args, initialHash);
};
Expand Down Expand Up @@ -365,7 +366,7 @@ define(["./_base/config", "./_base/lang", "./sniff", "./dom", "./dom-construct",
};

back._iframeLoaded = function(evt, ifrLoc){
//summary:
// summary:
// private method. Do not call this directly.
var query = getUrlQuery(ifrLoc.href);
if(query == null){
Expand Down
2 changes: 1 addition & 1 deletion data/ItemFileReadStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ var ItemFileReadStore = declare("dojo.data.ItemFileReadStore", [Evented],{
// Function to parse the loaded data into item format and build the internal items array.
// dataObject:
// The JS data object containing the raw data to convery into item format.
// returns: array
// returns: Array
// Array of items in store item format.

// First, we define a couple little utility functions...
Expand Down
16 changes: 8 additions & 8 deletions data/ObjectStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ return declare("dojo.data.ObjectStore", [Evented],{
// that an item is loaded is situations when the item may or may not be loaded yet.
// If you access a value directly through property access, you can use this to load
// a lazy value as well (doesn't need to be an item).
// args: Object
// args: Object
// See dojo.data.api.Read.fetch
// example:
// | store.loadItem({
Expand All @@ -150,7 +150,7 @@ return declare("dojo.data.ObjectStore", [Evented],{
return item;
},
close: function(request){
// summary:
// summary:
// See dojo.data.api.Read.close()
return request && request.abort && request.abort();
},
Expand Down Expand Up @@ -367,10 +367,10 @@ return declare("dojo.data.ObjectStore", [Evented],{
// contains a reference to the object itself as well as a
// cloned and trimmed version of old object for use with
// revert.
// object: Object
// object: Object
// Indicates that the given object is changing and should be marked as
// dirty for the next save
// _deleting: [private]
// _deleting: [private] Boolean

object.__isDirty = true;
//if an object is already in the list of dirty objects, don't add it again
Expand Down Expand Up @@ -522,20 +522,20 @@ return declare("dojo.data.ObjectStore", [Evented],{
// Notification Support

onSet: function(){
// summary:
// summary:
// See dojo.data.api.Notification.onSet()
},
onNew: function(){
// summary:
// summary:
// See dojo.data.api.Notification.onNew()
},
onDelete: function(){
// summary:
// summary:
// See dojo.data.api.Notification.onDelete()
},
// an extra to get result sets
onFetch: function(results){
// summary:
// summary:
// Called when a fetch occurs
}

Expand Down
4 changes: 2 additions & 2 deletions data/api/Read.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,15 +139,15 @@ return declare("dojo.data.api.Read", null, {
throw new Error('Unimplemented API: dojo.data.api.Read.isItemLoaded');
},

loadItem: function(/* object */ keywordArgs){
loadItem: function(/* Object */ keywordArgs){
// summary:
// Given an item, this method loads the item so that a subsequent call
// to store.isItemLoaded(item) will return true. If a call to
// isItemLoaded() returns true before loadItem() is even called,
// then loadItem() need not do any work at all and will not even invoke
// the callback handlers. So, before invoking this method, check that
// the item has not already been loaded.
// keywordArgs:
// keywordArgs:
// An anonymous object that defines the item to load and callbacks to invoke when the
// load has completed. The format of the object is as follows:
// | {
Expand Down
14 changes: 8 additions & 6 deletions io/script.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ define([
remove: _script._remove,

_makeScriptDeferred: function(/*Object*/ args, /*Function?*/ cancel){
//summary:
// summary:
// sets up a Deferred object for an IO request.
var dfd = xhr._ioSetArgs(args, cancel || this._deferredCancel, this._deferredOk, this._deferredError);

Expand Down Expand Up @@ -148,7 +148,8 @@ define([
_counter: 1,

_addDeadScript: function(/*Object*/ ioArgs){
//summary: sets up an entry in the deadScripts array.
// summary:
// sets up an entry in the deadScripts array.
script._deadScripts.push({id: ioArgs.id, frameDoc: ioArgs.frameDoc});
//Being extra paranoid about leaks:
ioArgs.frameDoc = null;
Expand Down Expand Up @@ -195,7 +196,8 @@ define([
},

_resHandle: function(/*Deferred*/ dfd){
//summary: inflight function to handle a completed response.
// summary:
// inflight function to handle a completed response.
if(script._ioCheck(dfd)){
dfd.callback(dfd);
}else{
Expand All @@ -206,15 +208,15 @@ define([
},

_canAttach: function(/*===== ioArgs =====*/ ){
//summary:
// summary:
// A method that can be overridden by other modules
// to control when the script attachment occurs.
// ioArgs: Object
return true;
},

_jsonpCallback: function(/*JSON Object*/ json){
//summary:
// summary:
// generic handler for jsonp callback. A pointer to this function
// is used for all jsonp callbacks. NOTE: the "this" in this
// function will be the Deferred object that represents the script
Expand All @@ -237,7 +239,7 @@ define([
// if it loads.
};
script.remove = function(id, frameDocument){
//summary:
// summary:
// removes the script element with the given id, from the given frameDocument.
// If no frameDocument is passed, the current document is used.
};
Expand Down
3 changes: 1 addition & 2 deletions query.js
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,7 @@ define(["./_base/kernel", "./has", "./dom", "./on", "./_base/array", "./_base/la
// | // even getting the coordinates of all the items
// | var coords = dojo.query(".thinger").coords();
// example:
// DOM manipulation functions from the dojo.* namespace area also
// available:
// DOM manipulation functions from the dojo.* namespace area also available:
// | // remove all of the elements in the list from their
// | // parents (akin to "deleting" them from the document)
// | dojo.query(".thinger").orphan();
Expand Down
5 changes: 3 additions & 2 deletions request/watch.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define([
_inFlight = [];

function watchInFlight(){
//summary:
// summary:
// internal method that checks each inflight XMLHttpRequest to see
// if it has completed or if the timeout situation applies.

Expand Down Expand Up @@ -86,7 +86,8 @@ define([
}

watch.cancelAll = function cancelAll(){
//summary: Cancels all pending IO requests, regardless of IO type
// summary:
// Cancels all pending IO requests, regardless of IO type
try{
array.forEach(_inFlight, function(dfd){
try{
Expand Down
2 changes: 1 addition & 1 deletion rpc/JsonpService.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ return declare("dojo.rpc.JsonpService", RpcService, {
strictArgChecks: false,

bind: function(method, parameters, deferredRequestHandler, url){
//summary:
// summary:
// JSONP bind method. Takes remote method, parameters,
// deferred, and a url, calls createRequest to make a JSON-RPC
// envelope and passes that off with bind.
Expand Down
3 changes: 1 addition & 2 deletions selector/acme.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,7 @@ define([
// but not:
// thinger > div.howdy[type=thinger]
// the indidual components of the previous query would be
// split into 3 parts that would be represented a structure
// like:
// split into 3 parts that would be represented a structure like:
// [
// {
// query: "thinger",
Expand Down
Loading

0 comments on commit 328be70

Please sign in to comment.