diff --git a/Calendar.js b/Calendar.js index 03e796f32..93d8cb850 100644 --- a/Calendar.js +++ b/Calendar.js @@ -1,4 +1,21 @@ -define("dijit/Calendar", ["dojo", "dijit", "text!dijit/templates/Calendar.html", "dojo/string", "dojo/cldr/supplemental", "dojo/date", "dojo/date/locale", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_CssStateMixin", "dijit/form/DropDownButton"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/Calendar.html", + "dojo/string", + "dojo/cldr/supplemental", + "dojo/date", + "dojo/date/locale", + "./_Widget", + "./_TemplatedMixin", + "./_CssStateMixin", + "./form/DropDownButton"], function(dojo, dijit) { + // module: + // dijit/Calendar + // summary: + // TODOC + // + dojo.declare( "dijit.Calendar", diff --git a/CheckedMenuItem.js b/CheckedMenuItem.js index 90154b998..8149b8749 100644 --- a/CheckedMenuItem.js +++ b/CheckedMenuItem.js @@ -1,4 +1,14 @@ -define("dijit/CheckedMenuItem", ["dojo", "dijit", "text!dijit/templates/CheckedMenuItem.html", "dijit/MenuItem"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/CheckedMenuItem.html", + "./MenuItem"], function(dojo, dijit) { + // module: + // dijit/CheckedMenuItem + // summary: + // TODOC + // + dojo.declare("dijit.CheckedMenuItem", dijit.MenuItem, diff --git a/ColorPalette.js b/ColorPalette.js index 0f6e43fda..19ce32799 100644 --- a/ColorPalette.js +++ b/ColorPalette.js @@ -1,4 +1,19 @@ -define("dijit/ColorPalette", ["dojo", "dijit", "text!dijit/templates/ColorPalette.html", "dijit/_Widget", "dijit/_TemplatedMixin", "dojo/colors", "dojo/i18n", "dijit/_PaletteMixin", "i18n!dojo/nls/colors"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/ColorPalette.html", + "./_Widget", + "./_TemplatedMixin", + "dojo/colors", + "dojo/i18n", + "./_PaletteMixin", + "dojo/i18n!dojo/nls/colors"], function(dojo, dijit) { + // module: + // dijit/ColorPalette + // summary: + // TODOC + // + dojo.declare("dijit.ColorPalette", [dijit._Widget, dijit._TemplatedMixin, dijit._PaletteMixin], diff --git a/Declaration.js b/Declaration.js index e15bfef8f..a3470b6fc 100644 --- a/Declaration.js +++ b/Declaration.js @@ -1,4 +1,15 @@ -define("dijit/Declaration", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_Widget", + "./_TemplatedMixin", + "./_WidgetsInTemplateMixin"], function(dojo, dijit) { + // module: + // dijit/Declaration + // summary: + // TODOC + // + dojo.declare( "dijit.Declaration", diff --git a/Dialog.js b/Dialog.js index fa87f2964..9846c78b0 100644 --- a/Dialog.js +++ b/Dialog.js @@ -1,4 +1,26 @@ -define("dijit/Dialog", ["dojo", "dijit", "text!dijit/templates/Dialog.html", "dojo/dnd/move", "dojo/dnd/TimedMoveable", "dojo/fx", "dojo/window", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_CssStateMixin", "dijit/form/_FormMixin", "dijit/_DialogMixin", "dijit/DialogUnderlay", "dijit/layout/ContentPane", "i18n!dijit/nls/common", "dijit/TooltipDialog"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/Dialog.html", + "dojo/dnd/move", + "dojo/dnd/TimedMoveable", + "dojo/fx", + "dojo/window", + "./_Widget", + "./_TemplatedMixin", + "./_CssStateMixin", + "./form/_FormMixin", + "./_DialogMixin", + "./DialogUnderlay", + "./layout/ContentPane", + "dojo/i18n!./nls/common", + "./TooltipDialog"], function(dojo, dijit) { + // module: + // dijit/Dialog + // summary: + // TODOC + // + // dijit/TooltipDialog required for back-compat. TODO: remove in 2.0 diff --git a/DialogUnderlay.js b/DialogUnderlay.js index b200bbc40..5fa065c1a 100644 --- a/DialogUnderlay.js +++ b/DialogUnderlay.js @@ -1,4 +1,15 @@ -define("dijit/DialogUnderlay", ["dojo", "dijit", "dojo/window", "dijit/_Widget", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/window", + "./_Widget", + "./_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/DialogUnderlay + // summary: + // TODOC + // + dojo.declare( "dijit.DialogUnderlay", diff --git a/Editor.js b/Editor.js index 584d278ca..d3e404b74 100644 --- a/Editor.js +++ b/Editor.js @@ -1,4 +1,23 @@ -define("dijit/Editor", ["dojo", "dijit", "dijit/_editor/RichText", "dijit/Toolbar", "dijit/ToolbarSeparator", "dijit/_editor/_Plugin", "dijit/_editor/plugins/EnterKeyHandling", "dijit/_editor/range", "dijit/_Container", "dojo/i18n", "dijit/layout/_LayoutWidget", "i18n!dijit/_editor/nls/commands", "dijit/form/ToggleButton"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_editor/RichText", + "./Toolbar", + "./ToolbarSeparator", + "./_editor/_Plugin", + "./_editor/plugins/EnterKeyHandling", + "./_editor/range", + "./_Container", + "dojo/i18n", + "./layout/_LayoutWidget", + "dojo/i18n!./_editor/nls/commands", + "./form/ToggleButton"], function(dojo, dijit) { + // module: + // dijit/Editor + // summary: + // TODOC + // + dojo.declare( "dijit.Editor", diff --git a/InlineEditBox.js b/InlineEditBox.js index 3fe4ced20..4d5c0ba21 100644 --- a/InlineEditBox.js +++ b/InlineEditBox.js @@ -1,4 +1,21 @@ -define("dijit/InlineEditBox", ["dojo", "dijit", "text!dijit/templates/InlineEditBox.html", "dojo/i18n", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dijit/_Container", "dijit/form/Button", "dijit/form/TextBox", "i18n!dijit/nls/common"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/InlineEditBox.html", + "dojo/i18n", + "./_Widget", + "./_TemplatedMixin", + "./_WidgetsInTemplateMixin", + "./_Container", + "./form/Button", + "./form/TextBox", + "dojo/i18n!./nls/common"], function(dojo, dijit) { + // module: + // dijit/InlineEditBox + // summary: + // TODOC + // + dojo.declare("dijit.InlineEditBox", dijit._Widget, diff --git a/Menu.js b/Menu.js index 6ba1be6cd..4523e61f0 100644 --- a/Menu.js +++ b/Menu.js @@ -1,4 +1,21 @@ -define("dijit/Menu", ["dojo", "dijit", "text!dijit/templates/Menu.html", "dojo/window", "dijit/_Widget", "dijit/_KeyNavContainer", "dijit/_TemplatedMixin", "dijit/MenuItem", "dijit/PopupMenuItem", "dijit/CheckedMenuItem", "dijit/MenuSeparator"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/Menu.html", + "dojo/window", + "./_Widget", + "./_KeyNavContainer", + "./_TemplatedMixin", + "./MenuItem", + "./PopupMenuItem", + "./CheckedMenuItem", + "./MenuSeparator"], function(dojo, dijit) { + // module: + // dijit/Menu + // summary: + // TODOC + // + // "dijit/MenuItem", "dijit/PopupMenuItem", "dijit/CheckedMenuItem", "dijit/MenuSeparator" for Back-compat (TODO: remove in 2.0) diff --git a/MenuBar.js b/MenuBar.js index 20c8e0e3f..a0787f869 100644 --- a/MenuBar.js +++ b/MenuBar.js @@ -1,4 +1,14 @@ -define("dijit/MenuBar", ["dojo", "dijit", "text!dijit/templates/MenuBar.html", "dijit/Menu"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/MenuBar.html", + "./Menu"], function(dojo, dijit) { + // module: + // dijit/MenuBar + // summary: + // TODOC + // + dojo.declare("dijit.MenuBar", dijit._MenuBase, { // summary: diff --git a/MenuBarItem.js b/MenuBarItem.js index 54b78ad26..734ae5165 100644 --- a/MenuBarItem.js +++ b/MenuBarItem.js @@ -1,4 +1,14 @@ -define("dijit/MenuBarItem", ["dojo", "dijit", "text!dijit/templates/MenuBarItem.html", "dijit/MenuItem"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/MenuBarItem.html", + "./MenuItem"], function(dojo, dijit) { + // module: + // dijit/MenuBarItem + // summary: + // TODOC + // + dojo.declare("dijit._MenuBarItemMixin", null, { templateString: dojo.cache("dijit", "templates/MenuBarItem.html"), diff --git a/MenuItem.js b/MenuItem.js index 2f24fcf67..4e0c31840 100644 --- a/MenuItem.js +++ b/MenuItem.js @@ -1,4 +1,17 @@ -define("dijit/MenuItem", ["dojo", "dijit", "text!dijit/templates/MenuItem.html", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_Contained", "dijit/_CssStateMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/MenuItem.html", + "./_Widget", + "./_TemplatedMixin", + "./_Contained", + "./_CssStateMixin"], function(dojo, dijit) { + // module: + // dijit/MenuItem + // summary: + // TODOC + // + dojo.declare("dijit.MenuItem", [dijit._Widget, dijit._TemplatedMixin, dijit._Contained, dijit._CssStateMixin], diff --git a/MenuSeparator.js b/MenuSeparator.js index 3b5d9dbee..83eef2d7b 100644 --- a/MenuSeparator.js +++ b/MenuSeparator.js @@ -1,4 +1,16 @@ -define("dijit/MenuSeparator", ["dojo", "dijit", "text!dijit/templates/MenuSeparator.html", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_Contained"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/MenuSeparator.html", + "./_Widget", + "./_TemplatedMixin", + "./_Contained"], function(dojo, dijit) { + // module: + // dijit/MenuSeparator + // summary: + // TODOC + // + dojo.declare("dijit.MenuSeparator", [dijit._Widget, dijit._TemplatedMixin, dijit._Contained], diff --git a/PopupMenuBarItem.js b/PopupMenuBarItem.js index dd63b0803..07f468255 100644 --- a/PopupMenuBarItem.js +++ b/PopupMenuBarItem.js @@ -1,4 +1,14 @@ -define("dijit/PopupMenuBarItem", ["dojo", "dijit", "dijit/PopupMenuItem", "dijit/MenuBarItem"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./PopupMenuItem", + "./MenuBarItem"], function(dojo, dijit) { + // module: + // dijit/PopupMenuBarItem + // summary: + // TODOC + // + dojo.declare("dijit.PopupMenuBarItem", [dijit.PopupMenuItem, dijit._MenuBarItemMixin], { // summary: diff --git a/PopupMenuItem.js b/PopupMenuItem.js index a231fe781..17d007ca4 100644 --- a/PopupMenuItem.js +++ b/PopupMenuItem.js @@ -1,4 +1,9 @@ -define("dijit/PopupMenuItem", ["dojo", "dijit", "dijit/MenuItem"], function(dojo, dijit) { +define(["dojo", ".", "./MenuItem"], function(dojo, dijit) { + // module: + // dijit/PopupMenuItem + // summary: + // TODOC + dojo.declare("dijit.PopupMenuItem", dijit.MenuItem, diff --git a/ProgressBar.js b/ProgressBar.js index c83bfe0be..89b1cdcb8 100644 --- a/ProgressBar.js +++ b/ProgressBar.js @@ -1,4 +1,17 @@ -define("dijit/ProgressBar", ["dojo", "dijit", "text!dijit/templates/ProgressBar.html", "dojo/fx", "dojo/number", "dijit/_Widget", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/ProgressBar.html", + "dojo/fx", + "dojo/number", + "./_Widget", + "./_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/ProgressBar + // summary: + // TODOC + // + dojo.declare("dijit.ProgressBar", [dijit._Widget, dijit._TemplatedMixin], { // summary: diff --git a/TitlePane.js b/TitlePane.js index 486e4d31f..ce1de9251 100644 --- a/TitlePane.js +++ b/TitlePane.js @@ -1,4 +1,17 @@ -define("dijit/TitlePane", ["dojo", "dijit", "text!dijit/templates/TitlePane.html", "dojo/fx", "dijit/_TemplatedMixin", "dijit/layout/ContentPane", "dijit/_CssStateMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/TitlePane.html", + "dojo/fx", + "./_TemplatedMixin", + "./layout/ContentPane", + "./_CssStateMixin"], function(dojo, dijit) { + // module: + // dijit/TitlePane + // summary: + // TODOC + // + dojo.declare( "dijit.TitlePane", diff --git a/Toolbar.js b/Toolbar.js index 312ddcde6..758cfc050 100644 --- a/Toolbar.js +++ b/Toolbar.js @@ -1,4 +1,16 @@ -define("dijit/Toolbar", ["dojo", "dijit", "dijit/_Widget", "dijit/_KeyNavContainer", "dijit/_TemplatedMixin", "dijit/ToolbarSeparator"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_Widget", + "./_KeyNavContainer", + "./_TemplatedMixin", + "./ToolbarSeparator"], function(dojo, dijit) { + // module: + // dijit/Toolbar + // summary: + // TODOC + // + // Note: require of ToolbarSeparator is for back-compat, remove for 2.0 diff --git a/ToolbarSeparator.js b/ToolbarSeparator.js index 541ed0b6a..e51151a36 100644 --- a/ToolbarSeparator.js +++ b/ToolbarSeparator.js @@ -1,4 +1,14 @@ -define("dijit/ToolbarSeparator", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_Widget", + "./_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/ToolbarSeparator + // summary: + // TODOC + // + dojo.declare("dijit.ToolbarSeparator", [ dijit._Widget, dijit._TemplatedMixin ], diff --git a/Tooltip.js b/Tooltip.js index ad50353eb..3de1f803d 100644 --- a/Tooltip.js +++ b/Tooltip.js @@ -1,4 +1,14 @@ -define("dijit/Tooltip", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_Widget", + "./_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/Tooltip + // summary: + // TODOC + // + dojo.declare( "dijit._MasterTooltip", diff --git a/TooltipDialog.js b/TooltipDialog.js index b3aeb36ba..5cdda6b7d 100644 --- a/TooltipDialog.js +++ b/TooltipDialog.js @@ -1,4 +1,17 @@ -define("dijit/TooltipDialog", ["dojo", "dijit", "text!dijit/templates/TooltipDialog.html", "dijit/layout/ContentPane", "dijit/_TemplatedMixin", "dijit/form/_FormMixin", "dijit/_DialogMixin"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/TooltipDialog.html", + "./layout/ContentPane", + "./_TemplatedMixin", + "./form/_FormMixin", + "./_DialogMixin"], function(dojo, dijit) { + // module: + // dijit/TooltipDialog + // summary: + // TODOC + // + dojo.declare( "dijit.TooltipDialog", diff --git a/Tree.js b/Tree.js index f88e7b702..e066fc3b9 100644 --- a/Tree.js +++ b/Tree.js @@ -1,4 +1,25 @@ -define("dijit/Tree", ["dojo", "dijit", "text!dijit/templates/TreeNode.html", "text!dijit/templates/Tree.html", "dojo/fx", "dojo/DeferredList", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_Container", "dijit/_Contained", "dijit/_CssStateMixin", "dojo/cookie", "dijit/tree/TreeStoreModel", "dijit/tree/ForestStoreModel", "dijit/tree/_dndSelector"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/TreeNode.html", + "dojo/text!./templates/Tree.html", + "dojo/fx", + "dojo/DeferredList", + "./_Widget", + "./_TemplatedMixin", + "./_Container", + "./_Contained", + "./_CssStateMixin", + "dojo/cookie", + "./tree/TreeStoreModel", + "./tree/ForestStoreModel", + "./tree/_dndSelector"], function(dojo, dijit) { + // module: + // dijit/Tree + // summary: + // TODOC + // + dojo.declare( "dijit._TreeNode", diff --git a/_BidiSupport.js b/_BidiSupport.js index 729484156..7e0831bb4 100644 --- a/_BidiSupport.js +++ b/_BidiSupport.js @@ -1,4 +1,9 @@ -define("dijit/_BidiSupport", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", "."], function(dojo, dijit) { + // module: + // dijit/_BidiSupport + // summary: + // TODOC + dojo.require("dijit._WidgetBase"); diff --git a/_Calendar.js b/_Calendar.js index f4454f224..92569355e 100644 --- a/_Calendar.js +++ b/_Calendar.js @@ -1,4 +1,9 @@ -define("dijit/_Calendar", ["dojo", "dijit", "dijit/Calendar"], function(dojo, dijit) { +define(["dojo", ".", "./Calendar"], function(dojo, dijit) { + // module: + // dijit/_Calendar + // summary: + // TODOC + dojo.deprecated("dijit._Calendar is deprecated", "dijit._Calendar moved to dijit.Calendar", 1.5); diff --git a/_Contained.js b/_Contained.js index 25b2417db..6a8655d71 100644 --- a/_Contained.js +++ b/_Contained.js @@ -1,4 +1,9 @@ -define("dijit/_Contained", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", "."], function(dojo, dijit) { + // module: + // dijit/_Contained + // summary: + // TODOC + dojo.declare("dijit._Contained", null, diff --git a/_Container.js b/_Container.js index 57c88178d..eb107e30d 100644 --- a/_Container.js +++ b/_Container.js @@ -1,4 +1,9 @@ -define("dijit/_Container", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", "."], function(dojo, dijit) { + // module: + // dijit/_Container + // summary: + // TODOC + dojo.declare("dijit._Container", null, diff --git a/_CssStateMixin.js b/_CssStateMixin.js index b25a379df..cc9ab3eb1 100644 --- a/_CssStateMixin.js +++ b/_CssStateMixin.js @@ -1,4 +1,9 @@ -define("dijit/_CssStateMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", "."], function(dojo, dijit) { + // module: + // dijit/_CssStateMixin + // summary: + // TODOC + dojo.declare("dijit._CssStateMixin", [], { // summary: diff --git a/_DialogMixin.js b/_DialogMixin.js index 953960f02..f9f54f87c 100644 --- a/_DialogMixin.js +++ b/_DialogMixin.js @@ -1,4 +1,9 @@ -define("dijit/_DialogMixin", ["dojo", "dijit", "dijit/_Widget"], function(dojo, dijit) { +define(["dojo", ".", "./_Widget"], function(dojo, dijit) { + // module: + // dijit/_DialogMixin + // summary: + // TODOC + dojo.declare("dijit._DialogMixin", null, { diff --git a/_HasDropDown.js b/_HasDropDown.js index eb29a1a01..d70749d21 100644 --- a/_HasDropDown.js +++ b/_HasDropDown.js @@ -1,4 +1,9 @@ -define("dijit/_HasDropDown", ["dojo", "dijit", "dijit/_Widget"], function(dojo, dijit) { +define(["dojo", ".", "./_Widget"], function(dojo, dijit) { + // module: + // dijit/_HasDropDown + // summary: + // TODOC + dojo.declare("dijit._HasDropDown", null, diff --git a/_KeyNavContainer.js b/_KeyNavContainer.js index c50d64832..689b34ade 100644 --- a/_KeyNavContainer.js +++ b/_KeyNavContainer.js @@ -1,4 +1,9 @@ -define("dijit/_KeyNavContainer", ["dojo", "dijit", "dijit/_Container"], function(dojo, dijit) { +define(["dojo", ".", "./_Container"], function(dojo, dijit) { + // module: + // dijit/_KeyNavContainer + // summary: + // TODOC + dojo.declare("dijit._KeyNavContainer", dijit._Container, diff --git a/_PaletteMixin.js b/_PaletteMixin.js index a265a1699..275d2b24b 100644 --- a/_PaletteMixin.js +++ b/_PaletteMixin.js @@ -1,4 +1,9 @@ -define("dijit/_PaletteMixin", ["dojo", "dijit", "dijit/_CssStateMixin"], function(dojo, dijit) { +define(["dojo", ".", "./_CssStateMixin"], function(dojo, dijit) { + // module: + // dijit/_PaletteMixin + // summary: + // TODOC + dojo.declare("dijit._PaletteMixin", [dijit._CssStateMixin], diff --git a/_Templated.js b/_Templated.js index 604d58ebe..bc5d614db 100644 --- a/_Templated.js +++ b/_Templated.js @@ -1,4 +1,17 @@ -define("dijit/_Templated", ["dojo", "dijit", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dojo/string", "dojo/parser", "dojo/cache"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_TemplatedMixin", + "./_WidgetsInTemplateMixin", + "dojo/string", + "dojo/parser", + "dojo/cache"], function(dojo, dijit) { + // module: + // dijit/_Templated + // summary: + // TODOC + // + dojo.declare("dijit._Templated", [dijit._TemplatedMixin, dijit._WidgetsInTemplateMixin], { // summary: diff --git a/_TemplatedMixin.js b/_TemplatedMixin.js index 86d69d538..7d5329ef0 100644 --- a/_TemplatedMixin.js +++ b/_TemplatedMixin.js @@ -1,4 +1,15 @@ -define("dijit/_TemplatedMixin", ["dojo", "dijit", "dijit/_Widget", "dojo/string", "dojo/cache"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_Widget", + "dojo/string", + "dojo/cache"], function(dojo, dijit) { + // module: + // dijit/_TemplatedMixin + // summary: + // TODOC + // + dojo.declare("dijit._TemplatedMixin", null, diff --git a/_TimePicker.js b/_TimePicker.js index c41838982..4e41940a4 100644 --- a/_TimePicker.js +++ b/_TimePicker.js @@ -1,4 +1,15 @@ -define("dijit/_TimePicker", ["dojo", "dijit", "text!dijit/templates/TimePicker.html", "dijit/form/_FormWidget", "dojo/date/locale"], function(dojo, dijit) { +define([ + "dojo", + ".", + "dojo/text!./templates/TimePicker.html", + "./form/_FormWidget", + "dojo/date/locale"], function(dojo, dijit) { + // module: + // dijit/_TimePicker + // summary: + // TODOC + // + /*===== dojo.declare( diff --git a/_Widget.js b/_Widget.js index 1fb01cacc..37d69731b 100644 --- a/_Widget.js +++ b/_Widget.js @@ -1,4 +1,14 @@ -define("dijit/_Widget", ["dojo", "dijit", "dijit/_WidgetBase", "dijit/_base"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_WidgetBase", + "./_base"], function(dojo, dijit) { + // module: + // dijit/_Widget + // summary: + // TODOC + // + ////////////////// DEFERRED CONNECTS /////////////////// diff --git a/_WidgetBase.js b/_WidgetBase.js index d65ceb5b0..ab6f7a39d 100644 --- a/_WidgetBase.js +++ b/_WidgetBase.js @@ -1,4 +1,14 @@ -define("dijit/_WidgetBase", ["dojo", "dijit", "dijit/_base/manager", "dojo/Stateful"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_base/manager", + "dojo/Stateful"], function(dojo, dijit) { + // module: + // dijit/_WidgetBase + // summary: + // TODOC + // + dojo.declare("dijit._WidgetBase", dojo.Stateful, { // summary: diff --git a/_WidgetsInTemplateMixin.js b/_WidgetsInTemplateMixin.js index 54ac262a1..5d2a70be7 100644 --- a/_WidgetsInTemplateMixin.js +++ b/_WidgetsInTemplateMixin.js @@ -1,4 +1,9 @@ -define("dijit/_WidgetsInTemplateMixin", ["dojo", "dijit", "dojo/parser"], function(dojo, dijit) { +define(["dojo", ".", "dojo/parser"], function(dojo, dijit) { + // module: + // dijit/_WidgetsInTemplateMixin + // summary: + // TODOC + dojo.declare("dijit._WidgetsInTemplateMixin", null, diff --git a/_base.js b/_base.js index b36827d60..7ad4659ce 100644 --- a/_base.js +++ b/_base.js @@ -1,4 +1,21 @@ -define("dijit/_base", ["dojo", "dijit", "dijit/_base/focus", "dijit/_base/manager", "dijit/_base/place", "dijit/_base/popup", "dijit/_base/scroll", "dijit/_base/sniff", "dijit/_base/typematic", "dijit/_base/wai", "dijit/_base/window"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_base/focus", + "./_base/manager", + "./_base/place", + "./_base/popup", + "./_base/scroll", + "./_base/sniff", + "./_base/typematic", + "./_base/wai", + "./_base/window"], function(dojo, dijit) { + // module: + // dijit/_base + // summary: + // TODOC + // + diff --git a/_base/_waiMixin.js b/_base/_waiMixin.js index d3e1d8b67..15f73cd9b 100644 --- a/_base/_waiMixin.js +++ b/_base/_waiMixin.js @@ -1,4 +1,9 @@ -define("dijit/_base/_waiMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/_base/_waiMixin + // summary: + // TODOC + dojo.mixin(dijit, { hasWaiRole: function(/*Element*/ elem, /*String?*/ role){ diff --git a/_base/focus.js b/_base/focus.js index 4f69e96ba..37ebcf0d1 100644 --- a/_base/focus.js +++ b/_base/focus.js @@ -1,4 +1,14 @@ -define("dijit/_base/focus", ["dojo", "dijit", "dojo/window", "dijit/_base/manager"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/window", + "./manager"], function(dojo, dijit) { + // module: + // dijit/_base/focus + // summary: + // TODOC + // + // summary: // These functions are used to query or set the focus and selection. diff --git a/_base/manager.js b/_base/manager.js index 7c38332fe..5cdf01282 100644 --- a/_base/manager.js +++ b/_base/manager.js @@ -1,4 +1,9 @@ -define("dijit/_base/manager", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/_base/manager + // summary: + // TODOC + dojo.declare("dijit.WidgetSet", null, { // summary: diff --git a/_base/place.js b/_base/place.js index 8c2562fe7..af3dc26eb 100644 --- a/_base/place.js +++ b/_base/place.js @@ -1,4 +1,14 @@ -define("dijit/_base/place", ["dojo", "dijit", "dojo/window", "dojo/AdapterRegistry"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/window", + "dojo/AdapterRegistry"], function(dojo, dijit) { + // module: + // dijit/_base/place + // summary: + // TODOC + // + dijit.getViewport = function(){ // summary: diff --git a/_base/popup.js b/_base/popup.js index 84bf764a9..c21c7c031 100644 --- a/_base/popup.js +++ b/_base/popup.js @@ -1,4 +1,15 @@ -define("dijit/_base/popup", ["dojo", "dijit", "dijit/_base/focus", "dijit/_base/place", "dijit/_base/window"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./focus", + "./place", + "./window"], function(dojo, dijit) { + // module: + // dijit/_base/popup + // summary: + // TODOC + // + /*===== dijit.popup.__OpenArgs = function(){ diff --git a/_base/scroll.js b/_base/scroll.js index 6a3508e34..3ee4f6680 100644 --- a/_base/scroll.js +++ b/_base/scroll.js @@ -1,4 +1,9 @@ -define("dijit/_base/scroll", ["dojo", "dijit", "dojo/window"], function(dojo, dijit) { +define(["dojo", "..", "dojo/window"], function(dojo, dijit) { + // module: + // dijit/_base/scroll + // summary: + // TODOC + dijit.scrollIntoView = function(/*DomNode*/ node, /*Object?*/ pos){ // summary: diff --git a/_base/sniff.js b/_base/sniff.js index 9524e85d7..c26733b5a 100644 --- a/_base/sniff.js +++ b/_base/sniff.js @@ -1,4 +1,9 @@ -define("dijit/_base/sniff", ["dojo", "dijit", "dojo/uacss"], function(dojo, dijit) { +define(["dojo", "..", "dojo/uacss"], function(dojo, dijit) { + // module: + // dijit/_base/sniff + // summary: + // TODOC + // summary: // Applies pre-set CSS classes to the top-level HTML node, see diff --git a/_base/typematic.js b/_base/typematic.js index 2054683b6..ee1f715e7 100644 --- a/_base/typematic.js +++ b/_base/typematic.js @@ -1,4 +1,9 @@ -define("dijit/_base/typematic", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/_base/typematic + // summary: + // TODOC + dijit.typematic = { // summary: diff --git a/_base/wai.js b/_base/wai.js index 301a07faa..1f5557f61 100644 --- a/_base/wai.js +++ b/_base/wai.js @@ -1,7 +1,13 @@ -define("dijit/_base/wai", ["dojo", "dijit", "dijit/_base/_waiMixin"], function(dojo, dijit) { +define(["dojo", "..", "./_waiMixin"], function(dojo, dijit) { + // module: + // dijit/_base/wai + // summary: + // TODOC -dijit.wai = { - onload: function(){ +// Test if computer is in high contrast mode. +if(dojo.isIE || dojo.isMoz){ // NOTE: checking in Safari messes things up + // priority is 90 to run ahead of parser priority of 100 + dojo.ready(90, function(){ // summary: // Detects if we are in high-contrast mode or not @@ -35,15 +41,9 @@ dijit.wai = { dojo.body().removeChild(div); } } - } -}; - -// Test if computer is in high contrast mode. -// Make sure the a11y test runs first, before widgets are instantiated. -if(dojo.isIE || dojo.isMoz){ // NOTE: checking in Safari messes things up - dojo._loaders.unshift(dijit.wai.onload); + }); } - return dijit; + }); diff --git a/_base/window.js b/_base/window.js index 0bf2322b0..6b87f53b5 100644 --- a/_base/window.js +++ b/_base/window.js @@ -1,4 +1,9 @@ -define("dijit/_base/window", ["dojo", "dijit", "dojo/window"], function(dojo, dijit) { +define(["dojo", "..", "dojo/window"], function(dojo, dijit) { + // module: + // dijit/_base/window + // summary: + // TODOC + dijit.getDocumentWindow = function(doc){ return dojo.window.get(doc); diff --git a/_editor/RichText.js b/_editor/RichText.js index a5c19ecb1..9ed5c4f0c 100644 --- a/_editor/RichText.js +++ b/_editor/RichText.js @@ -1,32 +1,23 @@ -define("dijit/_editor/RichText", ["dojo", "dijit", "dijit/_Widget", "dijit/_CssStateMixin", "dijit/_editor/selection", "dijit/_editor/range", "dijit/_editor/html"], function(dojo, dijit) { - -// used to restore content when user leaves this page then comes back -// but do not try doing dojo.doc.write if we are using xd loading. -// dojo.doc.write will only work if RichText.js is included in the dojo.js -// file. If it is included in dojo.js and you want to allow rich text saving -// for back/forward actions, then set dojo.config.allowXdRichTextSave = true. -if(!dojo.config["useXDomain"] || dojo.config["allowXdRichTextSave"]){ - if(dojo._postLoad){ - (function(){ - var savetextarea = dojo.doc.createElement('textarea'); - savetextarea.id = dijit._scopeName + "._editor.RichText.value"; - dojo.style(savetextarea, { - display:'none', - position:'absolute', - top:"-100px", - height:"3px", - width:"3px" - }); - dojo.body().appendChild(savetextarea); - })(); - }else{ - //dojo.body() is not available before onLoad is fired - try{ - dojo.doc.write(''); - }catch(e){ } - } -} +define([ + "dojo", + "..", + "../_Widget", + "../_CssStateMixin", + "./selection", + "./range", + "./html"], function(dojo, dijit) { + // module: + // dijit/_editor/RichText + // summary: + // TODOC + // + +// if you want to allow for rich text saving with back/forward actions, you must add a text area to your page with +// the id==dijit._scopeName + "._editor.RichText.value" (typically "dijit._editor.RichText.value). For example, +// something like this will work: +// +// +// dojo.declare("dijit._editor.RichText", [dijit._Widget, dijit._CssStateMixin], { constructor: function(params){ @@ -1634,10 +1625,12 @@ dojo.declare("dijit._editor.RichText", [dijit._Widget, dijit._CssStateMixin], { // private var saveTextarea = dojo.byId(dijit._scopeName + "._editor.RichText.value"); - if(saveTextarea.value){ - saveTextarea.value += this._SEPARATOR; - } - saveTextarea.value += this.name + this._NAME_CONTENT_SEP + this.getValue(true); + if(saveTextarea){ + if(saveTextarea.value){ + saveTextarea.value += this._SEPARATOR; + } + saveTextarea.value += this.name + this._NAME_CONTENT_SEP + this.getValue(true); + } }, diff --git a/_editor/_Plugin.js b/_editor/_Plugin.js index 64d948c1c..e4c1de40e 100644 --- a/_editor/_Plugin.js +++ b/_editor/_Plugin.js @@ -1,4 +1,14 @@ -define("dijit/_editor/_Plugin", ["dojo", "dijit", "dijit/_Widget", "dijit/form/Button"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Widget", + "../form/Button"], function(dojo, dijit) { + // module: + // dijit/_editor/_Plugin + // summary: + // TODOC + // + dojo.declare("dijit._editor._Plugin", null, { // summary diff --git a/_editor/html.js b/_editor/html.js index 71cd981b8..6ae11a4e4 100755 --- a/_editor/html.js +++ b/_editor/html.js @@ -1,4 +1,9 @@ -define("dijit/_editor/html", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/_editor/html + // summary: + // TODOC + dojo.getObject("_editor", true, dijit); dijit._editor.escapeXml=function(/*String*/str, /*Boolean?*/noSingleQuotes){ diff --git a/_editor/plugins/AlwaysShowToolbar.js b/_editor/plugins/AlwaysShowToolbar.js index a8e986805..28e3c32b1 100644 --- a/_editor/plugins/AlwaysShowToolbar.js +++ b/_editor/plugins/AlwaysShowToolbar.js @@ -1,4 +1,9 @@ -define("dijit/_editor/plugins/AlwaysShowToolbar", ["dojo", "dijit", "dijit/_editor/_Plugin"], function(dojo, dijit) { +define(["dojo", "../..", "../_Plugin"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/AlwaysShowToolbar + // summary: + // TODOC + dojo.declare("dijit._editor.plugins.AlwaysShowToolbar", dijit._editor._Plugin, { diff --git a/_editor/plugins/EnterKeyHandling.js b/_editor/plugins/EnterKeyHandling.js index 410fc9dd9..7d2c25752 100644 --- a/_editor/plugins/EnterKeyHandling.js +++ b/_editor/plugins/EnterKeyHandling.js @@ -1,4 +1,15 @@ -define("dijit/_editor/plugins/EnterKeyHandling", ["dojo", "dijit", "dojo/window", "dijit/_editor/_Plugin", "dijit/_editor/range"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "dojo/window", + "../_Plugin", + "../range"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/EnterKeyHandling + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.EnterKeyHandling", dijit._editor._Plugin, { // summary: diff --git a/_editor/plugins/FontChoice.js b/_editor/plugins/FontChoice.js index 060351f74..12bd9f681 100644 --- a/_editor/plugins/FontChoice.js +++ b/_editor/plugins/FontChoice.js @@ -1,4 +1,22 @@ -define("dijit/_editor/plugins/FontChoice", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dijit/_editor/_Plugin", "dijit/_editor/range", "dijit/_editor/selection", "dijit/form/FilteringSelect", "dojo/data/ItemFileReadStore", "dojo/i18n", "i18n!dijit/_editor/nls/FontChoice"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../../_Widget", + "../../_TemplatedMixin", + "../../_WidgetsInTemplateMixin", + "../_Plugin", + "../range", + "../selection", + "../../form/FilteringSelect", + "dojo/data/ItemFileReadStore", + "dojo/i18n", + "dojo/i18n!../nls/FontChoice"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/FontChoice + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins._FontDropDown", [dijit._Widget, dijit._TemplatedMixin, dijit._WidgetsInTemplateMixin],{ diff --git a/_editor/plugins/FullScreen.js b/_editor/plugins/FullScreen.js index ee9e2067e..7717cd926 100755 --- a/_editor/plugins/FullScreen.js +++ b/_editor/plugins/FullScreen.js @@ -1,4 +1,17 @@ -define("dijit/_editor/plugins/FullScreen", ["dojo", "dijit", "dojo/window", "dojo/i18n", "dijit/_editor/_Plugin", "dijit/form/ToggleButton", "i18n!dijit/_editor/nls/commands"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "dojo/window", + "dojo/i18n", + "../_Plugin", + "../../form/ToggleButton", + "dojo/i18n!../nls/commands"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/FullScreen + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.FullScreen",dijit._editor._Plugin,{ // summary: diff --git a/_editor/plugins/LinkDialog.js b/_editor/plugins/LinkDialog.js index 15b1f330e..aa9754436 100644 --- a/_editor/plugins/LinkDialog.js +++ b/_editor/plugins/LinkDialog.js @@ -1,4 +1,23 @@ -define("dijit/_editor/plugins/LinkDialog", ["dojo", "dijit", "dijit/_Widget", "dijit/_editor/_Plugin", "dijit/TooltipDialog", "dijit/form/DropDownButton", "dijit/form/ValidationTextBox", "dijit/form/Select", "dijit/_editor/range", "dojo/i18n", "dojo/string", "i18n!dijit/nls/common", "i18n!dijit/_editor/nls/LinkDialog"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../../_Widget", + "../_Plugin", + "../../TooltipDialog", + "../../form/DropDownButton", + "../../form/ValidationTextBox", + "../../form/Select", + "../range", + "dojo/i18n", + "dojo/string", + "dojo/i18n!../../nls/common", + "dojo/i18n!../nls/LinkDialog"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/LinkDialog + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.LinkDialog", dijit._editor._Plugin, { // summary: diff --git a/_editor/plugins/NewPage.js b/_editor/plugins/NewPage.js index c4486f44c..05e5dbddf 100644 --- a/_editor/plugins/NewPage.js +++ b/_editor/plugins/NewPage.js @@ -1,4 +1,16 @@ -define("dijit/_editor/plugins/NewPage", ["dojo", "dijit", "dijit/_editor/_Plugin", "dijit/form/Button", "dojo/i18n", "i18n!dijit/_editor/nls/commands"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../_Plugin", + "../../form/Button", + "dojo/i18n", + "dojo/i18n!../nls/commands"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/NewPage + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.NewPage",dijit._editor._Plugin,{ // summary: diff --git a/_editor/plugins/Print.js b/_editor/plugins/Print.js index 4ac105e8d..952f07a39 100755 --- a/_editor/plugins/Print.js +++ b/_editor/plugins/Print.js @@ -1,4 +1,16 @@ -define("dijit/_editor/plugins/Print", ["dojo", "dijit", "dijit/_editor/_Plugin", "dijit/form/Button", "dojo/i18n", "i18n!dijit/_editor/nls/commands"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../_Plugin", + "../../form/Button", + "dojo/i18n", + "dojo/i18n!../nls/commands"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/Print + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.Print",dijit._editor._Plugin,{ // summary: diff --git a/_editor/plugins/TabIndent.js b/_editor/plugins/TabIndent.js index ef4913445..c398abc73 100644 --- a/_editor/plugins/TabIndent.js +++ b/_editor/plugins/TabIndent.js @@ -1,4 +1,14 @@ -define("dijit/_editor/plugins/TabIndent", ["dojo", "dijit", "dijit/_editor/_Plugin", "dijit/form/ToggleButton"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../_Plugin", + "../../form/ToggleButton"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/TabIndent + // summary: + // TODOC + // + dojo.experimental("dijit._editor.plugins.TabIndent"); diff --git a/_editor/plugins/TextColor.js b/_editor/plugins/TextColor.js index 45fa7570f..571c36bbc 100644 --- a/_editor/plugins/TextColor.js +++ b/_editor/plugins/TextColor.js @@ -1,4 +1,15 @@ -define("dijit/_editor/plugins/TextColor", ["dojo", "dijit", "dijit/_editor/_Plugin", "dijit/form/DropDownButton", "dijit/ColorPalette"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../_Plugin", + "../../form/DropDownButton", + "../../ColorPalette"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/TextColor + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.TextColor", dijit._editor._Plugin, { // summary: diff --git a/_editor/plugins/ToggleDir.js b/_editor/plugins/ToggleDir.js index ba8aa67ef..6f511668e 100644 --- a/_editor/plugins/ToggleDir.js +++ b/_editor/plugins/ToggleDir.js @@ -1,4 +1,14 @@ -define("dijit/_editor/plugins/ToggleDir", ["dojo", "dijit", "dijit/_editor/_Plugin", "dijit/form/ToggleButton"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "../_Plugin", + "../../form/ToggleButton"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/ToggleDir + // summary: + // TODOC + // + dojo.experimental("dijit._editor.plugins.ToggleDir"); diff --git a/_editor/plugins/ViewSource.js b/_editor/plugins/ViewSource.js index f415586d2..96a11c7a6 100755 --- a/_editor/plugins/ViewSource.js +++ b/_editor/plugins/ViewSource.js @@ -1,4 +1,17 @@ -define("dijit/_editor/plugins/ViewSource", ["dojo", "dijit", "dojo/window", "dojo/i18n", "dijit/_editor/_Plugin", "dijit/form/ToggleButton", "i18n!dijit/_editor/nls/commands"], function(dojo, dijit) { +define([ + "dojo", + "../..", + "dojo/window", + "dojo/i18n", + "../_Plugin", + "../../form/ToggleButton", + "dojo/i18n!../nls/commands"], function(dojo, dijit) { + // module: + // dijit/_editor/plugins/ViewSource + // summary: + // TODOC + // + dojo.declare("dijit._editor.plugins.ViewSource",dijit._editor._Plugin,{ // summary: diff --git a/_editor/range.js b/_editor/range.js index abc35cdac..2b2931db8 100644 --- a/_editor/range.js +++ b/_editor/range.js @@ -1,4 +1,9 @@ -define("dijit/_editor/range", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/_editor/range + // summary: + // TODOC + dijit.range={}; diff --git a/_editor/selection.js b/_editor/selection.js index cabd7e81d..5e73b01a9 100644 --- a/_editor/selection.js +++ b/_editor/selection.js @@ -1,4 +1,9 @@ -define("dijit/_editor/selection", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/_editor/selection + // summary: + // TODOC + dojo.getObject("_editor.selection", true, dijit); diff --git a/_tree/dndSource.js b/_tree/dndSource.js index f55d1d09b..37ac4e26f 100644 --- a/_tree/dndSource.js +++ b/_tree/dndSource.js @@ -1,4 +1,9 @@ -define("dijit/_tree/dndSource", ["dojo", "dijit", "dijit/tree/dndSource"], function(dojo, dijit) { +define(["dojo", "..", "../tree/dndSource"], function(dojo, dijit) { + // module: + // dijit/_tree/dndSource + // summary: + // TODOC + // TODO: remove this file in 2.0 dojo.deprecated("dijit._tree.dndSource has been moved to dijit.tree.dndSource, use that instead", "", "2.0"); diff --git a/dijit-all.js b/dijit-all.js index 1276f47d8..c488bc11a 100644 --- a/dijit-all.js +++ b/dijit-all.js @@ -1,4 +1,67 @@ -define("dijit/dijit-all", ["dojo", "dijit", "dijit/dijit", "dijit/ColorPalette", "dijit/Declaration", "dijit/Dialog", "dijit/DialogUnderlay", "dijit/TooltipDialog", "dijit/Editor", "dijit/_editor/plugins/FontChoice", "dijit/_editor/plugins/LinkDialog", "dijit/Menu", "dijit/MenuItem", "dijit/PopupMenuItem", "dijit/MenuBar", "dijit/MenuBarItem", "dijit/PopupMenuBarItem", "dijit/MenuSeparator", "dijit/ProgressBar", "dijit/TitlePane", "dijit/Toolbar", "dijit/Tooltip", "dijit/Tree", "dijit/InlineEditBox", "dijit/form/Form", "dijit/form/Button", "dijit/form/DropDownButton", "dijit/form/ComboButton", "dijit/form/ToggleButton", "dijit/form/CheckBox", "dijit/form/RadioButton", "dijit/form/TextBox", "dijit/form/ValidationTextBox", "dijit/form/CurrencyTextBox", "dijit/form/DateTextBox", "dijit/form/NumberSpinner", "dijit/form/NumberTextBox", "dijit/form/ComboBox", "dijit/form/FilteringSelect", "dijit/form/MultiSelect", "dijit/form/Select", "dijit/form/HorizontalSlider", "dijit/form/VerticalSlider", "dijit/form/HorizontalRule", "dijit/form/VerticalRule", "dijit/form/HorizontalRuleLabels", "dijit/form/VerticalRuleLabels", "dijit/form/SimpleTextarea", "dijit/form/Textarea", "dijit/layout/AccordionContainer", "dijit/layout/ContentPane", "dijit/layout/BorderContainer", "dijit/layout/LayoutContainer", "dijit/layout/LinkPane", "dijit/layout/SplitContainer", "dijit/layout/StackContainer", "dijit/layout/TabContainer"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./dijit", + "./ColorPalette", + "./Declaration", + "./Dialog", + "./DialogUnderlay", + "./TooltipDialog", + "./Editor", + "./_editor/plugins/FontChoice", + "./_editor/plugins/LinkDialog", + "./Menu", + "./MenuItem", + "./PopupMenuItem", + "./MenuBar", + "./MenuBarItem", + "./PopupMenuBarItem", + "./MenuSeparator", + "./ProgressBar", + "./TitlePane", + "./Toolbar", + "./Tooltip", + "./Tree", + "./InlineEditBox", + "./form/Form", + "./form/Button", + "./form/DropDownButton", + "./form/ComboButton", + "./form/ToggleButton", + "./form/CheckBox", + "./form/RadioButton", + "./form/TextBox", + "./form/ValidationTextBox", + "./form/CurrencyTextBox", + "./form/DateTextBox", + "./form/NumberSpinner", + "./form/NumberTextBox", + "./form/ComboBox", + "./form/FilteringSelect", + "./form/MultiSelect", + "./form/Select", + "./form/HorizontalSlider", + "./form/VerticalSlider", + "./form/HorizontalRule", + "./form/VerticalRule", + "./form/HorizontalRuleLabels", + "./form/VerticalRuleLabels", + "./form/SimpleTextarea", + "./form/Textarea", + "./layout/AccordionContainer", + "./layout/ContentPane", + "./layout/BorderContainer", + "./layout/LayoutContainer", + "./layout/LinkPane", + "./layout/SplitContainer", + "./layout/StackContainer", + "./layout/TabContainer"], function(dojo, dijit) { + // module: + // dijit/dijit-all + // summary: + // TODOC + // + console.warn("dijit-all may include much more code than your application actually requires. We strongly recommend that you investigate a custom build or the web build tool"); diff --git a/dijit.js b/dijit.js index 749220a94..fc7305351 100644 --- a/dijit.js +++ b/dijit.js @@ -1,4 +1,19 @@ -define("dijit/dijit", ["dojo", "dijit", "dijit/_base", "dojo/parser", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_Container", "dijit/layout/_LayoutWidget", "dijit/form/_FormWidget"], function(dojo, dijit) { +define([ + "dojo", + ".", + "./_base", + "dojo/parser", + "./_Widget", + "./_TemplatedMixin", + "./_Container", + "./layout/_LayoutWidget", + "./form/_FormWidget"], function(dojo, dijit) { + // module: + // dijit/dijit + // summary: + // TODOC + // + /*===== dijit.dijit = { diff --git a/form/Button.js b/form/Button.js index 87c489f26..9c89ecbb2 100644 --- a/form/Button.js +++ b/form/Button.js @@ -1,4 +1,17 @@ -define("dijit/form/Button", ["dojo", "dijit", "text!dijit/form/templates/Button.html", "dijit/form/_FormWidget", "dijit/form/_ButtonMixin", "dijit/_Container", "dijit/_HasDropDown"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/Button.html", + "./_FormWidget", + "./_ButtonMixin", + "../_Container", + "../_HasDropDown"], function(dojo, dijit) { + // module: + // dijit/form/Button + // summary: + // TODOC + // + dojo.declare("dijit.form.Button", [dijit.form._FormWidget, dijit.form._ButtonMixin], diff --git a/form/CheckBox.js b/form/CheckBox.js index 495b5cce7..99e0c90a2 100644 --- a/form/CheckBox.js +++ b/form/CheckBox.js @@ -1,4 +1,15 @@ -define("dijit/form/CheckBox", ["dojo", "dijit", "text!dijit/form/templates/CheckBox.html", "dijit/form/ToggleButton", "dijit/form/_CheckBoxMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/CheckBox.html", + "./ToggleButton", + "./_CheckBoxMixin"], function(dojo, dijit) { + // module: + // dijit/form/CheckBox + // summary: + // TODOC + // + dojo.declare( "dijit.form.CheckBox", diff --git a/form/ComboBox.js b/form/ComboBox.js index e4037261f..1fff75585 100644 --- a/form/ComboBox.js +++ b/form/ComboBox.js @@ -1,4 +1,14 @@ -define("dijit/form/ComboBox", ["dojo", "dijit", "dijit/form/ValidationTextBox", "dijit/form/ComboBoxMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./ValidationTextBox", + "./ComboBoxMixin"], function(dojo, dijit) { + // module: + // dijit/form/ComboBox + // summary: + // TODOC + // + dojo.declare( "dijit.form.ComboBox", diff --git a/form/ComboBoxMixin.js b/form/ComboBoxMixin.js index 4d0d9ed52..da53a99c5 100644 --- a/form/ComboBoxMixin.js +++ b/form/ComboBoxMixin.js @@ -1,4 +1,15 @@ -define("dijit/form/ComboBoxMixin", ["dojo", "dijit", "text!dijit/form/templates/DropDownBox.html", "dijit/form/_AutoCompleterMixin", "dijit/form/_ComboBoxMenu"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/DropDownBox.html", + "./_AutoCompleterMixin", + "./_ComboBoxMenu"], function(dojo, dijit) { + // module: + // dijit/form/ComboBoxMixin + // summary: + // TODOC + // + dojo.declare("dijit.form.ComboBoxMixin", dijit.form._AutoCompleterMixin, { // dropDownClass: [protected extension] String diff --git a/form/ComboButton.js b/form/ComboButton.js index 875f35a5f..f7819edc4 100644 --- a/form/ComboButton.js +++ b/form/ComboButton.js @@ -1,4 +1,14 @@ -define("dijit/form/ComboButton", ["dojo", "dijit", "text!dijit/form/templates/ComboButton.html", "dijit/form/DropDownButton"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/ComboButton.html", + "./DropDownButton"], function(dojo, dijit) { + // module: + // dijit/form/ComboButton + // summary: + // TODOC + // + dojo.declare("dijit.form.ComboButton", dijit.form.DropDownButton, { // summary: diff --git a/form/CurrencyTextBox.js b/form/CurrencyTextBox.js index 315513a4a..bab34b7e1 100644 --- a/form/CurrencyTextBox.js +++ b/form/CurrencyTextBox.js @@ -1,4 +1,14 @@ -define("dijit/form/CurrencyTextBox", ["dojo", "dijit", "dojo/currency", "dijit/form/NumberTextBox"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/currency", + "./NumberTextBox"], function(dojo, dijit) { + // module: + // dijit/form/CurrencyTextBox + // summary: + // TODOC + // + /*===== dojo.declare( diff --git a/form/DataList.js b/form/DataList.js index 61af16cad..091ee3451 100644 --- a/form/DataList.js +++ b/form/DataList.js @@ -1,4 +1,15 @@ -define("dijit/form/DataList", ["dojo", "dijit", "dijit/_WidgetBase", "dojo/data/util/simpleFetch", "dojo/data/util/filter" ], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_WidgetBase", + "dojo/data/util/simpleFetch", + "dojo/data/util/filter"], function(dojo, dijit) { + // module: + // dijit/form/DataList + // summary: + // TODOC + // + dojo.declare("dijit.form.DataList", null, { // summary: diff --git a/form/DateTextBox.js b/form/DateTextBox.js index b6da6f342..8e475ad68 100644 --- a/form/DateTextBox.js +++ b/form/DateTextBox.js @@ -1,4 +1,14 @@ -define("dijit/form/DateTextBox", ["dojo", "dijit", "dijit/Calendar", "dijit/form/_DateTimeTextBox"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../Calendar", + "./_DateTimeTextBox"], function(dojo, dijit) { + // module: + // dijit/form/DateTextBox + // summary: + // TODOC + // + dojo.declare( "dijit.form.DateTextBox", diff --git a/form/DropDownButton.js b/form/DropDownButton.js index bd20877c1..51427d3e8 100644 --- a/form/DropDownButton.js +++ b/form/DropDownButton.js @@ -1,4 +1,16 @@ -define("dijit/form/DropDownButton", ["dojo", "dijit", "text!dijit/form/templates/DropDownButton.html", "dijit/form/Button", "dijit/_Container", "dijit/_HasDropDown"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/DropDownButton.html", + "./Button", + "../_Container", + "../_HasDropDown"], function(dojo, dijit) { + // module: + // dijit/form/DropDownButton + // summary: + // TODOC + // + dojo.declare("dijit.form.DropDownButton", [dijit.form.Button, dijit._Container, dijit._HasDropDown], { // summary: diff --git a/form/FilteringSelect.js b/form/FilteringSelect.js index 27e17d800..7d0523ce7 100644 --- a/form/FilteringSelect.js +++ b/form/FilteringSelect.js @@ -1,4 +1,14 @@ -define("dijit/form/FilteringSelect", ["dojo", "dijit", "dijit/form/MappedTextBox", "dijit/form/ComboBoxMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./MappedTextBox", + "./ComboBoxMixin"], function(dojo, dijit) { + // module: + // dijit/form/FilteringSelect + // summary: + // TODOC + // + dojo.declare( "dijit.form.FilteringSelect", diff --git a/form/Form.js b/form/Form.js index 8d6ae23d1..0e19a3e1e 100644 --- a/form/Form.js +++ b/form/Form.js @@ -1,4 +1,16 @@ -define("dijit/form/Form", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/form/_FormMixin", "dijit/layout/_ContentPaneResizeMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Widget", + "../_TemplatedMixin", + "./_FormMixin", + "../layout/_ContentPaneResizeMixin"], function(dojo, dijit) { + // module: + // dijit/form/Form + // summary: + // TODOC + // + dojo.declare( "dijit.form.Form", diff --git a/form/HorizontalRule.js b/form/HorizontalRule.js index a13c49ac2..48ea41514 100644 --- a/form/HorizontalRule.js +++ b/form/HorizontalRule.js @@ -1,4 +1,14 @@ -define("dijit/form/HorizontalRule", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Widget", + "../_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/form/HorizontalRule + // summary: + // TODOC + // + dojo.declare("dijit.form.HorizontalRule", [dijit._Widget, dijit._TemplatedMixin], { diff --git a/form/HorizontalRuleLabels.js b/form/HorizontalRuleLabels.js index db71049b6..53bba6857 100644 --- a/form/HorizontalRuleLabels.js +++ b/form/HorizontalRuleLabels.js @@ -1,4 +1,9 @@ -define("dijit/form/HorizontalRuleLabels", ["dojo", "dijit", "dijit/form/HorizontalRule"], function(dojo, dijit) { +define(["dojo", "..", "./HorizontalRule"], function(dojo, dijit) { + // module: + // dijit/form/HorizontalRuleLabels + // summary: + // TODOC + dojo.declare("dijit.form.HorizontalRuleLabels", dijit.form.HorizontalRule, { diff --git a/form/HorizontalSlider.js b/form/HorizontalSlider.js index 849bc4a77..b011888db 100644 --- a/form/HorizontalSlider.js +++ b/form/HorizontalSlider.js @@ -1,4 +1,18 @@ -define("dijit/form/HorizontalSlider", ["dojo", "dijit", "text!dijit/form/templates/HorizontalSlider.html", "dijit/form/_FormWidget", "dijit/_Container", "dojo/dnd/move", "dijit/form/Button", "dojo/number"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/HorizontalSlider.html", + "./_FormWidget", + "../_Container", + "dojo/dnd/move", + "./Button", + "dojo/number"], function(dojo, dijit) { + // module: + // dijit/form/HorizontalSlider + // summary: + // TODOC + // + dojo.declare( "dijit.form.HorizontalSlider", diff --git a/form/MappedTextBox.js b/form/MappedTextBox.js index 824a20690..96bcbd8c8 100644 --- a/form/MappedTextBox.js +++ b/form/MappedTextBox.js @@ -1,4 +1,9 @@ -define("dijit/form/MappedTextBox", ["dojo", "dijit", "dijit/form/ValidationTextBox"], function(dojo, dijit) { +define(["dojo", "..", "./ValidationTextBox"], function(dojo, dijit) { + // module: + // dijit/form/MappedTextBox + // summary: + // TODOC + dojo.declare( "dijit.form.MappedTextBox", diff --git a/form/MultiSelect.js b/form/MultiSelect.js index bbcd68b1e..d1d900b96 100644 --- a/form/MultiSelect.js +++ b/form/MultiSelect.js @@ -1,4 +1,9 @@ -define("dijit/form/MultiSelect", ["dojo", "dijit", "dijit/form/_FormWidget"], function(dojo, dijit) { +define(["dojo", "..", "./_FormWidget"], function(dojo, dijit) { + // module: + // dijit/form/MultiSelect + // summary: + // TODOC + dojo.declare("dijit.form.MultiSelect", dijit.form._FormValueWidget, { // summary: diff --git a/form/NumberSpinner.js b/form/NumberSpinner.js index 7fd3e123e..76608f114 100644 --- a/form/NumberSpinner.js +++ b/form/NumberSpinner.js @@ -1,4 +1,14 @@ -define("dijit/form/NumberSpinner", ["dojo", "dijit", "dijit/form/_Spinner", "dijit/form/NumberTextBox"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./_Spinner", + "./NumberTextBox"], function(dojo, dijit) { + // module: + // dijit/form/NumberSpinner + // summary: + // TODOC + // + dojo.declare("dijit.form.NumberSpinner", [dijit.form._Spinner, dijit.form.NumberTextBoxMixin], diff --git a/form/NumberTextBox.js b/form/NumberTextBox.js index ca89c1a65..369e7b135 100644 --- a/form/NumberTextBox.js +++ b/form/NumberTextBox.js @@ -1,4 +1,14 @@ -define("dijit/form/NumberTextBox", ["dojo", "dijit", "dijit/form/RangeBoundTextBox", "dojo/number"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./RangeBoundTextBox", + "dojo/number"], function(dojo, dijit) { + // module: + // dijit/form/NumberTextBox + // summary: + // TODOC + // + /*===== dojo.declare( diff --git a/form/RadioButton.js b/form/RadioButton.js index 793ef5b5e..777b27d40 100644 --- a/form/RadioButton.js +++ b/form/RadioButton.js @@ -1,4 +1,14 @@ -define("dijit/form/RadioButton", ["dojo", "dijit", "dijit/form/CheckBox", "dijit/form/_RadioButtonMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./CheckBox", + "./_RadioButtonMixin"], function(dojo, dijit) { + // module: + // dijit/form/RadioButton + // summary: + // TODOC + // + dojo.declare( "dijit.form.RadioButton", diff --git a/form/RangeBoundTextBox.js b/form/RangeBoundTextBox.js index 301515aef..41c99778f 100644 --- a/form/RangeBoundTextBox.js +++ b/form/RangeBoundTextBox.js @@ -1,4 +1,9 @@ -define("dijit/form/RangeBoundTextBox", ["dojo", "dijit", "dijit/form/MappedTextBox"], function(dojo, dijit) { +define(["dojo", "..", "./MappedTextBox"], function(dojo, dijit) { + // module: + // dijit/form/RangeBoundTextBox + // summary: + // TODOC + /*===== dijit.form.RangeBoundTextBox.__Constraints = function(){ diff --git a/form/Select.js b/form/Select.js index 75e11859c..03819d492 100644 --- a/form/Select.js +++ b/form/Select.js @@ -1,4 +1,18 @@ -define("dijit/form/Select", ["dojo", "dijit", "text!dijit/form/templates/Select.html", "dijit/form/_FormSelectWidget", "dijit/_HasDropDown", "dijit/Menu", "dijit/Tooltip", "i18n!dijit/form/nls/validate"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/Select.html", + "./_FormSelectWidget", + "../_HasDropDown", + "../Menu", + "../Tooltip", + "dojo/i18n!./nls/validate"], function(dojo, dijit) { + // module: + // dijit/form/Select + // summary: + // TODOC + // + dojo.declare("dijit.form._SelectMenu", dijit.Menu, { // summary: diff --git a/form/SimpleTextarea.js b/form/SimpleTextarea.js index c34b74226..32567fbee 100644 --- a/form/SimpleTextarea.js +++ b/form/SimpleTextarea.js @@ -1,4 +1,9 @@ -define("dijit/form/SimpleTextarea", ["dojo", "dijit", "dijit/form/TextBox"], function(dojo, dijit) { +define(["dojo", "..", "./TextBox"], function(dojo, dijit) { + // module: + // dijit/form/SimpleTextarea + // summary: + // TODOC + dojo.declare("dijit.form.SimpleTextarea", dijit.form.TextBox, diff --git a/form/Slider.js b/form/Slider.js index 57522c274..53f28a491 100644 --- a/form/Slider.js +++ b/form/Slider.js @@ -1,4 +1,18 @@ -define("dijit/form/Slider", ["dojo", "dijit", "dijit/form/HorizontalSlider", "dijit/form/VerticalSlider", "dijit/form/HorizontalRule", "dijit/form/VerticalRule", "dijit/form/HorizontalRuleLabels", "dijit/form/VerticalRuleLabels"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./HorizontalSlider", + "./VerticalSlider", + "./HorizontalRule", + "./VerticalRule", + "./HorizontalRuleLabels", + "./VerticalRuleLabels"], function(dojo, dijit) { + // module: + // dijit/form/Slider + // summary: + // TODOC + // + dojo.deprecated("Call require() for HorizontalSlider / VerticalRule, explicitly rather than 'dijit.form.Slider' itself", "", "2.0"); diff --git a/form/TextBox.js b/form/TextBox.js index adcf3c5b1..35b1e90bb 100644 --- a/form/TextBox.js +++ b/form/TextBox.js @@ -1,4 +1,15 @@ -define("dijit/form/TextBox", ["dojo", "dijit", "text!dijit/form/templates/TextBox.html", "dijit/form/_FormWidget", "dijit/form/_TextBoxMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/TextBox.html", + "./_FormWidget", + "./_TextBoxMixin"], function(dojo, dijit) { + // module: + // dijit/form/TextBox + // summary: + // TODOC + // + dojo.declare( "dijit.form.TextBox", diff --git a/form/Textarea.js b/form/Textarea.js index dcca980e1..b50943e4e 100644 --- a/form/Textarea.js +++ b/form/Textarea.js @@ -1,4 +1,14 @@ -define("dijit/form/Textarea", ["dojo", "dijit", "dijit/form/SimpleTextarea", "dijit/form/_ExpandingTextAreaMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./SimpleTextarea", + "./_ExpandingTextAreaMixin"], function(dojo, dijit) { + // module: + // dijit/form/Textarea + // summary: + // TODOC + // + dojo.declare( "dijit.form.Textarea", diff --git a/form/TimeTextBox.js b/form/TimeTextBox.js index 35a4711c8..57ba0d93c 100644 --- a/form/TimeTextBox.js +++ b/form/TimeTextBox.js @@ -1,4 +1,14 @@ -define("dijit/form/TimeTextBox", ["dojo", "dijit", "dijit/_TimePicker", "dijit/form/_DateTimeTextBox"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_TimePicker", + "./_DateTimeTextBox"], function(dojo, dijit) { + // module: + // dijit/form/TimeTextBox + // summary: + // TODOC + // + /*===== dojo.declare( diff --git a/form/ToggleButton.js b/form/ToggleButton.js index b33a4831d..a904c223d 100644 --- a/form/ToggleButton.js +++ b/form/ToggleButton.js @@ -1,4 +1,14 @@ -define("dijit/form/ToggleButton", ["dojo", "dijit", "dijit/form/Button", "dijit/form/_ToggleButtonMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./Button", + "./_ToggleButtonMixin"], function(dojo, dijit) { + // module: + // dijit/form/ToggleButton + // summary: + // TODOC + // + dojo.declare("dijit.form.ToggleButton", [dijit.form.Button, dijit.form._ToggleButtonMixin], { // summary: diff --git a/form/ValidationTextBox.js b/form/ValidationTextBox.js index 14d3a1181..0e481ab83 100644 --- a/form/ValidationTextBox.js +++ b/form/ValidationTextBox.js @@ -1,4 +1,17 @@ -define("dijit/form/ValidationTextBox", ["dojo", "dijit", "text!dijit/form/templates/ValidationTextBox.html", "dojo/i18n", "dijit/form/TextBox", "dijit/Tooltip", "i18n!dijit/form/nls/validate"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/ValidationTextBox.html", + "dojo/i18n", + "./TextBox", + "../Tooltip", + "dojo/i18n!./nls/validate"], function(dojo, dijit) { + // module: + // dijit/form/ValidationTextBox + // summary: + // TODOC + // + /*===== dijit.form.ValidationTextBox.__Constraints = function(){ diff --git a/form/VerticalRule.js b/form/VerticalRule.js index e51c6b582..6ba0a5e16 100644 --- a/form/VerticalRule.js +++ b/form/VerticalRule.js @@ -1,4 +1,9 @@ -define("dijit/form/VerticalRule", ["dojo", "dijit", "dijit/form/HorizontalRule"], function(dojo, dijit) { +define(["dojo", "..", "./HorizontalRule"], function(dojo, dijit) { + // module: + // dijit/form/VerticalRule + // summary: + // TODOC + dojo.declare("dijit.form.VerticalRule", dijit.form.HorizontalRule, { diff --git a/form/VerticalRuleLabels.js b/form/VerticalRuleLabels.js index 4dbbb3073..d09e6f8cf 100644 --- a/form/VerticalRuleLabels.js +++ b/form/VerticalRuleLabels.js @@ -1,4 +1,9 @@ -define("dijit/form/VerticalRuleLabels", ["dojo", "dijit", "dijit/form/HorizontalRuleLabels"], function(dojo, dijit) { +define(["dojo", "..", "./HorizontalRuleLabels"], function(dojo, dijit) { + // module: + // dijit/form/VerticalRuleLabels + // summary: + // TODOC + dojo.declare("dijit.form.VerticalRuleLabels", dijit.form.HorizontalRuleLabels, { diff --git a/form/VerticalSlider.js b/form/VerticalSlider.js index 3b526b161..8f3956011 100644 --- a/form/VerticalSlider.js +++ b/form/VerticalSlider.js @@ -1,4 +1,14 @@ -define("dijit/form/VerticalSlider", ["dojo", "dijit", "text!dijit/form/templates/VerticalSlider.html", "dijit/form/HorizontalSlider"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/VerticalSlider.html", + "./HorizontalSlider"], function(dojo, dijit) { + // module: + // dijit/form/VerticalSlider + // summary: + // TODOC + // + dojo.declare( "dijit.form.VerticalSlider", diff --git a/form/_AutoCompleterMixin.js b/form/_AutoCompleterMixin.js index 1edecded7..ca6354b04 100644 --- a/form/_AutoCompleterMixin.js +++ b/form/_AutoCompleterMixin.js @@ -1,4 +1,17 @@ -define("dijit/form/_AutoCompleterMixin", ["dojo", "dijit", "dojo/regexp", "i18n!dijit/form/nls/ComboBox", "dijit/form/_FormWidget", "dijit/form/DataList", "dijit/_HasDropDown"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/regexp", + "dojo/i18n!./nls/ComboBox", + "./_FormWidget", + "./DataList", + "../_HasDropDown"], function(dojo, dijit) { + // module: + // dijit/form/_AutoCompleterMixin + // summary: + // TODOC + // + dojo.declare("dijit.form._AutoCompleterMixin", dijit._HasDropDown, { // summary: diff --git a/form/_ButtonMixin.js b/form/_ButtonMixin.js index 4c32e930b..3e8aebbc4 100644 --- a/form/_ButtonMixin.js +++ b/form/_ButtonMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_ButtonMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_ButtonMixin + // summary: + // TODOC + dojo.declare("dijit.form._ButtonMixin", null, { // summary: diff --git a/form/_CheckBoxMixin.js b/form/_CheckBoxMixin.js index 6c0408d83..b528330a8 100644 --- a/form/_CheckBoxMixin.js +++ b/form/_CheckBoxMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_CheckBoxMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_CheckBoxMixin + // summary: + // TODOC + dojo.declare("dijit.form._CheckBoxMixin", null, { diff --git a/form/_ComboBoxMenu.js b/form/_ComboBoxMenu.js index 4621c17bc..eee58db28 100644 --- a/form/_ComboBoxMenu.js +++ b/form/_ComboBoxMenu.js @@ -1,4 +1,16 @@ -define("dijit/form/_ComboBoxMenu", ["dojo", "dijit", "dijit/form/_ComboBoxMenuMixin", "dijit/_WidgetBase", "dijit/_TemplatedMixin", "dijit/form/_ListMouseMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./_ComboBoxMenuMixin", + "../_WidgetBase", + "../_TemplatedMixin", + "./_ListMouseMixin"], function(dojo, dijit) { + // module: + // dijit/form/_ComboBoxMenu + // summary: + // TODOC + // + dojo.declare( "dijit.form._ComboBoxMenu", diff --git a/form/_ComboBoxMenuMixin.js b/form/_ComboBoxMenuMixin.js index a70688c6f..a0047ae7e 100644 --- a/form/_ComboBoxMenuMixin.js +++ b/form/_ComboBoxMenuMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_ComboBoxMenuMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_ComboBoxMenuMixin + // summary: + // TODOC + dojo.declare( "dijit.form._ComboBoxMenuMixin", null, { // summary: diff --git a/form/_DateTimeTextBox.js b/form/_DateTimeTextBox.js index 2ddea0a41..d961ba7da 100644 --- a/form/_DateTimeTextBox.js +++ b/form/_DateTimeTextBox.js @@ -1,4 +1,18 @@ -define("dijit/form/_DateTimeTextBox", ["dojo", "dijit", "text!dijit/form/templates/DropDownBox.html", "dojo/date", "dojo/date/locale", "dojo/date/stamp", "dijit/form/RangeBoundTextBox", "dijit/_HasDropDown"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/DropDownBox.html", + "dojo/date", + "dojo/date/locale", + "dojo/date/stamp", + "./RangeBoundTextBox", + "../_HasDropDown"], function(dojo, dijit) { + // module: + // dijit/form/_DateTimeTextBox + // summary: + // TODOC + // + new Date("X"); // workaround for #11279, new Date("") == NaN diff --git a/form/_ExpandingTextAreaMixin.js b/form/_ExpandingTextAreaMixin.js index f0d00296f..1e9e22ef3 100644 --- a/form/_ExpandingTextAreaMixin.js +++ b/form/_ExpandingTextAreaMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_ExpandingTextAreaMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_ExpandingTextAreaMixin + // summary: + // TODOC + (function(){ // feature detection diff --git a/form/_FormMixin.js b/form/_FormMixin.js index a32be2a75..d76d87339 100644 --- a/form/_FormMixin.js +++ b/form/_FormMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_FormMixin", ["dojo", "dijit", "dojo/window"], function(dojo, dijit) { +define(["dojo", "..", "dojo/window"], function(dojo, dijit) { + // module: + // dijit/form/_FormMixin + // summary: + // TODOC + dojo.declare("dijit.form._FormMixin", null, { // summary: diff --git a/form/_FormSelectWidget.js b/form/_FormSelectWidget.js index 92fbb8794..e4da5958f 100644 --- a/form/_FormSelectWidget.js +++ b/form/_FormSelectWidget.js @@ -1,4 +1,14 @@ -define("dijit/form/_FormSelectWidget", ["dojo", "dijit", "dijit/form/_FormWidget", "dojo/data/util/sorter"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./_FormWidget", + "dojo/data/util/sorter"], function(dojo, dijit) { + // module: + // dijit/form/_FormSelectWidget + // summary: + // TODOC + // + /*===== dijit.form.__SelectOption = function(){ diff --git a/form/_FormWidget.js b/form/_FormWidget.js index 28fbd4d4a..b500b7d7e 100644 --- a/form/_FormWidget.js +++ b/form/_FormWidget.js @@ -1,4 +1,17 @@ -define("dijit/form/_FormWidget", ["dojo", "dijit", "dojo/window", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_CssStateMixin", "dijit/form/_FormWidgetMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/window", + "../_Widget", + "../_TemplatedMixin", + "../_CssStateMixin", + "./_FormWidgetMixin"], function(dojo, dijit) { + // module: + // dijit/form/_FormWidget + // summary: + // TODOC + // + dojo.declare("dijit.form._FormWidget", [dijit._Widget, dijit._TemplatedMixin, dijit._CssStateMixin, dijit.form._FormWidgetMixin], diff --git a/form/_FormWidgetMixin.js b/form/_FormWidgetMixin.js index 221833a9f..3a4340758 100644 --- a/form/_FormWidgetMixin.js +++ b/form/_FormWidgetMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_FormWidgetMixin", ["dojo", "dijit", "dojo/window"], function(dojo, dijit) { +define(["dojo", "..", "dojo/window"], function(dojo, dijit) { + // module: + // dijit/form/_FormWidgetMixin + // summary: + // TODOC + dojo.declare("dijit.form._FormWidgetMixin", null, { // summary: diff --git a/form/_ListBase.js b/form/_ListBase.js index 35013fb58..548538103 100644 --- a/form/_ListBase.js +++ b/form/_ListBase.js @@ -1,4 +1,9 @@ -define("dijit/form/_ListBase", ["dojo", "dijit", "dojo/window"], function(dojo, dijit) { +define(["dojo", "..", "dojo/window"], function(dojo, dijit) { + // module: + // dijit/form/_ListBase + // summary: + // TODOC + dojo.declare( "dijit.form._ListBase", null, { // summary: diff --git a/form/_ListMouseMixin.js b/form/_ListMouseMixin.js index 2a4272f92..6033b8409 100644 --- a/form/_ListMouseMixin.js +++ b/form/_ListMouseMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_ListMouseMixin", ["dojo", "dijit", "dijit/form/_ListBase"], function(dojo, dijit) { +define(["dojo", "..", "./_ListBase"], function(dojo, dijit) { + // module: + // dijit/form/_ListMouseMixin + // summary: + // TODOC + dojo.declare( "dijit.form._ListMouseMixin", dijit.form._ListBase, { // summary: diff --git a/form/_RadioButtonMixin.js b/form/_RadioButtonMixin.js index 82aa93bfb..6136249c7 100644 --- a/form/_RadioButtonMixin.js +++ b/form/_RadioButtonMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_RadioButtonMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_RadioButtonMixin + // summary: + // TODOC + dojo.declare("dijit.form._RadioButtonMixin", null, { diff --git a/form/_Spinner.js b/form/_Spinner.js index 8a12f0dc8..78e72a26c 100644 --- a/form/_Spinner.js +++ b/form/_Spinner.js @@ -1,4 +1,14 @@ -define("dijit/form/_Spinner", ["dojo", "dijit", "text!dijit/form/templates/Spinner.html", "dijit/form/RangeBoundTextBox"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/Spinner.html", + "./RangeBoundTextBox"], function(dojo, dijit) { + // module: + // dijit/form/_Spinner + // summary: + // TODOC + // + dojo.declare( "dijit.form._Spinner", diff --git a/form/_TextBoxMixin.js b/form/_TextBoxMixin.js index 81961b737..524c6a1bc 100644 --- a/form/_TextBoxMixin.js +++ b/form/_TextBoxMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_TextBoxMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_TextBoxMixin + // summary: + // TODOC + dojo.declare( "dijit.form._TextBoxMixin", null, { // summary: diff --git a/form/_ToggleButtonMixin.js b/form/_ToggleButtonMixin.js index 9caba55e1..91009ac1e 100644 --- a/form/_ToggleButtonMixin.js +++ b/form/_ToggleButtonMixin.js @@ -1,4 +1,9 @@ -define("dijit/form/_ToggleButtonMixin", ["dojo", "dijit"], function(dojo, dijit) { +define(["dojo", ".."], function(dojo, dijit) { + // module: + // dijit/form/_ToggleButtonMixin + // summary: + // TODOC + dojo.declare("dijit.form._ToggleButtonMixin", null, { // summary: diff --git a/layout/AccordionContainer.js b/layout/AccordionContainer.js index 257452f71..7a60d9b6e 100644 --- a/layout/AccordionContainer.js +++ b/layout/AccordionContainer.js @@ -1,4 +1,19 @@ -define("dijit/layout/AccordionContainer", ["dojo", "dijit", "text!dijit/layout/templates/AccordionButton.html", "dijit/_Container", "dijit/_TemplatedMixin", "dijit/_CssStateMixin", "dijit/layout/StackContainer", "dijit/layout/ContentPane", "dijit/layout/AccordionPane"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/AccordionButton.html", + "../_Container", + "../_TemplatedMixin", + "../_CssStateMixin", + "./StackContainer", + "./ContentPane", + "./AccordionPane"], function(dojo, dijit) { + // module: + // dijit/layout/AccordionContainer + // summary: + // TODOC + // + //dojo.require("dijit.layout.AccordionPane "); // for back compat, remove for 2.0 diff --git a/layout/AccordionPane.js b/layout/AccordionPane.js index aceef977e..85b84603b 100644 --- a/layout/AccordionPane.js +++ b/layout/AccordionPane.js @@ -1,4 +1,9 @@ -define("dijit/layout/AccordionPane", ["dojo", "dijit", "dijit/layout/ContentPane"], function(dojo, dijit) { +define(["dojo", "..", "./ContentPane"], function(dojo, dijit) { + // module: + // dijit/layout/AccordionPane + // summary: + // TODOC + dojo.declare("dijit.layout.AccordionPane", dijit.layout.ContentPane, { // summary: diff --git a/layout/BorderContainer.js b/layout/BorderContainer.js index a00871eb6..c745f953c 100644 --- a/layout/BorderContainer.js +++ b/layout/BorderContainer.js @@ -1,4 +1,15 @@ -define("dijit/layout/BorderContainer", ["dojo", "dijit", "dijit/layout/_LayoutWidget", "dojo/cookie", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./_LayoutWidget", + "dojo/cookie", + "../_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/layout/BorderContainer + // summary: + // TODOC + // + dojo.declare( "dijit.layout.BorderContainer", diff --git a/layout/ContentPane.js b/layout/ContentPane.js index 3e4160575..7f51a805d 100644 --- a/layout/ContentPane.js +++ b/layout/ContentPane.js @@ -1,4 +1,17 @@ -define("dijit/layout/ContentPane", ["dojo", "dijit", "dijit/_Widget", "dijit/layout/_ContentPaneResizeMixin", "dojo/string", "dojo/html", "i18n!dijit/nls/loading"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Widget", + "./_ContentPaneResizeMixin", + "dojo/string", + "dojo/html", + "dojo/i18n!../nls/loading"], function(dojo, dijit) { + // module: + // dijit/layout/ContentPane + // summary: + // TODOC + // + dojo.declare( "dijit.layout.ContentPane", [dijit._Widget, dijit.layout._ContentPaneResizeMixin], diff --git a/layout/LayoutContainer.js b/layout/LayoutContainer.js index 2056e3f82..b6404a594 100644 --- a/layout/LayoutContainer.js +++ b/layout/LayoutContainer.js @@ -1,4 +1,9 @@ -define("dijit/layout/LayoutContainer", ["dojo", "dijit", "dijit/layout/_LayoutWidget"], function(dojo, dijit) { +define(["dojo", "..", "./_LayoutWidget"], function(dojo, dijit) { + // module: + // dijit/layout/LayoutContainer + // summary: + // TODOC + dojo.declare("dijit.layout.LayoutContainer", dijit.layout._LayoutWidget, diff --git a/layout/LinkPane.js b/layout/LinkPane.js index a4489946f..c638f588b 100644 --- a/layout/LinkPane.js +++ b/layout/LinkPane.js @@ -1,4 +1,14 @@ -define("dijit/layout/LinkPane", ["dojo", "dijit", "dijit/layout/ContentPane", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./ContentPane", + "../_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/layout/LinkPane + // summary: + // TODOC + // + dojo.declare("dijit.layout.LinkPane", [dijit.layout.ContentPane, dijit._TemplatedMixin], diff --git a/layout/ScrollingTabController.js b/layout/ScrollingTabController.js index 2bce9d454..1bb7e170a 100644 --- a/layout/ScrollingTabController.js +++ b/layout/ScrollingTabController.js @@ -1,4 +1,19 @@ -define("dijit/layout/ScrollingTabController", ["dojo", "dijit", "text!dijit/layout/templates/ScrollingTabController.html", "text!dijit/layout/templates/_ScrollingTabControllerButton.html", "dijit/layout/TabController", "dijit/_WidgetsInTemplateMixin", "dijit/Menu", "dijit/form/Button", "dijit/_HasDropDown"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/ScrollingTabController.html", + "dojo/text!./templates/_ScrollingTabControllerButton.html", + "./TabController", + "../_WidgetsInTemplateMixin", + "../Menu", + "../form/Button", + "../_HasDropDown"], function(dojo, dijit) { + // module: + // dijit/layout/ScrollingTabController + // summary: + // TODOC + // + dojo.declare("dijit.layout.ScrollingTabController", [dijit.layout.TabController, dijit._WidgetsInTemplateMixin], diff --git a/layout/SplitContainer.js b/layout/SplitContainer.js index a4aa12f98..b0685eb74 100644 --- a/layout/SplitContainer.js +++ b/layout/SplitContainer.js @@ -1,4 +1,14 @@ -define("dijit/layout/SplitContainer", ["dojo", "dijit", "dojo/cookie", "dijit/layout/_LayoutWidget"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/cookie", + "./_LayoutWidget"], function(dojo, dijit) { + // module: + // dijit/layout/SplitContainer + // summary: + // TODOC + // + // // FIXME: make it prettier diff --git a/layout/StackContainer.js b/layout/StackContainer.js index 71a0784a8..fad23e073 100644 --- a/layout/StackContainer.js +++ b/layout/StackContainer.js @@ -1,4 +1,16 @@ -define("dijit/layout/StackContainer", ["dojo", "dijit", "dijit/layout/_LayoutWidget", "i18n!dijit/nls/common", "dojo/cookie", "dijit/layout/StackController"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./_LayoutWidget", + "dojo/i18n!../nls/common", + "dojo/cookie", + "./StackController"], function(dojo, dijit) { + // module: + // dijit/layout/StackContainer + // summary: + // TODOC + // + dojo.declare( "dijit.layout.StackContainer", diff --git a/layout/StackController.js b/layout/StackController.js index dc6c490d2..5f7a35bc2 100644 --- a/layout/StackController.js +++ b/layout/StackController.js @@ -1,4 +1,17 @@ -define("dijit/layout/StackController", ["dojo", "dijit", "dijit/_Widget", "dijit/_TemplatedMixin", "dijit/_Container", "dijit/form/ToggleButton", "i18n!dijit/nls/common"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Widget", + "../_TemplatedMixin", + "../_Container", + "../form/ToggleButton", + "dojo/i18n!../nls/common"], function(dojo, dijit) { + // module: + // dijit/layout/StackController + // summary: + // TODOC + // + dojo.declare( "dijit.layout.StackController", diff --git a/layout/TabContainer.js b/layout/TabContainer.js index 8f6ef1c26..db6450779 100644 --- a/layout/TabContainer.js +++ b/layout/TabContainer.js @@ -1,4 +1,15 @@ -define("dijit/layout/TabContainer", ["dojo", "dijit", "dijit/layout/_TabContainerBase", "dijit/layout/TabController", "dijit/layout/ScrollingTabController"], function(dojo, dijit) { +define([ + "dojo", + "..", + "./_TabContainerBase", + "./TabController", + "./ScrollingTabController"], function(dojo, dijit) { + // module: + // dijit/layout/TabContainer + // summary: + // TODOC + // + dojo.declare("dijit.layout.TabContainer", dijit.layout._TabContainerBase, diff --git a/layout/TabController.js b/layout/TabController.js index 461be88fb..9116ef62e 100644 --- a/layout/TabController.js +++ b/layout/TabController.js @@ -1,4 +1,17 @@ -define("dijit/layout/TabController", ["dojo", "dijit", "text!dijit/layout/templates/_TabButton.html", "dijit/layout/StackController", "dijit/Menu", "dijit/MenuItem", "i18n!dijit/nls/common"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/_TabButton.html", + "./StackController", + "../Menu", + "../MenuItem", + "dojo/i18n!../nls/common"], function(dojo, dijit) { + // module: + // dijit/layout/TabController + // summary: + // TODOC + // + // Menu is used for an accessible close button, would be nice to have a lighter-weight solution diff --git a/layout/_ContentPaneResizeMixin.js b/layout/_ContentPaneResizeMixin.js index 7db832d29..76ba0810d 100644 --- a/layout/_ContentPaneResizeMixin.js +++ b/layout/_ContentPaneResizeMixin.js @@ -1,4 +1,14 @@ -define("dijit/layout/_ContentPaneResizeMixin", ["dojo", "dijit", "dijit/_Contained", "dijit/layout/_LayoutWidget"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Contained", + "./_LayoutWidget"], function(dojo, dijit) { + // module: + // dijit/layout/_ContentPaneResizeMixin + // summary: + // TODOC + // + dojo.declare("dijit.layout._ContentPaneResizeMixin", null, { // summary: diff --git a/layout/_LayoutWidget.js b/layout/_LayoutWidget.js index 643668187..75a5a940a 100644 --- a/layout/_LayoutWidget.js +++ b/layout/_LayoutWidget.js @@ -1,4 +1,15 @@ -define("dijit/layout/_LayoutWidget", ["dojo", "dijit", "dijit/_Widget", "dijit/_Container", "dijit/_Contained"], function(dojo, dijit) { +define([ + "dojo", + "..", + "../_Widget", + "../_Container", + "../_Contained"], function(dojo, dijit) { + // module: + // dijit/layout/_LayoutWidget + // summary: + // TODOC + // + dojo.declare("dijit.layout._LayoutWidget", [dijit._Widget, dijit._Container, dijit._Contained], diff --git a/layout/_TabContainerBase.js b/layout/_TabContainerBase.js index f931e92ca..77d1551bb 100644 --- a/layout/_TabContainerBase.js +++ b/layout/_TabContainerBase.js @@ -1,4 +1,15 @@ -define("dijit/layout/_TabContainerBase", ["dojo", "dijit", "text!dijit/layout/templates/TabContainer.html", "dijit/layout/StackContainer", "dijit/_TemplatedMixin"], function(dojo, dijit) { +define([ + "dojo", + "..", + "dojo/text!./templates/TabContainer.html", + "./StackContainer", + "../_TemplatedMixin"], function(dojo, dijit) { + // module: + // dijit/layout/_TabContainerBase + // summary: + // TODOC + // + dojo.declare("dijit.layout._TabContainerBase", [dijit.layout.StackContainer, dijit._TemplatedMixin], diff --git a/main.js b/main.js new file mode 100644 index 000000000..edf48d4af --- /dev/null +++ b/main.js @@ -0,0 +1,9 @@ +define(["dojo"], function(dojo) { + // module: + // dijit + // summary: + // The dijit package main module + // + + return dojo.dijit; +}); diff --git a/package.json b/package.json index 9ca942316..7a89794bb 100644 --- a/package.json +++ b/package.json @@ -1,24 +1,35 @@ { - "name": "dijit", - "directories": { - "lib": "." - }, - "main":"./lib/main", - "mappings": { - "dojo": "https://github.com/dojo/dojo/zipball/1.0.2" - }, - "description": "Dijit is Dojo’s UI Library", - "licenses": [ - { - "type": "AFLv2.1", - "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L43" - }, - { - "type": "BSD", - "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L13" - } - ], - "bugs": "http://bugs.dojotoolkit.org/", - "keywords": ["JavaScript", "Dojo", "Widget"], - "homepage": "http://dojotoolkit.org/" + "name": "dijit", + "directories": { + "lib": "." + }, + "main":"./main", + "mappings": { + "dojo": "https://github.com/dojo/dojo/zipball/1.0.2" + }, + "description": "Dijit is Dojo’s UI Library", + "licenses": [ + { + "type": "AFLv2.1", + "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L43" + }, + { + "type": "BSD", + "url": "http://trac.dojotoolkit.org/browser/dojo/trunk/LICENSE#L13" + } + ], + "bugs": "http://bugs.dojotoolkit.org/", + "keywords": ["JavaScript", "Dojo", "Widget"], + "homepage": "http://dojotoolkit.org/", + "dojoBuild": { + "resourceTags":{ + "test": [".*/dijit/tests.*", ".*/dijit/robot.*"], + "amd": [".*\.js$", "!", ".*/nls/.*", "!", "resources/_modules.js", "!", "/themes/claro/compile.js"] + }, + "trees":[ + // don't discover hidden (e.g., .svn), the 1.6- AMD layer, query-sizzle, or any of the old loader + [".", ".", "/\\."] + ] + } + } \ No newline at end of file diff --git a/robot.js b/robot.js index 56b8b9edb..163c30a0f 100644 --- a/robot.js +++ b/robot.js @@ -1,4 +1,9 @@ -define("dijit/robot", ["dojo", "dijit", "dojo/robot"], function(dojo, dijit) { +define(["dojo", ".", "dojo/robot"], function(dojo, dijit) { + // module: + // dijit/robot + // summary: + // TODOC + diff --git a/robotx.js b/robotx.js index e25ed95c5..553e7ff1b 100644 --- a/robotx.js +++ b/robotx.js @@ -1,4 +1,14 @@ -define("dijit/robotx", ["dojo", "dijit", "dijit/robot", "dojo/robotx"], function(dojo, dijit_) { +define([ + "dojo", + ".", + "./robot", + "dojo/robotx"], function(dojo, dijit_) { + // module: + // dijit/robotx + // summary: + // TODOC + // + //WARNING: This module depends on GLOBAL dijit being set for v1.5 code; therefore the lexical variable that //references "dijit" has been renamed to "dijit_" diff --git a/tests/_testCommon.js b/tests/_testCommon.js index 8b49942b7..54dd07eb4 100644 --- a/tests/_testCommon.js +++ b/tests/_testCommon.js @@ -14,8 +14,8 @@ you should NOT be using this in a production environment. include your css and set your classes manually. for test purposes only ... */ +require(["dojo"], function(dojo){ -(function(){ var d = dojo, dir = "", theme = false, @@ -119,5 +119,4 @@ }); } - -})(); +}); diff --git a/tests/editor/BackForwardState.html b/tests/editor/BackForwardState.html index 079a30c71..4ea1d6ed9 100644 --- a/tests/editor/BackForwardState.html +++ b/tests/editor/BackForwardState.html @@ -42,5 +42,6 @@