Fix paths in dojox/date modules so they load in RequireJS, fixes #18794.

dojo · Feb 22, 2016 · 14ac0d4 · 14ac0d4
1 parent 77126de
commit 14ac0d4
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/date/buddhist.js b/date/buddhist.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./buddhist/Date"], function(dojox, lang, dd, BDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./buddhist/Date"], function(dojox, lang, dd, BDate){
 	var dbuddhist = lang.getObject("date.buddhist", true, dojox);
 
 // Utility methods to do arithmetic calculations with buddhist.Dates

diff --git a/date/buddhist/locale.js b/date/buddhist/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/buddhist"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/buddhist"],
 	function(dojox, lang, arr, dd, i18n, regexp, string, BDate){
 
 	var blocale = lang.getObject("date.buddhist.locale", true, dojox);

diff --git a/date/hebrew.js b/date/hebrew.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./hebrew/Date"], function(dojox, lang, dd, HDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./hebrew/Date"], function(dojox, lang, dd, HDate){
 
 var dhebrew = lang.getObject("date.hebrew", true, dojox);
 

diff --git a/date/hebrew/locale.js b/date/hebrew/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "./numerals", "dojo/i18n!dojo/cldr/nls/hebrew"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "./numerals", "dojo/i18n!dojo/cldr/nls/hebrew"],
 	function(dojox, lang, arr, dd, i18n, regexp, string, HDate, numerals){
 
 	var hlocale = lang.getObject("date.hebrew.locale", true, dojox);

diff --git a/date/hebrew/numerals.js b/date/hebrew/numerals.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array"], function(dojox, lang, arr){
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array"], function(dojox, lang, arr){
 	var hnumerals = lang.getObject("date.hebrew.numerals", true, dojox);
 
 	//Conversion from "Hindi" numerals to Hebrew numerals and vice versa

diff --git a/date/islamic.js b/date/islamic.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./islamic/Date"], function(dojox, lang, dd, IDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./islamic/Date"], function(dojox, lang, dd, IDate){
 
 var dislamic = lang.getObject("date.islamic", true, dojox);
 

diff --git a/date/islamic/locale.js b/date/islamic/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
        function(dojox, lang, arr, dd, i18n, regexp, string, IDate, bundle){
 
 	var ilocale = lang.getObject("date.islamic.locale", true, dojox);

diff --git a/date/persian.js b/date/persian.js
@@ -1,4 +1,4 @@
-define("dojox/date/persian", ["..", "dojo/_base/lang", "dojo/date", "./persian/Date"], function(dojox, lang, dd, IDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./persian/Date"], function(dojox, lang, dd, IDate){
 
 var dpersian = lang.getObject("date.persian", true, dojox);
 

diff --git a/date/persian/locale.js b/date/persian/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/persian"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/persian"],
        function(dojox, lang, arr, dd, i18n, regexp, string, IDate, bundle){
 
 	var ilocale = lang.getObject("date.persian.locale", true, dojox);

diff --git a/date/relative.js b/date/relative.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date/locale", "dojo/i18n"], function(dojox, lang, ddl, i18n){
+define(["dojox/main", "dojo/_base/lang", "dojo/date/locale", "dojo/i18n"], function(dojox, lang, ddl, i18n){
 
 var drelative = lang.getObject("date.relative", true, dojox);
 

diff --git a/date/umalqura.js b/date/umalqura.js
@@ -1,4 +1,4 @@
-define(["..", "dojo/_base/lang", "dojo/date", "./umalqura/Date"], function(dojox, lang, dd, IDate){
+define(["dojox/main", "dojo/_base/lang", "dojo/date", "./umalqura/Date"], function(dojox, lang, dd, IDate){
 
 var dumalqura = lang.getObject("date.umalqura", true, dojox);
 

diff --git a/date/umalqura/locale.js b/date/umalqura/locale.js
@@ -1,4 +1,4 @@
-define(["../..", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
+define(["dojox/main", "dojo/_base/lang", "dojo/_base/array", "dojo/date", "dojo/i18n", "dojo/regexp", "dojo/string", "./Date", "dojo/i18n!dojo/cldr/nls/islamic"],
        function (dojox, lang, arr, dd, i18n, regexp, string, IDate, bundle) {
 
            var ilocale = lang.getObject("date.umalqura.locale", true, dojox);