Remove clutter from main directory by moving .js files to either impl…

… or calendars directories. Fixes #28
ibm-js · Jun 19, 2014 · d94069f · d94069f
1 parent 8570897
commit d94069f
Show file tree

Hide file tree

Showing 17 changed files with 30 additions and 28 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,7 +5,9 @@ module.exports = function (grunt) {
 	grunt.initConfig({
 		jshint: {
 			src: [
-				"*.js"
+				"*.js",
+				"calendars/*.js",
+				"impl/*.js"
 			],
 			options: {
 				jshintrc: ".jshintrc"

diff --git a/Intl.js b/Intl.js
@@ -1,4 +1,4 @@
-define([ "./Record", "./calendars", "./common", "./locales!",
+define([ "./impl/Record", "./impl/calendars", "./impl/common", "./locales!",
 		"requirejs-text/text!./cldr/supplemental/currencyData.json",
 		"requirejs-text/text!./cldr/supplemental/timeData.json",
 		"requirejs-text/text!./cldr/supplemental/calendarPreferenceData.json",

diff --git a/buddhistCalendar.js → calendars/buddhistCalendar.js b/buddhistCalendar.js → calendars/buddhistCalendar.js
@@ -1,4 +1,4 @@
-define([ "./Record", "./calendarFunctions"],
+define([ "../impl/Record", "../impl/calendarFunctions"],
 	function (Record, calendarFunctions) {
 	var calendarBuddhist = {
 		toLocalTime : function (date, timeZone) {

diff --git a/civilTabularCalendar.js → calendars/civilTabularCalendar.js b/civilTabularCalendar.js → calendars/civilTabularCalendar.js
@@ -1,4 +1,4 @@
-define([ "./Record", "./calendarFunctions"], function (Record, calendarFunctions) {
+define([ "../impl/Record", "../impl/calendarFunctions"], function (Record, calendarFunctions) {
 
 	return {
 

diff --git a/gregorianCalendar.js → calendars/gregorianCalendar.js b/gregorianCalendar.js → calendars/gregorianCalendar.js
@@ -1,5 +1,5 @@
 define(
-	[ "./Record", "./calendarFunctions" ],
+	[ "../impl/Record", "../impl/calendarFunctions" ],
 	function (Record, calendarFunctions) {
 	var gregorianCalendar = {
 		toLocalTime : function (date, timeZone) {

diff --git a/hebrewCalendar.js → calendars/hebrewCalendar.js b/hebrewCalendar.js → calendars/hebrewCalendar.js
@@ -1,5 +1,5 @@
 define(
-	[ "./Record", "./calendarFunctions" ], function (Record, calendarFunctions) {
+	[ "../impl/Record", "../impl/calendarFunctions" ], function (Record, calendarFunctions) {
 	// A helek ( plural halakim ) is the basic unit of time measurement in the Hebrew calendar.
 	// There are exactly 1080 halakim in an hour. Ref: http://en.wikipedia.org/wiki/Helek
 	var HALAKIM_PER_HOUR = 1080;

diff --git a/islamicCalendar.js → calendars/islamicCalendar.js b/islamicCalendar.js → calendars/islamicCalendar.js
@@ -1,5 +1,5 @@
 define(
-	[ "./Record", "./calendarFunctions"], function (Record, calendarFunctions) {
+	[ "../impl/Record", "../impl/calendarFunctions"], function (Record, calendarFunctions) {
 
 
 	return {

diff --git a/japaneseCalendar.js → calendars/japaneseCalendar.js b/japaneseCalendar.js → calendars/japaneseCalendar.js
@@ -1,5 +1,5 @@
 define(
-	[ "./Record", "./calendarFunctions" ],
+	[ "../impl/Record", "../impl/calendarFunctions" ],
 	function (Record, calendarFunctions) {
 	var japaneseCalendar = {
 		toLocalTime : function (date, timeZone) {

diff --git a/rocCalendar.js → calendars/rocCalendar.js b/rocCalendar.js → calendars/rocCalendar.js
@@ -1,5 +1,5 @@
 define(
-	[ "./Record", "./calendarFunctions"],
+	[ "../impl/Record", "../impl/calendarFunctions"],
 	function (Record, calendarFunctions) {
 	var rocCalendar = {
 		toLocalTime : function (date, timeZone) {

diff --git a/umalquraCalendar.js → calendars/umalquraCalendar.js b/umalquraCalendar.js → calendars/umalquraCalendar.js
@@ -1,4 +1,4 @@
-define(["./Record", "./calendarFunctions", "./gregorianCalendar", "./islamicCalendar"],
+define(["../impl/Record", "../impl/calendarFunctions", "./gregorianCalendar", "./islamicCalendar"],
 	function (Record, calendarFunctions, gregorian, islamicCalendar) {
 
     return {

diff --git a/List.js → impl/List.js b/List.js → impl/List.js
diff --git a/Record.js → impl/Record.js b/Record.js → impl/Record.js
diff --git a/calendarFunctions.js → impl/calendarFunctions.js b/calendarFunctions.js → impl/calendarFunctions.js
@@ -1,4 +1,4 @@
-define([ "./Record", "requirejs-text/text!./cldr/supplemental/calendarData.json"],
+define([ "./Record", "requirejs-text/text!../cldr/supplemental/calendarData.json"],
 	function (Record, calendarDataJson) {
 	var calendarData = JSON.parse(calendarDataJson).supplemental.calendarData;
 	var calendarFunctions = {

diff --git a/calendars.js → impl/calendars.js b/calendars.js → impl/calendars.js
@@ -1,13 +1,13 @@
 define([ "./Record",
-		"requirejs-text/text!./cldr/supplemental/calendarData.json",
-        "./buddhistCalendar",
-        "./gregorianCalendar",
-        "./hebrewCalendar",
-        "./japaneseCalendar",
-        "./rocCalendar",
-        "./civilTabularCalendar",
-        "./islamicCalendar",
-        "./umalquraCalendar"],
+		"requirejs-text/text!../cldr/supplemental/calendarData.json",
+        "../calendars/buddhistCalendar",
+        "../calendars/gregorianCalendar",
+        "../calendars/hebrewCalendar",
+        "../calendars/japaneseCalendar",
+        "../calendars/rocCalendar",
+        "../calendars/civilTabularCalendar",
+        "../calendars/islamicCalendar",
+        "../calendars/umalquraCalendar"],
     function (Record, calendarDataJson, buddhistCalendar, gregorianCalendar, hebrewCalendar,
 	japaneseCalendar, rocCalendar, civilTabularCalendar, islamicCalendar, umalquraCalendar) {
 	var calendars = {

diff --git a/common.js → impl/common.js b/common.js → impl/common.js
@@ -2,10 +2,10 @@
  * Commonly used routines throughout ECMA-402 package. Also referred to in the standard as "Abstract Operations"
  */
 define(["./List", "./Record",
-		"requirejs-text/text!./cldr/config/availableLocales.json",
-		"requirejs-text/text!./cldr/supplemental/aliases.json",
-		"requirejs-text/text!./cldr/supplemental/localeAliases.json",
-		"requirejs-text/text!./cldr/supplemental/parentLocales.json" ],
+		"requirejs-text/text!../cldr/config/availableLocales.json",
+		"requirejs-text/text!../cldr/supplemental/aliases.json",
+		"requirejs-text/text!../cldr/supplemental/localeAliases.json",
+		"requirejs-text/text!../cldr/supplemental/parentLocales.json" ],
 	function (List, Record, availableLocalesJson, aliasesJson, localeAliasesJson, parentLocalesJson) {
 		var aliases = JSON.parse(aliasesJson).supplemental.metadata.alias;
 		var localeAliases = JSON.parse(localeAliasesJson).supplemental.metadata.alias;

diff --git a/load.js → impl/load.js b/load.js → impl/load.js
@@ -26,7 +26,7 @@ define([
 				jsonElements.push("ca-islamic", "ca-islamic-umalqura", "ca-islamic-civil", "ca-islamic-tbla");
 			}
 			var dependencies = jsonElements.map(function (element) {
-				return "requirejs-text/text!./cldr/" + locale + "/" + element + ".json";
+				return "requirejs-text/text!../cldr/" + locale + "/" + element + ".json";
 			});
 
 			// Load all the JSON files requested, and then return their data in a hash

diff --git a/locales.js b/locales.js
@@ -10,8 +10,8 @@
 define([
 	"module",
 	"require",
-	"./common",
-	"./load"	// just so builder knows we will be using that module
+	"./impl/common",
+	"./impl/load"	// just so builder knows we will be using that module
 ], function (module, require, common) {
 	// Compute locales to pre-load. Use hash to remove duplicates.
 	var localeHash = {};
@@ -40,7 +40,7 @@ define([
 	var locales = Object.keys(localeHash);
 
 	// Compute dependencies to require()
-	var dependencies = locales.map(function (locale) { return "./load!" + locale; });
+	var dependencies = locales.map(function (locale) { return "./impl/load!" + locale; });
 
 	return {
 		load: function (path, callerRequire, onload) {