diff --git a/mvc/tests/1.7/runTests.html b/mvc/tests/1.7/runTests.html deleted file mode 100644 index 835b6f916a..0000000000 --- a/mvc/tests/1.7/runTests.html +++ /dev/null @@ -1,9 +0,0 @@ - - - - Dijit Unit Test Runner - - - Redirecting to D.O.H runner. - - diff --git a/mvc/tests/WidgetList_tests/test_mvc_Menu.html b/mvc/tests/WidgetList_tests/test_mvc_Menu.html index b34e7d9f3b..3e1432b889 100644 --- a/mvc/tests/WidgetList_tests/test_mvc_Menu.html +++ b/mvc/tests/WidgetList_tests/test_mvc_Menu.html @@ -43,13 +43,13 @@ "dojo/dom", "dojo/parser", // scan page for widgets and instantiate them "dojo/when", + "dojox/mvc/at", "dijit/Menu", "dijit/MenuItem", "dijit/PopupMenuItem", "dijit/PopupMenuBarItem", "dijit/CheckedMenuItem", "dijit/MenuSeparator", - "dojox/mvc/at", "dojox/mvc/getStateful", "dojox/mvc/WidgetList", "dijit/MenuBar", @@ -58,7 +58,7 @@ "dijit/form/TextBox", "dijit/dijit", // optimize: load dijit layer "dojo/domReady!" - ], function(declare, lang, aspect, dom, parser, when, Menu, MenuItem, PopupMenuItem, PopupMenuBarItem, CheckedMenuItem, MenuSeparator, at, getStateful, WidgetList){ + ], function(declare, lang, aspect, dom, parser, when, at, Menu, MenuItem, PopupMenuItem, PopupMenuBarItem, CheckedMenuItem, MenuSeparator, getStateful, WidgetList){ var mixin = declare(null, { _getPropertiesAttr: function(){ var list = this.inherited(arguments); diff --git a/mvc/tests/controllers/readme.txt b/mvc/tests/controllers/readme.txt new file mode 100644 index 0000000000..aa8256f9e7 --- /dev/null +++ b/mvc/tests/controllers/readme.txt @@ -0,0 +1,113 @@ +This directory in dojox/mvc/tests/controllers is used to show the differences when using different types of MVC Controllers. + +step1_test_mvc.html + Just uses getStateful(), it does not use a controller. + The getStateful call will take json data and make it Stateful. + In this example a transform (transformAddress2Class) is used to hide the row for AddressLine2 if it is blank. + 'dojox/mvc/parserExtension' is required for this since the row being hidden is not a widget. + The class attribute is bound to AddressLine2 with a direction and a transform. + + +step2_test_mvc.html + Step 2 of tests for Controllers, uses a ModelRefController. + To move from getStateful to ModelRefController, the only change other than the call to require and call new ModelRefController, + is to change the binding on the groups to use ctrl instead of model. + + This example also uses the transform (transformAddress2Class) to hide the row for AddressLine2 if it is blank. + + The ModelRefController constructor sets model to the results of the getStateful call which will take json data and make it Stateful + + +step3_test_mvc.html + Step 3 of test for Controllers, uses an EditModelRefController with holdModelUntilCommit: true. + To move from ModelRefController to use EditModelRefController, need to require EditModelRefController. + and on the new call use sourceModel instead of model. + + EditModelRefController adds support for reset() and commit(), so buttons were added to show Reset and Save (commit). + + With holdModelUntilCommit set to true, you will want to bind the output address for the group to + "target: at(ctrl,'sourceModel')", if holdModelUntilCommit is false you can stay with model, sourceModel will also work. + You can change holdModelUntilCommit to false to see how that works, updates will be reflected into the Verify section + immediately upon focus changes, and Reset will revert back to the last saved model. + The EditModelRefController constructor sets sourceModel to the results of the getStateful call which will take json data and create make it Stateful + + +step4_test_mvc.html + Step 4 of test for Controllers, uses a StoreRefController. + To move from ModelRefController to use StoreRefController, need to require StoreRefController, Memory (store), and when + Also needed to change the data to be valid for a store query. + Setup StoreRefController and use ctrl.queryStore() to setup the models. + + Because of the queryStore call had to move the call to parser.parse inside the when to wait for it. + The change in the data for queryStore required changes to the bindings, shad to add a group with target: at('rel:','0') + for the bindings of fields. + + An exprchar:'%' was used for an mvc/Output just to show how it is used. + + +step5_test_mvc.html + Step 5 of test for Controllers, uses an EditStoreRefController with holdModelUntilCommit: true. + To move from an EditModelRefController to use an EditStoreRefController, need to require EditStoreRefController, + Memory, and when. Also needed to change the data to be valid for a store query. + + Because of the queryStore call had to move the call to parser.parse inside the when to wait for it. + The change in the data for queryStore required changes to the bindings. had to add a group with target: at('rel:','0') + for the bindings of fields. + + With holdModelUntilCommit set to true, you will want to bind the output address for the group to + "target: at(ctrl,'sourceModel')", if holdModelUntilCommit is false you can stay with model, sourceModel will also work. + You can change holdModelUntilCommit to false to see how that works, updates will be reflected into the Verify section + immediately upon focus changes, and Reset will revert back to the last saved model. + The EditStoreRefController constructor sets store to the memory store and uses queryStore() to setup the models. + + +step6_test_mvc.html + Step 6 of test for Controllers, uses a ListController. + To move from ModelRefController to also use ListController, + Need to require declare, and ListController, I also needed WidgetList and _InlineTemplateMixin. + mvc/parserExtension is still needed to bind to class with data-mvc-bindings for 'AddressLine2' + Decided to setup a ctrlclz with ListController to have the functions as part of the controller. + The data had to be changed to be array data. + The html was updated to use a WidgetList to show a radio button group with the choices, and to use a + "cursor" binding for the selected address. + Added a transform (transformRadioChecked) to change the cursorIndex when a different AddressName radio button is + selected. Also added an addEmpty function to add a New Address to the list. + + +step7_test_mvc.html + Step 7 of test for Controllers, uses an EditModelRefController and ListController. + To move from ModelRefController to also use EditModelRefController and a ListController, + Need to require declare, and EditModelRefController, ListController, + I also needed WidgetList and _InlineTemplateMixin. + + Needed to setup ctrlclz with EditModelRefController and ListController, and the data needs to be array data and the + call to new ctrlclz uses sourceModel instead of model, and sets holdModelUntilCommit + The html was updated to use a WidgetList to show a radio button group with the choices, and to use a + "cursor" binding for the selected address. + Added a transform (transformRadioChecked) to change the cursorIndex when a different AddressName radio button is + selected. Also added an addEmpty function to add a New Address to the list. + + +step8_test_mvc.html + Step 8 of test for Controllers, uses an EditStoreRefListController with holdModelUntilCommit: false + To move from ModelRefController with EditModelRefController and a ListController to a EditStoreRefListController + Need to require the EditStoreRefListController, when, and Memory + I also needed to change the data to be valid for a store query. + Needed to setup ctrlclz with EditStoreRefListController, and use when and ctrl.queryStore() to setup the models. + + This test uses holdModelUntilCommit: false on the WidgetList, so updates to the address will immediately show-up in + the verify section and in the select an address section, but changes can be "Reset" back to their last saved state. + + +step9_test_mvc.html + Step 9 of test for Controllers, uses an EditStoreRefListController with holdModelUntilCommit: true + To move from EditStoreRefListController with holdModelUntilCommit: false to use holdModelUntilCommit: true + I had to add the require for dojox/mvc/at and ListController + + This test uses holdModelUntilCommit: true on the WidgetList, so updates to the address will not show-up in + the "Verify" section and in the "Select an address" section until "Save" is pressed. + But using holdModelUntilCommit: true requires use of a second controller (ctrlSource) which is a ListController + and is bound to the sourceModel and cursorIndex of the first controller (ctrl). + + The "Verify" section and the "Select an address" section are bound to at(ctrlSource,'cursor') and at(ctrlSource, 'model') respectively. + To set the Radio buttons correctly, "Checked" has to be updated in ctrl.model inside the transformRadioChecked. diff --git a/mvc/tests/controllers/step1_test_mvc.html b/mvc/tests/controllers/step1_test_mvc.html new file mode 100644 index 0000000000..6b145c8370 --- /dev/null +++ b/mvc/tests/controllers/step1_test_mvc.html @@ -0,0 +1,128 @@ + + + + + Step 1 of test for Controllers, use getStateful() only. + + + + + + +
+
+
+

