Skip to content

Commit

Permalink
Fix MID's in dojo/ and dijit/ modules to be relative paths (when poss…
Browse files Browse the repository at this point in the history
…ible), and convert "." --> "./main".

The "./main" references in dijit/ modules are for exporting symbols to the "dijit" namespace and thus will be removed in 2.0, but before that (for consistency) maybe it's worth changing the code to export via setObject(), like dojo.declare() does.

Fixes #14742 !strict.

git-svn-id: http://svn.dojotoolkit.org/src/dijit/trunk@27778 560b804f-0ae3-0310-86f3-f6aa0a117693
  • Loading branch information
wkeese committed Feb 8, 2012
1 parent 60443e4 commit eedaada
Show file tree
Hide file tree
Showing 21 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion BackgroundIframe.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
define([
"require", // require.toUrl
".", // to export dijit.BackgroundIframe
"./main", // to export dijit.BackgroundIframe
"dojo/_base/config",
"dojo/dom-construct", // domConstruct.create
"dojo/dom-style", // domStyle.set
Expand Down
2 changes: 1 addition & 1 deletion Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ define([
"./DialogUnderlay",
"./layout/ContentPane",
"dojo/text!./templates/Dialog.html",
".", // for back-compat, exporting dijit._underlay (remove in 2.0)
"./main", // for back-compat, exporting dijit._underlay (remove in 2.0)
"dojo/i18n!./nls/common"
], function(require, array, connect, declare, Deferred,
dom, domClass, domGeometry, domStyle, event, fx, i18n, kernel, keys, lang, on, ready, has, win, winUtils,
Expand Down
2 changes: 1 addition & 1 deletion Editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ define([
"./_editor/html",
"./_editor/range",
"./_editor/RichText",
".", // dijit._scopeName
"./main", // dijit._scopeName
"dojo/i18n!./_editor/nls/commands"
], function(array, declare, Deferred, i18n, domAttr, domClass, domGeometry, domStyle,
event, keys, lang, has, string, topic, win,
Expand Down
2 changes: 1 addition & 1 deletion Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ define([
"./_TemplatedMixin",
"./BackgroundIframe",
"dojo/text!./templates/Tooltip.html",
"." // sets dijit.showTooltip etc. for back-compat
"./main" // sets dijit.showTooltip etc. for back-compat
], function(array, declare, fx, dom, domClass, domGeometry, domStyle, lang, mouse, on, has, win,
manager, place, _Widget, _TemplatedMixin, BackgroundIframe, template, dijit){

Expand Down
2 changes: 1 addition & 1 deletion TooltipDialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define([
"./form/_FormMixin",
"./_TemplatedMixin",
"dojo/text!./templates/TooltipDialog.html",
"." // exports methods to dijit global
"./main" // exports methods to dijit global
], function(declare, domClass, event, keys, lang,
focus, ContentPane, _DialogMixin, _FormMixin, _TemplatedMixin, template, dijit){

Expand Down
2 changes: 1 addition & 1 deletion _Calendar.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
define([
"dojo/_base/kernel", // kernel.deprecated
"./Calendar",
"." // for exporting dijit.Calendar
"./main" // for exporting dijit.Calendar
], function(kernel, Calendar, dijit){

// module:
Expand Down
2 changes: 1 addition & 1 deletion _CssStateMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ define([
"dojo/ready",
"dojo/touch",
"dojo/_base/window", // win.body
"dijit/registry"
"./registry"
], function(array, declare, dom, domClass, lang, ready, touch, win, registry){

// module:
Expand Down
2 changes: 1 addition & 1 deletion _TimePicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ define([
"dojo/_base/lang", // lang.mixin
"dojo/sniff", // has(...)
"dojo/query", // query
"dijit/typematic",
"./typematic",
"./_Widget",
"./_TemplatedMixin",
"./form/_FormValueWidget",
Expand Down
2 changes: 1 addition & 1 deletion _WidgetsInTemplateMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ define([
"dojo/_base/array", // array.forEach
"dojo/_base/declare", // declare
"dojo/parser", // parser.parse
"dijit/registry" // registry.findWidgets
"./registry" // registry.findWidgets
], function(array, declare, parser, registry){

// module:
Expand Down
2 changes: 1 addition & 1 deletion _base.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define([
".",
"./main",
"./a11y", // used to be in dijit/_base/manager
"./WidgetSet", // used to be in dijit/_base/manager
"./_base/focus",
Expand Down
2 changes: 1 addition & 1 deletion a11y.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define([
"dojo/dom-attr", // domAttr.attr domAttr.has
"dojo/dom-style", // style.style
"dojo/sniff", // has("ie")
"." // for exporting methods to dijit namespace
"./main" // for exporting methods to dijit namespace
], function(array, config, declare, dom, domAttr, domStyle, has, dijit){

// module:
Expand Down
2 changes: 1 addition & 1 deletion dijit-all.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define([
".",
"./main",
"./dijit",
"./ColorPalette",
"./Declaration",
Expand Down
2 changes: 1 addition & 1 deletion dijit.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define([
".",
"./main",
"./_base",
"dojo/parser",
"./_Widget",
Expand Down
2 changes: 1 addition & 1 deletion focus.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ define([
"dojo/window", // winUtils.get
"./a11y", // a11y.isTabNavigable
"./registry", // registry.byId
"." // to set dijit.focus
"./main" // to set dijit.focus
], function(aspect, declare, dom, domAttr, domConstruct, Evented, lang, on, ready, has, Stateful, unload, win, winUtils,
a11y, registry, dijit){

Expand Down
2 changes: 1 addition & 1 deletion form/_Spinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ define([
"dojo/keys", // keys keys.DOWN_ARROW keys.PAGE_DOWN keys.PAGE_UP keys.UP_ARROW
"dojo/_base/lang", // lang.hitch
"dojo/sniff", // has("mozilla")
"dijit/typematic",
"../typematic",
"./RangeBoundTextBox",
"dojo/text!./templates/Spinner.html",
"./_TextBoxMixin" // selectInputText
Expand Down
2 changes: 1 addition & 1 deletion place.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ define([
"dojo/_base/kernel", // kernel.deprecated
"dojo/_base/window", // win.body
"dojo/window", // winUtils.getBox
"." // dijit (defining dijit.place to match API doc)
"./main" // dijit (defining dijit.place to match API doc)
], function(array, domGeometry, domStyle, kernel, win, winUtils, dijit){

// module:
Expand Down
2 changes: 1 addition & 1 deletion popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ define([
"dojo/_base/window", // win.body
"./place",
"./BackgroundIframe",
"." // dijit (defining dijit.popup to match API doc)
"./main" // dijit (defining dijit.popup to match API doc)
], function(array, aspect, connect, declare, dom, domAttr, domConstruct, domGeometry, domStyle, event, keys, lang, on, has, win,
place, BackgroundIframe, dijit){

Expand Down
2 changes: 1 addition & 1 deletion registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ define([
"dojo/sniff", // has("ie")
"dojo/_base/unload", // unload.addOnWindowUnload
"dojo/_base/window", // win.body
"." // dijit._scopeName
"./main" // dijit._scopeName
], function(array, has, unload, win, dijit){

// module:
Expand Down
2 changes: 1 addition & 1 deletion robot.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
define([
".",
"./main",
"dojo/robot"
], function(dijit){
// module:
Expand Down
2 changes: 1 addition & 1 deletion robotx.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
define([
"dojo/_base/kernel", // dojo.experimental lang.mixin
".",
"./main",
"dojo/_base/lang", // dojo.experimental lang.mixin
"./robot",
"dojo/robotx",
Expand Down
2 changes: 1 addition & 1 deletion typematic.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ define([
"dojo/_base/lang", // lang.mixin, lang.hitch
"dojo/on",
"dojo/sniff", // has("ie")
"." // setting dijit.typematic global
"./main" // setting dijit.typematic global
], function(array, connect, event, kernel, lang, on, has, dijit){

// module:
Expand Down

0 comments on commit eedaada

Please sign in to comment.