From 4c844ebce0c78b2cd21bc92b905d6cd8d492caf2 Mon Sep 17 00:00:00 2001 From: Bill Keese Date: Fri, 20 Jul 2012 08:57:52 +0000 Subject: [PATCH] Doc only commit. Simplify kwargs definitions and workaround doc parser bugs when kwargs is declared as a function, refs #13101 !strict. git-svn-id: http://svn.dojotoolkit.org/src/dojox/trunk@29354 560b804f-0ae3-0310-86f3-f6aa0a117693 --- charting/Chart.js | 20 ++---- charting/Series.js | 3 +- charting/Theme.js | 12 +--- charting/axis2d/Base.js | 6 +- charting/axis2d/Default.js | 91 +++++++------------------ charting/axis2d/Invisible.js | 22 +----- charting/plot2d/Base.js | 2 +- color/Palette.js | 39 +++-------- date/relative.js | 5 +- embed/Flash.js | 14 +--- embed/Quicktime.js | 8 +-- form/ListInput.js | 18 +++-- geo/charting/MouseInteractionSupport.js | 6 +- geo/openlayers/JsonImport.js | 10 +-- geo/openlayers/Map.js | 7 +- geo/openlayers/WidgetFeature.js | 11 +-- grid/_Grid.js | 28 +------- io/OAuth.js | 10 +-- io/xhrMultiPart.js | 20 +----- lang/oo/mixin.js | 5 +- 20 files changed, 70 insertions(+), 267 deletions(-) diff --git a/charting/Chart.js b/charting/Chart.js index 1e29895408..c0d50f0362 100644 --- a/charting/Chart.js +++ b/charting/Chart.js @@ -7,10 +7,9 @@ define(["../main", "dojo/_base/lang", "dojo/_base/array","dojo/_base/declare", " Element, SimpleTheme, Series, common, shape, g, func, funcFold, funcReversed){ /*===== - var __ChartCtorArgs = function(margins, stroke, fill, delayInMs){ + var __ChartCtorArgs = { // summary: // The keyword arguments that can be passed in a Chart constructor. - // // margins: Object? // Optional margins for the chart, in the form of { l, t, r, b}. // stroke: dojox.gfx.Stroke? @@ -19,37 +18,28 @@ define(["../main", "dojo/_base/lang", "dojo/_base/array","dojo/_base/declare", " // An optional fill for the chart. // delayInMs: Number // Delay in ms for delayedRender(). Default: 200. - this.margins = margins; - this.stroke = stroke; - this.fill = fill; - this.delayInMs = delayInMs; - } - =====*/ + }; + =====*/ /*===== - var __SeriesCtorArgs = function(plot){ + var __SeriesCtorArgs = { // summary: // An optional arguments object that can be used in the Series constructor. // plot: String? // The plot (by name) that this series belongs to. - this.plot = plot; }; =====*/ /*===== - var __BaseAxisCtorArgs = function(vertical, min, max, from, to){ + var __BaseAxisCtorArgs = { // summary: // Optional arguments used in the definition of an invisible axis. - // // vertical: Boolean? // A flag that says whether an axis is vertical (i.e. y axis) or horizontal. Default is false (horizontal). // min: Number? // The smallest value on an axis. Default is 0. // max: Number? // The largest value on an axis. Default is 1. - this.vertical = vertical; - this.min = min; - this.max = max; }; =====*/ diff --git a/charting/Series.js b/charting/Series.js index 805d1a4378..df4a62549d 100644 --- a/charting/Series.js +++ b/charting/Series.js @@ -1,12 +1,11 @@ define(["dojo/_base/lang", "dojo/_base/declare", "./Element"], function(lang, declare, Element){ /*===== - var __SeriesCtorArgs = function(plot){ + var __SeriesCtorArgs = { // summary: // An optional arguments object that can be used in the Series constructor. // plot: String? // The plot (by name) that this series belongs to. - this.plot = plot; }; =====*/ return declare("dojox.charting.Series", Element, { diff --git a/charting/Theme.js b/charting/Theme.js index bc97cd7f23..e70c9f9ed6 100644 --- a/charting/Theme.js +++ b/charting/Theme.js @@ -10,7 +10,7 @@ define(["dojo/_base/lang", "dojo/_base/declare", "dojo/_base/Color", "./SimpleTh }); /*===== - var __DefineColorArgs = function(num, colors, hue, saturation, low, high, base, generator){ + var __DefineColorArgs = { // summary: // The arguments object that can be passed to define colors for a theme. // num: Number? @@ -28,15 +28,7 @@ define(["dojo/_base/lang", "dojo/_base/declare", "dojo/_base/Color", "./SimpleTh // base: String|dojo/_base/Color? // A base color to use if we are defining colors using dojox.color.Palette // generator: String? - // The generator function name from dojox.color.Palette. - this.num = num; - this.colors = colors; - this.hue = hue; - this.saturation = saturation; - this.low = low; - this.high = high; - this.base = base; - this.generator = generator; + // The generator function name from dojox/color/Palette. }; =====*/ lang.mixin(Theme, { diff --git a/charting/axis2d/Base.js b/charting/axis2d/Base.js index d6b0e63a7a..50dc4618bd 100644 --- a/charting/axis2d/Base.js +++ b/charting/axis2d/Base.js @@ -1,19 +1,15 @@ define(["dojo/_base/declare", "../Element"], function(declare, Element){ /*===== - var __BaseAxisCtorArgs = function(vertical, min, max, from, to){ + var __BaseAxisCtorArgs = { // summary: // Optional arguments used in the definition of an invisible axis. - // // vertical: Boolean? // A flag that says whether an axis is vertical (i.e. y axis) or horizontal. Default is false (horizontal). // min: Number? // The smallest value on an axis. Default is 0. // max: Number? // The largest value on an axis. Default is 1. - this.vertical = vertical; - this.min = min; - this.max = max; }; =====*/ return declare("dojox.charting.axis2d.Base", Element, { diff --git a/charting/axis2d/Default.js b/charting/axis2d/Default.js index cf775c6bb4..a37da2aa6e 100644 --- a/charting/axis2d/Default.js +++ b/charting/axis2d/Default.js @@ -5,17 +5,9 @@ define(["dojo/_base/lang", "dojo/_base/array", "dojo/_base/sniff", "dojo/_base/d lin, acommon, g, du, df){ /*===== - var __AxisCtorArgs = function( - vertical, fixUpper, fixLower, natural, leftBottom, - includeZero, fixed, majorLabels, minorTicks, minorLabels, microTicks, htmlLabels, - min, max, from, to, majorTickStep, minorTickStep, microTickStep, - labels, labelFunc, maxLabelSize, - stroke, majorTick, minorTick, microTick, tick, - font, fontColor, titleGap, titleFont, titleFontColor, titleOrientation, enableCache, dropLabels, labelSizeChange){ - + var __AxisCtorArgs = { // summary: // Optional arguments used in the definition of an axis. - // // vertical: Boolean? // A flag that says whether an axis is vertical (i.e. y axis) or horizontal. Default is false (horizontal). // fixUpper: String? @@ -101,39 +93,6 @@ define(["dojo/_base/lang", "dojo/_base/array", "dojo/_base/sniff", "dojo/_base/d // labelSizeChange: Boolean? // Indicates to the axis whether the axis labels are changing their size on zoom. If false this allows to // optimize the axis by avoiding recomputing labels maximum size on zoom actions. Default is false. - - this.vertical = vertical; - this.fixUpper = fixUpper; - this.fixLower = fixLower; - this.natural = natural; - this.leftBottom = leftBottom; - this.includeZero = includeZero; - this.fixed = fixed; - this.majorLabels = majorLabels; - this.minorTicks = minorTicks; - this.minorLabels = minorLabels; - this.microTicks = microTicks; - this.htmlLabels = htmlLabels; - this.min = min; - this.max = max; - this.from = from; - this.to = to; - this.majorTickStep = majorTickStep; - this.minorTickStep = minorTickStep; - this.microTickStep = microTickStep; - this.labels = labels; - this.labelFunc = labelFunc; - this.maxLabelSize = maxLabelSize; - this.stroke = stroke; - this.majorTick = majorTick; - this.minorTick = minorTick; - this.microTick = microTick; - this.tick = tick; - this.font = font; - this.fontColor = fontColor; - this.enableCache = enableCache; - this.dropLabels = dropLabels; - this.labelSizeChange = labelSizeChange; }; =====*/ @@ -142,37 +101,37 @@ define(["dojo/_base/lang", "dojo/_base/array", "dojo/_base/sniff", "dojo/_base/d return declare("dojox.charting.axis2d.Default", Invisible, { // summary: // The default axis object used in dojox.charting. See dojox.charting.Chart.addAxis for details. - // + // defaultParams: Object // The default parameters used to define any axis. // optionalParams: Object // Any optional parameters needed to define an axis. - /* - // TODO: the documentation tools need these to be pre-defined in order to pick them up - // correctly, but the code here is partially predicated on whether or not the properties - // actually exist. For now, we will leave these undocumented but in the code for later. -- TRT + /*===== + // TODO: the documentation tools need these to be pre-defined in order to pick them up + // correctly, but the code here is partially predicated on whether or not the properties + // actually exist. For now, we will leave these undocumented but in the code for later. -- TRT - // opt: Object - // The actual options used to define this axis, created at initialization. - // scaler: Object - // The calculated helper object to tell charts how to draw an axis and any data. - // ticks: Object - // The calculated tick object that helps a chart draw the scaling on an axis. - // dirty: Boolean - // The state of the axis (whether it needs to be redrawn or not) - // scale: Number - // The current scale of the axis. - // offset: Number - // The current offset of the axis. + // opt: Object + // The actual options used to define this axis, created at initialization. + // scaler: Object + // The calculated helper object to tell charts how to draw an axis and any data. + // ticks: Object + // The calculated tick object that helps a chart draw the scaling on an axis. + // dirty: Boolean + // The state of the axis (whether it needs to be redrawn or not) + // scale: Number + // The current scale of the axis. + // offset: Number + // The current offset of the axis. - opt: null, - scaler: null, - ticks: null, - dirty: true, - scale: 1, - offset: 0, - */ + opt: null, + scaler: null, + ticks: null, + dirty: true, + scale: 1, + offset: 0, + =====*/ defaultParams: { vertical: false, // true for vertical axis fixUpper: "none", // align the upper on ticks: "major", "minor", "micro", "none" diff --git a/charting/axis2d/Invisible.js b/charting/axis2d/Invisible.js index 5d0d12a21c..b3695273bb 100644 --- a/charting/axis2d/Invisible.js +++ b/charting/axis2d/Invisible.js @@ -3,14 +3,9 @@ define(["dojo/_base/lang", "dojo/_base/declare", "./Base", "../scaler/linear", function(lang, declare, Base, lin, g, du){ /*===== - var __InvisibleAxisCtorArgs = function( - vertical, fixUpper, fixLower, natural, leftBottom, - includeZero, fixed, majorLabels, minorTicks, minorLabels, microTicks, - min, max, from, to, majorTickStep, minorTickStep, microTickStep){ - + var __InvisibleAxisCtorArgs = { // summary: // Optional arguments used in the definition of an invisible axis. - // // vertical: Boolean? // A flag that says whether an axis is vertical (i.e. y axis) or horizontal. Default is false (horizontal). // fixUpper: String? @@ -41,21 +36,6 @@ define(["dojo/_base/lang", "dojo/_base/declare", "./Base", "../scaler/linear", // the data range. // microTickStep: Number? // The amount to skip before a micro tick is drawn. When not set the micro ticks step is computed from - - this.vertical = vertical; - this.fixUpper = fixUpper; - this.fixLower = fixLower; - this.natural = natural; - this.leftBottom = leftBottom; - this.includeZero = includeZero; - this.fixed = fixed; - this.min = min; - this.max = max; - this.from = from; - this.to = to; - this.majorTickStep = majorTickStep; - this.minorTickStep = minorTickStep; - this.microTickStep = microTickStep; }; =====*/ diff --git a/charting/plot2d/Base.js b/charting/plot2d/Base.js index e398e820e1..ddb885cc98 100644 --- a/charting/plot2d/Base.js +++ b/charting/plot2d/Base.js @@ -3,7 +3,7 @@ define(["dojo/_base/declare", "./common"], function(declare, Element, arr, common){ /*===== -dojox.charting.plot2d.__PlotCtorArgs = function(){ +dojox.charting.plot2d.__PlotCtorArgs = { // summary: // The base keyword arguments object for plot constructors. // Note that the parameters for this may change based on the diff --git a/color/Palette.js b/color/Palette.js index 91848c5a56..946c673be1 100644 --- a/color/Palette.js +++ b/color/Palette.js @@ -144,14 +144,13 @@ define(["dojo/_base/lang", "dojo/_base/array", "./_base"], } /*===== -var __transformArgs = function(use, dr, dg, db, da, dc, dm, dy, dk, dh, ds, dv, dl){ +var __transformArgs = { // summary: // The keywords argument to be passed to the dojox.color.Palette.transform function. Note that // while all arguments are optional, *some* arguments must be passed. The basic concept is that // you pass a delta value for a specific aspect of a color model (or multiple aspects of the same // color model); for instance, if you wish to transform a palette based on the HSV color model, // you would pass one of "dh", "ds", or "dv" as a value. - // // use: String? // Specify the color model to use for the transformation. Can be "rgb", "rgba", "hsv", "hsl", "cmy", "cmyk". // dr: Number? @@ -178,56 +177,34 @@ var __transformArgs = function(use, dr, dg, db, da, dc, dm, dy, dk, dh, ds, dv, // The delta to be applied to the luminosity aspect of the HSL color model. // dv: Number? // The delta to be applied to the value aspect of the HSV color model. - this.use = use; - this.dr = dr; - this.dg = dg; - this.db = db; - this.da = da; - this.dc = dc; - this.dm = dm; - this.dy = dy; - this.dk = dk; - this.dh = dh; - this.ds = ds; - this.dl = dl; - this.dv = dv; -} -var __generatorArgs = function(base){ +}; +var __generatorArgs = { // summary: // The keyword arguments object used to create a palette based on a base color. - // // base: dojo/_base/Color // The base color to be used to generate the palette. - this.base = base; -} -var __analogousArgs = function(base, high, low){ +}; +var __analogousArgs = { // summary: // The keyword arguments object that is used to create a 5 color palette based on the // analogous rules as implemented at http://kuler.adobe.com, using the HSV color model. - // // base: dojo/_base/Color // The base color to be used to generate the palette. // high: Number? // The difference between the hue of the base color and the highest hue. In degrees, default is 60. // low: Number? // The difference between the hue of the base color and the lowest hue. In degrees, default is 18. - this.base = base; - this.high = high; - this.low = low; -} -var __splitComplementaryArgs = function(base, da){ +}; +var __splitComplementaryArgs = { // summary: // The keyword arguments object used to create a palette based on the split complementary rules // as implemented at http://kuler.adobe.com. - // // base: dojo/_base/Color // The base color to be used to generate the palette. // da: Number? // The delta angle to be used to determine where the split for the complementary rules happen. // In degrees, the default is 30. - this.base = base; - this.da = da; -} +}; =====*/ // object methods --------------------------------------------------------------- diff --git a/date/relative.js b/date/relative.js index 1387a8eac3..a376900f9e 100644 --- a/date/relative.js +++ b/date/relative.js @@ -3,16 +3,13 @@ define(["..", "dojo/_base/lang", "dojo/date/locale", "dojo/i18n"], function(dojo var drelative = lang.getObject("date.relative", true, dojox); /*===== -var __FormatOptions = function(){ +var __FormatOptions = { // locale: String // override the locale used to determine formatting rules // relativeDate: Date // Date to calculate relation to (defaults to new Date()) // weekCheck: boolean // Whether or not to display the day of week (defaults true) - this.locale = locale; - this.relativeDate = relativeDate; - this.weekCheck = weekCheck; }; =====*/ diff --git a/embed/Flash.js b/embed/Flash.js index d96390a7a2..1c83748aa8 100644 --- a/embed/Flash.js +++ b/embed/Flash.js @@ -152,7 +152,7 @@ define(["dojo"], function(dojo) { /*===== -var __flashArgs = function(path, id, width, height, style, params, vars, expressInstall, redirect){ +var __flashArgs = { // path: String // The URL of the movie to embed. // id: String? @@ -162,7 +162,7 @@ var __flashArgs = function(path, id, width, height, style, params, vars, express // The width of the embedded movie; the default value is 320px. // height: Number? // The height of the embedded movie; the default value is 240px - // minimumVersion: Number ? + // minimumVersion: Number? // The minimum targeted version of the Flash Player (defaults to 9) // style: String? // Any CSS style information (i.e. style="background-color:transparent") you want @@ -175,16 +175,6 @@ var __flashArgs = function(path, id, width, height, style, params, vars, express // Whether or not to include any kind of expressInstall info. Default is false. // redirect: String? // A url to redirect the browser to if the current Flash version is not supported. - this.id=id; - this.path=path; - this.width=width; - this.minimumVersion=minimumVersion; - this.height=height; - this.style=style; - this.params=params; - this.vars=vars; - this.expressInstall=expressInstall; - this.redirect=redirect; }; =====*/ diff --git a/embed/Quicktime.js b/embed/Quicktime.js index 8241c88204..b3a1c17450 100644 --- a/embed/Quicktime.js +++ b/embed/Quicktime.js @@ -109,7 +109,7 @@ define([ } /*===== - var __QTArgs = function(path, id, width, height, params, redirect){ + var __QTArgs = { // path: String // The URL of the movie to embed. // id: String? @@ -123,12 +123,6 @@ define([ // A set of key/value pairs that you want to define in the resultant markup. // redirect: String? // A url to redirect the browser to if the current QuickTime version is not supported. - this.id=id; - this.path=path; - this.width=width; - this.height=height; - this.params=params; - this.redirect=redirect; }; =====*/ diff --git a/form/ListInput.js b/form/ListInput.js index 780b6faea1..eb50b0a527 100755 --- a/form/ListInput.js +++ b/form/ListInput.js @@ -21,16 +21,14 @@ define([ ], function(kernel, lang, array, jsonUtil, fx, win, connect, domClass, domStyle, domConstruct, domGeometry, keys, Widget, TemplatedMixin, FormValueWidget, ValidationTextBox, InlineEditBox, i18nCommon, declare){ kernel.experimental("dojox.form.ListInput"); - /*===== - var __Constraints = function(){ - // locale: String - // locale used for validation, picks up value from this widget's lang attribute - // _flags_: anything - // various flags passed to pattern function - this.locale = ""; - this._flags_ = ""; - }; - =====*/ +/*===== +var __Constraints = { + // locale: String + // locale used for validation, picks up value from this widget's lang attribute + // _flags_: anything + // various flags passed to pattern function +}; +=====*/ var ListInput = declare("dojox.form.ListInput", [FormValueWidget], { diff --git a/geo/charting/MouseInteractionSupport.js b/geo/charting/MouseInteractionSupport.js index a838c774d0..a43a0b75c4 100644 --- a/geo/charting/MouseInteractionSupport.js +++ b/geo/charting/MouseInteractionSupport.js @@ -10,19 +10,15 @@ define([ ], function(lang, declare, event, connect, win, html, dom, has){ /*===== - dojox.geo.charting.__MouseInteractionSupportCtorArgs = function(enableZoom, enablePan, mouseClickThreshold){ + dojox.geo.charting.__MouseInteractionSupportCtorArgs = { // summary: // The keyword arguments that can be passed in a MouseInteractionSupport constructor. - // // enableZoom: Boolean? // Indicates whether zooming is enabled. // enablePan: Boolean? // Indicates whether panning is enabled. // mouseClickThreshold: Number? // The threshold (in pixel) that differentiates a drag from a click. - this.enableZoom = enableZoom; - this.enablePan = enablePan; - this.mouseClickThreshold = mouseClickThreshold; }; =====*/ diff --git a/geo/openlayers/JsonImport.js b/geo/openlayers/JsonImport.js index 0e13cb1b37..a5c970fdcf 100644 --- a/geo/openlayers/JsonImport.js +++ b/geo/openlayers/JsonImport.js @@ -9,21 +9,17 @@ define([ ], function(declare, xhr, lang, array, LineString, Collection, GeometryFeature){ /*===== - dojox.geo.openlayers.__JsonImportArgs = function(url, nextFeature, error){ + dojox.geo.openlayers.__JsonImportArgs = { // summary: // The keyword arguments that can be passed in a JsonImport constructor. - // // url: String // The url pointing to the JSON file to load. // nextFeature: function // The function called each time a feature is read. The function is called with a GeometryFeature as argument. // error: function // Error callback called if something fails. - this.url = url; - this.nextFeature = nextFeature; - this.error = error; - } - =====*/ + }; + =====*/ return declare("dojox.geo.openlayers.JsonImport", null, { // summary: diff --git a/geo/openlayers/Map.js b/geo/openlayers/Map.js index d2e4d21a2e..d64f414db9 100644 --- a/geo/openlayers/Map.js +++ b/geo/openlayers/Map.js @@ -18,10 +18,9 @@ define([ Patch.patchGFX(); /*===== - dojox.geo.openlayers.__MapArgs = function(baseLayerType, baseLayerName, baseLayerUrl, baseLayerOptions){ + dojox.geo.openlayers.__MapArgs = { // summary: // The keyword arguments that can be passed in a Map constructor. - // // baseLayerType: String // type of the base layer. Can be any of // @@ -38,10 +37,6 @@ define([ // Some layer may need an url such as Web Map Server. // baseLayerOptions: String // Additional specific options passed to OpensLayers layer, such as The list of layer to display, for Web Map Server layer. - this.baseLayerType = baseLayerType; - this.baseLayerName = baseLayerName; - this.baseLayerUrl = baseLayerUrl; - this.baseLayerOptions = baseLayerOptions; }; =====*/ diff --git a/geo/openlayers/WidgetFeature.js b/geo/openlayers/WidgetFeature.js index 016f28efff..70d4d91366 100644 --- a/geo/openlayers/WidgetFeature.js +++ b/geo/openlayers/WidgetFeature.js @@ -6,11 +6,10 @@ define([ "./Feature" ], function(declare, style, lang, registry, Feature){ /*===== - dojox.geo.openlayers.__WidgetFeatureArgs = function(createWidget, dojoType, dijitId, widget, width, height, longitude, latitude){ + dojox.geo.openlayers.__WidgetFeatureArgs = { // summary: // The keyword arguments that can be passed in a WidgetFeature constructor. // You must define a least one widget retrieval parameter and the geo-localization parameters. - // // createWidget: Function? // Function for widget creation. Must return a `dijit._Widget. // dojoType: String? @@ -27,14 +26,6 @@ define([ // The longitude, in decimal degrees where to place the widget. // latitude: Number // The latitude, in decimal degrees where to place the widget. - this.createWidget = createWidget; - this.dojoType = dojoType; - this.dijitId = dijitId; - this.widget = widget; - this.width = width; - this.height = height; - this.longitude = longitude; - this.latitude = latitude; }; =====*/ diff --git a/grid/_Grid.js b/grid/_Grid.js index d56ecca5d0..4504a14aa9 100644 --- a/grid/_Grid.js +++ b/grid/_Grid.js @@ -35,7 +35,7 @@ define([ dojo.isCopyKey = dojo.dnd.getCopyKeyState; } /*===== - dojox.grid.__CellDef = function(){ + dojox.grid.__CellDef = { // name: String? // The text to use in the header of the grid for this cell. // get: Function? @@ -89,28 +89,11 @@ define([ // attrs: String? // A space separated string of attribute='value' pairs to add to // the header cell element and main grid cell elements. - this.name = name; - this.value = value; - this.get = get; - this.formatter = formatter; - this.type = type; - this.editable = editable; - this.hidden = hidden; - this.width = width; - this.colSpan = colSpan; - this.rowSpan = rowSpan; - this.styles = styles; - this.headerStyles = headerStyles; - this.cellStyles = cellStyles; - this.classes = classes; - this.headerClasses = headerClasses; - this.cellClasses = cellClasses; - this.attrs = attrs; }; =====*/ /*===== - dojox.grid.__ViewDef = function(){ + dojox.grid.__ViewDef = { // noscroll: Boolean? // If true, no scrollbars will be rendered without scrollbars. // width: Integer|String? @@ -141,13 +124,6 @@ define([ // header is rendered, rowIndex will be -1. "cells" is a reference to the // internal structure of this view's cells so any changes you make to // it will persist between calls. - this.noscroll = noscroll; - this.width = width; - this.cells = cells; - this.type = type; - this.defaultCell = defaultCell; - this.onBeforeRow = onBeforeRow; - this.onAfterRow = onAfterRow; }; =====*/ diff --git a/io/OAuth.js b/io/OAuth.js index 187088785b..7035639869 100644 --- a/io/OAuth.js +++ b/io/OAuth.js @@ -222,15 +222,13 @@ dojox.io.OAuth = new (function(){ } /*===== - dojox.io.OAuth.__AccessorArgs = function(key, secret){ + dojox.io.OAuth.__AccessorArgs = { // key: String // The key or token issued to either the consumer or by the OAuth service. // secret: String // The secret (shared secret for consumers, issued secret by OAuth service). - this.key = key; - this.secret = secret; }; - dojox.io.OAuth.__OAuthArgs = function(consumer, sig_method, token){ + dojox.io.OAuth.__OAuthArgs = { // consumer: dojox.io.OAuth.__AccessorArgs // The consumer information issued to your OpenAuth application. // sig_method: String @@ -238,9 +236,7 @@ dojox.io.OAuth = new (function(){ // token: dojox.io.OAuth.__AccessorArgs? // The request token and secret issued by the OAuth service. If not // issued yet, this should be null. - this.consumer = consumer; - this.token = token; - } + }; =====*/ /* diff --git a/io/xhrMultiPart.js b/io/xhrMultiPart.js index 0501aad7ff..914ce81df6 100644 --- a/io/xhrMultiPart.js +++ b/io/xhrMultiPart.js @@ -8,7 +8,7 @@ define([ dojo.getObject("io.xhrMultiPart", true, dojox); /*===== - var __xhrContentArgs = function(){ + var __xhrContentArgs = { // name: String // Name of the form value. // content: String @@ -22,12 +22,6 @@ define([ // Optional charset to pass, for the server to interpret the file correctly. // contentTransferEncoding: String? // Optional transfer encoding header value. - this.name = name; - this.content = content; - this.filename = filename; - this.contentType = contentType; - this.charset = charset; - this.contentTransferEncoding = contentTransferEncoding; }; =====*/ function _createPart(/*__xhrContentArgs */args, /* String */boundary){ @@ -75,7 +69,7 @@ define([ } /*===== - var __xhrMultiArgs = function(){ + var __xhrMultiArgs = { // url: String // URL to server endpoint. // content: Object? @@ -111,16 +105,6 @@ define([ // function(response, ioArgs){}. response is an Object, ioArgs // is of type dojo.__IoCallbackArgs. The handle function will // be called in either the successful or error case. - this.url = url; - this.content = content; - this.file = file; - this.timeout = timeout; - this.form = form; - this.preventCache = preventCache; - this.handleAs = handleAs; - this.load = load; - this.error = error; - this.handle = handle; }; =====*/ dojox.io.xhrMultiPart = function(/* __xhrMultiArgs */args){ diff --git a/lang/oo/mixin.js b/lang/oo/mixin.js index 4c91f8da69..e55677748d 100644 --- a/lang/oo/mixin.js +++ b/lang/oo/mixin.js @@ -35,7 +35,7 @@ dojo.require("dojox.lang.oo.Decorator"); }; /*===== - dojox.lang.oo.__MixinDefaults = function(){ + dojox.lang.oo.__MixinDefaults = { // summary: // a dict of default parameters for dojox.lang.oo._mixin // decorator: Function @@ -44,9 +44,6 @@ dojo.require("dojox.lang.oo.Decorator"); // a filter function to be used in absence of other filters // mixer: Function // a mixer function to be used to mix in new properties - this.decorator = decorator; - this.filter = filter; - this.mixer = mixer; }; =====*/