Step 1 of test for Controllers, use getStateful() only.

+

Enter Shipping Address

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+

Verify the shipping address

+
+
+
+
+
+
+
+
+
+
+
+
+
${this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step2_test_mvc.html b/mvc/tests/controllers/step2_test_mvc.html new file mode 100644 index 0000000000..9276974b6a --- /dev/null +++ b/mvc/tests/controllers/step2_test_mvc.html @@ -0,0 +1,131 @@ + + + + + Step 2 of tests for Controllers, uses a ModelRefController. + + + + + + +
+
+
+

Step 2 of test for Controllers, uses a ModelRefController.

+

Enter Shipping Address

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+

Verify the shipping address

+
+
+
+
+
+
+
+
+
+
+
+
+
${this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step3_test_mvc.html b/mvc/tests/controllers/step3_test_mvc.html new file mode 100644 index 0000000000..a29c03c7ff --- /dev/null +++ b/mvc/tests/controllers/step3_test_mvc.html @@ -0,0 +1,142 @@ + + + + + Step 3 of test for Controllers, uses an EditModelRefController. + + + + + + +
+
+
+

Step 3 of test for Controllers, uses an EditModelRefController with holdModelUntilCommit: true.

+

Enter Shipping Address

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ + +
+ +
+
+

Verify the shipping address, will not update until saved with holdModelUntilCommit true.

+
+
+
+
+
+
+
+
+
+
+
+
+
${this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step4_test_mvc.html b/mvc/tests/controllers/step4_test_mvc.html new file mode 100644 index 0000000000..95bb948535 --- /dev/null +++ b/mvc/tests/controllers/step4_test_mvc.html @@ -0,0 +1,148 @@ + + + + + Step 4 of test for Controllers, uses a StoreRefController. + + + + + + +
+
+
+

Step 4 of test for Controllers, uses a StoreRefController.

+

Enter Shipping Address

+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+

Verify the shipping address

+
+
+
+
+
+
+
+
+
+
+
+
+
+
%{this.value},
+
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step5_test_mvc.html b/mvc/tests/controllers/step5_test_mvc.html new file mode 100644 index 0000000000..1f34b43508 --- /dev/null +++ b/mvc/tests/controllers/step5_test_mvc.html @@ -0,0 +1,158 @@ + + + + + Step 5 of test for Controllers, uses an EditControllerMixin with a StoreControllerMixin. + + + + + + +
+
+
+

Step 5 of test for Controllers, uses an EditStoreRefController with holdModelUntilCommit: true.

+

Enter Shipping Address

+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+ + +
+ +
+ +
+

Verify the shipping address, will not update until saved.

+
+
+
+
+
+
+
+
+
+
+
+
+
+
%{this.value},
+
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step6_test_mvc.html b/mvc/tests/controllers/step6_test_mvc.html new file mode 100644 index 0000000000..e9fd17c8fb --- /dev/null +++ b/mvc/tests/controllers/step6_test_mvc.html @@ -0,0 +1,236 @@ + + + + + Step 6 of test for Controllers, uses a ListController. + + + + + + +
+
+
+

Step 6 of test for Controllers, uses a ListController.

+

Select the Shipping Address to use.

+
+ +
+ +
+
+ + +
+ +
+

Enter the Shipping Address

+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+

Verify the shipping address for: +
+

+
+
+
+
+
+
+
+
+
+
+
+
%{this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step7_test_mvc.html b/mvc/tests/controllers/step7_test_mvc.html new file mode 100644 index 0000000000..326328ebe4 --- /dev/null +++ b/mvc/tests/controllers/step7_test_mvc.html @@ -0,0 +1,245 @@ + + + + + Step 7 of test for Controllers, uses an EditControllerMixin and ListControllerMixin. + + + + + + +
+
+
+

Step 7 of test for Controllers, uses an EditModelRefController and ListController

+

Select the Shipping Address to use.

+
+ +
+ +
+
+ + +
+ +
+

Enter the Shipping Address

+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ + +
+ +
+ + +
+
+

Verify the shipping address for: +
+

+
+
+
+
+
+
+
+
+
+
+
+
%{this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step8_test_mvc.html b/mvc/tests/controllers/step8_test_mvc.html new file mode 100644 index 0000000000..98c4df634f --- /dev/null +++ b/mvc/tests/controllers/step8_test_mvc.html @@ -0,0 +1,247 @@ + + + + + Step 8 of test for Controllers, uses an EditStoreRefListController. + + + + + + +
+
+
+

Step 8 of test for Controllers, uses an EditStoreRefListController with holdModelUntilCommit: false

+

Select the Shipping Address to use.

+
+ +
+ +
+
+ + +
+ +
+

Enter the Shipping Address

+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ + +
+ +
+ +
+
+

Verify the shipping address for: +
+ +

+
+
+
+
+
+
+
+
+
+
+
+
%{this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/controllers/step9_test_mvc.html b/mvc/tests/controllers/step9_test_mvc.html new file mode 100644 index 0000000000..f252445815 --- /dev/null +++ b/mvc/tests/controllers/step9_test_mvc.html @@ -0,0 +1,257 @@ + + + + + Step 9 of test for Controllers, uses an EditStoreRefListController with holdModelUntilCommit: true. + + + + + + +
+
+
+

Step 9 of test for Controllers, uses an EditStoreRefListController with holdModelUntilCommit: true

+

Select the Shipping Address to use.

+
+ +
+ +
+
+ + +
+ +
+

Enter the Shipping Address

+ +
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+ + +
+ +
+ +
+
+

Verify the shipping address for: +
+ +

+
+
+
+
+
+
+
+
+
+
+
+
%{this.value},
+
+
+
+
+
+
+ + diff --git a/mvc/tests/css/app-format.css b/mvc/tests/css/app-format.css index d201d13042..3b3ba04b7c 100644 --- a/mvc/tests/css/app-format.css +++ b/mvc/tests/css/app-format.css @@ -21,8 +21,16 @@ tbody { display: inline-block; width: 100%; } .cell { width: 20%; display:inline-block; } .fullrow { width: 100%; display: inline-block; margin: 5px; } .fixedcell { width: 170px; display:inline-block; } +.buttoncell { display:inline-block; } .widerow { width: 900px; display: inline-block; margin: 5px; } .narrowcell { width: 5%; display:inline-block; } +.namecell { margin-right: 2px; display:inline-block; } +.radioLabel {text-align: left; display:inline-block; width: 20%; } +.boldnamecell { font-weight: bold; margin-right: 2px; display:inline-block; } + +.hiderow { width: 100%; display: none; margin: 5px; } + + label { text-align: right; width: 98%; display: inline-block; font-weight: bold; } .generate-heading { font-size:1.2em; font-weight:bold; } diff --git a/mvc/tests/docExamples/widgetListProgrammaticExample1.html b/mvc/tests/docExamples/widgetListProgrammaticExample1.html index 71687ab231..49af20b841 100644 --- a/mvc/tests/docExamples/widgetListProgrammaticExample1.html +++ b/mvc/tests/docExamples/widgetListProgrammaticExample1.html @@ -32,15 +32,15 @@ "dojo/parser", "dojo/promise/all", "dojo/store/Memory", + "dojox/mvc/at", "dijit/registry", "dijit/_WidgetBase", - "dojox/mvc/at", "dojox/mvc/EditStoreRefListController", "dojox/mvc/WidgetList", "dijit/form/TextBox", "dojox/mvc/Group", "dojo/domReady!" - ], function(declare, when, ddom, parser, all, Memory, registry, _WidgetBase, at, EditStoreRefListController, WidgetList){ + ], function(declare, when, ddom, parser, all, Memory, at, registry, _WidgetBase, EditStoreRefListController, WidgetList){ // Initial data var data = { @@ -75,7 +75,7 @@ ctrl = new EditStoreRefListController({store: new Memory({data: data})}); - // Programatic WidgetList using childBindings and a templateString using attach-points + // Programmatic WidgetList using childBindings and a templateString using attach-points (new WidgetList({templateString: templateString2, children: at(ctrl, "model"), childBindings: { diff --git a/mvc/tests/doh/StoreRefControllerTest.js b/mvc/tests/doh/StoreRefControllerTest.js index f800698230..8ee931451f 100644 --- a/mvc/tests/doh/StoreRefControllerTest.js +++ b/mvc/tests/doh/StoreRefControllerTest.js @@ -4,11 +4,11 @@ define([ "dojo/_base/config", "dojo/_base/declare", "dijit/_WidgetBase", + "dojox/mvc/at", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dijit/_Container", "dijit/form/TextBox", - "dojox/mvc/at", "dojox/mvc/getStateful", "dojox/mvc/EditStoreRefListController", "dojo/store/Memory", @@ -17,8 +17,8 @@ define([ "dojo/text!dojox/mvc/tests/test_WidgetList_WidgetListInTemplate.html", "dojo/text!dojox/mvc/tests/test_WidgetList_childTemplate.html", "dojo/text!dojox/mvc/tests/test_WidgetList_childBindings.json" -], function(doh, array, config, declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, - _TextBox, at, getStateful, EditStoreRefListController, Memory, when, WidgetList, template, childTemplate, childBindings){ +], function(doh, array, config, declare, _WidgetBase, at, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, + _TextBox, getStateful, EditStoreRefListController, Memory, when, WidgetList, template, childTemplate, childBindings){ var data = { "identifier": "Serial", "items": [ diff --git a/mvc/tests/doh/WidgetList.js b/mvc/tests/doh/WidgetList.js index 38fcb6b0d6..fe9192148c 100644 --- a/mvc/tests/doh/WidgetList.js +++ b/mvc/tests/doh/WidgetList.js @@ -4,17 +4,17 @@ define([ "dojo/_base/config", "dojo/_base/declare", "dijit/_WidgetBase", + "dojox/mvc/at", "dijit/_TemplatedMixin", "dijit/_WidgetsInTemplateMixin", "dijit/_Container", "dijit/form/TextBox", - "dojox/mvc/at", "dojox/mvc/getStateful", "dojox/mvc/WidgetList", "dojo/text!dojox/mvc/tests/test_WidgetList_WidgetListInTemplate.html", "dojo/text!dojox/mvc/tests/test_WidgetList_childTemplate.html", "dojo/text!dojox/mvc/tests/test_WidgetList_childBindings.json" -], function(doh, array, config, declare, _WidgetBase, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, _TextBox, at, getStateful, WidgetList, template, childTemplate, childBindings){ +], function(doh, array, config, declare, _WidgetBase, at, _TemplatedMixin, _WidgetsInTemplateMixin, _Container, _TextBox, getStateful, WidgetList, template, childTemplate, childBindings){ var a = getStateful([ { Serial: "A111", diff --git a/mvc/tests/doh/WidgetList_tests/doh_mvc_mobile-demo.html b/mvc/tests/doh/WidgetList_tests/doh_mvc_mobile-demo.html index 92dd8a0592..49aac709f6 100644 --- a/mvc/tests/doh/WidgetList_tests/doh_mvc_mobile-demo.html +++ b/mvc/tests/doh/WidgetList_tests/doh_mvc_mobile-demo.html @@ -27,6 +27,7 @@ "dojo/dom", "dojo/store/JsonRest", "dojo/store/Memory", + "dojox/mvc/at", "dijit/registry", "dojox/mobile/parser", "dojox/mvc/getPlainValue", @@ -34,7 +35,6 @@ "dojox/mvc/EditModelRefController", "dojox/mvc/ListController", "dojox/mvc/StoreRefController", - "dojox/mvc/at", "dojox/mobile", "dojox/mobile/compat", "dojox/mobile/ScrollableView", @@ -53,7 +53,7 @@ "dojox/mvc/WidgetList", "dojox/mvc/_InlineTemplateMixin", "dojo/domReady!" - ], function(doh, declare, djson, when, ddom, JsonRest, Memory, registry, parser, getPlainValue, getStateful, EditModelRefController, ListController, StoreRefController, at){ + ], function(doh, declare, djson, when, ddom, JsonRest, Memory, at, registry, parser, getPlainValue, getStateful, EditModelRefController, ListController, StoreRefController){ window.at = at; ctrlClass = declare([EditModelRefController, ListController], {}); diff --git a/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_cancel.html b/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_cancel.html index af86fcc9ea..b958c17c4e 100644 --- a/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_cancel.html +++ b/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_cancel.html @@ -118,9 +118,9 @@ "dojo/query", "dojo/parser", "dojo/Stateful", + "dojox/mvc/at", "dijit/registry", "dijit/Menu", - "dojox/mvc/at", "dojox/mvc/getStateful", "dijit/form/CheckBox", "dijit/form/DateTextBox", @@ -139,7 +139,7 @@ "dojox/mvc/Group", "dojox/mvc/WidgetList", "dojox/mvc/_InlineTemplateMixin" - ], function(doh, dojox, declare, lang, ddom, domClass, query, parser, Stateful, registry, Menu, at, getStateful){ + ], function(doh, dojox, declare, lang, ddom, domClass, query, parser, Stateful, at, registry, Menu, getStateful){ //window.at = at; var uniqueIdSeq = 3; diff --git a/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_manualsave.html b/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_manualsave.html index 4abe0cff5e..fdaa09e2e8 100644 --- a/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_manualsave.html +++ b/mvc/tests/doh/WidgetList_tests/doh_mvc_repeat_select_manualsave.html @@ -120,9 +120,9 @@ "dojo/query", "dojo/parser", "dojo/Stateful", + "dojox/mvc/at", "dijit/registry", "dijit/Menu", - "dojox/mvc/at", "dojox/mvc/getStateful", "dijit/form/CheckBox", "dijit/form/DateTextBox", @@ -141,7 +141,7 @@ "dojox/mvc/Group", "dojox/mvc/WidgetList", "dojox/mvc/_InlineTemplateMixin" - ], function(doh, dojox, declare, lang, ddom, domClass, query, parser, Stateful, registry, Menu, at, getStateful){ + ], function(doh, dojox, declare, lang, ddom, domClass, query, parser, Stateful, at, registry, Menu, getStateful){ var uniqueIdSeq = 3; diff --git a/mvc/tests/doh/doh_mvc_date_test.html b/mvc/tests/doh/doh_mvc_date_test.html index c49ef5dc5e..effc72d156 100644 --- a/mvc/tests/doh/doh_mvc_date_test.html +++ b/mvc/tests/doh/doh_mvc_date_test.html @@ -17,16 +17,16 @@ "dojo/Stateful", "dojo/date/stamp", "dojo/date/locale", + "dojox/mvc/at", "dijit/registry", "dijit/CalendarLite", "dijit/form/Button", "dijit/form/DateTextBox", "dijit/form/TextBox", - "dojox/mvc/at", "dojox/mvc/EditModelRefController", "dojox/mvc/Output", "dojo/domReady!" - ], function(doh, ddom, domStyle, parser, Stateful, dateStamp, dateLocale, registry, Calendar, Button, DateTextBox, TextBox, at, EditModelRefController, Output){ + ], function(doh, ddom, domStyle, parser, Stateful, dateStamp, dateLocale, at, registry, Calendar, Button, DateTextBox, TextBox, EditModelRefController, Output){ parser.parse(); diff --git a/mvc/tests/doh/doh_mvc_form-kitchensink.html b/mvc/tests/doh/doh_mvc_form-kitchensink.html index 19370397ee..234e2b6a82 100644 --- a/mvc/tests/doh/doh_mvc_form-kitchensink.html +++ b/mvc/tests/doh/doh_mvc_form-kitchensink.html @@ -26,6 +26,7 @@ "dojo/Stateful", "dojo/data/ItemFileReadStore", "dojo/date/locale", + "dojox/mvc/at", // at requires _atBindingExtension which extends _WidgetBase so it should come before dijit widgets "dijit/registry", "dijit/form/Button", "dijit/form/ComboBox", @@ -40,12 +41,11 @@ "dijit/form/Textarea", "dijit/Calendar", "dijit/ColorPalette", - "dojox/mvc/at", "dojox/mvc/EditModelRefController", "dojox/mvc/Output" - ], function(doh, ddom, number, parser, when, Stateful, ItemFileReadStore, locale, registry, Button, + ], function(doh, ddom, number, parser, when, Stateful, ItemFileReadStore, locale, at, registry, Button, ComboBox, DateTextBox, FilteringSelect, HorizontalSlider, NumberSpinner, NumberTextBox, - TextBox, Select, SimpleTextarea, Textarea, Calendar, ColorPalette, at, + TextBox, Select, SimpleTextarea, Textarea, Calendar, ColorPalette, EditModelRefController, Output){ store = new ItemFileReadStore({ diff --git a/mvc/tests/doh/doh_mvc_repeat_select_cancel.html b/mvc/tests/doh/doh_mvc_repeat_select_cancel.html index 9988e6461c..52814cff5c 100644 --- a/mvc/tests/doh/doh_mvc_repeat_select_cancel.html +++ b/mvc/tests/doh/doh_mvc_repeat_select_cancel.html @@ -118,9 +118,9 @@ "dojo/query", "dojo/parser", "dojo/Stateful", + "dojox/mvc/at", "dijit/registry", "dijit/Menu", - "dojox/mvc/at", "dojox/mvc/getStateful", "dijit/form/CheckBox", "dijit/form/DateTextBox", @@ -138,7 +138,7 @@ "dojox/mvc/StatefulArray", "dojox/mvc/Group", "dojox/mvc/Repeat" - ], function(doh, dojox, declare, lang, ddom, domClass, query, parser, Stateful, registry, Menu, at, getStateful){ + ], function(doh, dojox, declare, lang, ddom, domClass, query, parser, Stateful, at, registry, Menu, getStateful){ //window.at = at; var uniqueIdSeq = 3; diff --git a/mvc/tests/doh/wildcard.js b/mvc/tests/doh/wildcard.js index c52da158d3..99959b6e84 100644 --- a/mvc/tests/doh/wildcard.js +++ b/mvc/tests/doh/wildcard.js @@ -1,9 +1,9 @@ define([ "doh", "dojo/Stateful", - "dijit/form/TextBox", - "dojox/mvc/at" -], function(doh, Stateful, TextBox, at){ + "dojox/mvc/at", + "dijit/form/TextBox" +], function(doh, Stateful, at, TextBox){ doh.register("dojox.mvc.tests.doh.wildcard", [ function wildcard(){ var m0 = new Stateful({"placeHolder": "placeHolder0", "value": "Value0"}), diff --git a/mvc/tests/test_mvc_simple-programmatic.html b/mvc/tests/test_mvc_simple-programmatic.html index 578cf14fb2..feedb3aa66 100644 --- a/mvc/tests/test_mvc_simple-programmatic.html +++ b/mvc/tests/test_mvc_simple-programmatic.html @@ -20,11 +20,11 @@ "dojo/dom", "dojo/parser", "dojo/Stateful", + "dojox/mvc/at", "dijit/registry", "dijit/form/TextBox", - "dojox/mvc/at", "dijit/form/Button" - ], function(ddom, parser, Stateful, registry, TextBox, at){ + ], function(ddom, parser, Stateful, at, registry, TextBox){ var model = new Stateful({first: "John", last: "Doe"}); var fn = (new TextBox({id: "fn", value: at(model, 'first')})).placeAt(ddom.byId("mainContent"));