Merge pull request #32577 from gasolin/issue-1207471

Bug 1207471 - reorganized shims in alphabet order, r=yzen
mozilla-b2g · Oct 21, 2015 · 7f5077d · 7f5077d
2 parents 5f15617 + 40c6f86
commit 7f5077d
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 66 deletions.
diff --git a/apps/settings/build/settings.build.jslike b/apps/settings/build/settings.build.jslike
@@ -9,40 +9,41 @@
   // which makes the objects inaccessible by reference.
   // If the inquiries to the object are all performed by requirejs, we can
   // remove the path of the object from the following list.
+  // organized in alphabet order
   paths: {
-    'vendor/jszip': 'empty:',
+    'modules/defer': 'empty:',
+    'modules/dialog_panel': 'empty:',
+    'modules/navigator/mozApps': 'empty:',
+    'modules/wifi_context': 'empty:',
+    'modules/wifi_utils': 'empty:',
     'prim': 'empty:',
     'settings': 'empty:',
+    'shared/airplane_mode_helper': 'empty:',
     'shared/apn_helper': 'empty:',
     'shared/async_storage': 'empty:',
     'shared/bluetooth_helper': 'empty:',
+    'shared/device_storage/enumerate_all': 'empty:',
+    'shared/homescreens/homescreen_settings': 'empty:',
     'shared/icc_helper': 'empty:',
     'shared/language_list': 'empty:',
     'shared/lazy_loader': 'empty:',
     'shared/manifest_helper': 'empty:',
+    'shared/mobile_operator': 'empty:',
+    'shared/omadrm/fl': 'empty:',
+    'shared/passcode_helper': 'empty:',
+    'shared/sanitizer': 'empty:',
+    'shared/settings_helper': 'empty:',
     'shared/settings_listener': 'empty:',
+    'shared/settings_url': 'empty:',
     'shared/simslot': 'empty:',
     'shared/simslot_manager': 'empty:',
-    'shared/sanitizer': 'empty:',
-    'shared/toaster': 'empty:',
     'shared/sim_settings_helper': 'empty:',
-    'shared/settings_helper': 'empty:',
-    'utils': 'empty:',
-    'shared/settings_url': 'empty:',
-    'shared/omadrm/fl': 'empty:',
-    'shared/device_storage/enumerate_all': 'empty:',
-    'shared/homescreens/homescreen_settings': 'empty:',
-    'shared/wifi_helper': 'empty:',
-    'shared/mobile_operator': 'empty:',
-    'shared/airplane_mode_helper': 'empty:',
     'shared/stk_helper': 'empty:',
-    'shared/passcode_helper': 'empty:',
-    'modules/wifi_utils': 'empty:',
-    'modules/wifi_context': 'empty:',
-    'modules/dialog_panel': 'empty:',
+    'shared/toaster': 'empty:',
+    'shared/wifi_helper': 'empty:',
     'shared/tz_select': 'empty:',
-    'modules/defer': 'empty:',
-    'modules/navigator/mozApps': 'empty:'
+    'utils': 'empty:',
+    'vendor/jszip': 'empty:'
   },
 
   findNestedDependencies: true,

diff --git a/apps/settings/js/config/require.js b/apps/settings/js/config/require.js
@@ -9,26 +9,32 @@ require.config({
   // timeout in the production build
   waitSeconds: 7,
   // shim global object into AMD format
-  // XXX Bug 1207471 organized in alphabet order
+  // organized in alphabet order
   shim: {
-    'settings': {
-      exports: 'Settings'
-    },
     'dsds_settings': {
       exports: 'DsdsSettings'
     },
-    'simcard_lock': {
-      exports: 'SimPinLock'
+    'settings': {
+      exports: 'Settings'
     },
-    'vendor/jszip': {
-      exports: 'JSZip'
+    'shared/airplane_mode_helper': {
+      exports: 'AirplaneModeHelper'
     },
     'shared/apn_helper': {
       exports: 'ApnHelper'
     },
     'shared/async_storage': {
       exports: 'asyncStorage'
     },
+    'shared/bluetooth_helper': {
+      exports: 'BluetoothHelper'
+    },
+    'shared/device_storage/enumerate_all': {
+      exports: 'enumerateAll'
+    },
+    'shared/homescreens/homescreen_settings': {
+      exports: 'homescreenSettings'
+    },
     'shared/icc_helper': {
       exports: 'IccHelper'
     },
@@ -42,51 +48,38 @@ require.config({
     'shared/lazy_loader': {
       exports: 'LazyLoader'
     },
-    'shared/passcode_helper': {
-      exports: 'PasscodeHelper'
-    },
-    'shared/search_provider': {
-      exports: 'SearchProvider'
-    },
     'shared/manifest_helper': {
       exports: 'ManifestHelper'
     },
-    'shared/screen_layout': {
-      exports: 'ScreenLayout'
-    },
-    'shared/settings_url': {
-      exports: 'SettingsURL'
+    'shared/mobile_operator': {
+      exports: 'MobileOperator'
     },
     'shared/omadrm/fl': {
       exports: 'ForwardLock'
     },
-    'shared/settings_listener': {
-      exports: 'SettingsListener'
-    },
-    'shared/toaster': {
-      exports: 'Toaster'
+    'shared/passcode_helper': {
+      exports: 'PasscodeHelper'
     },
     'shared/sanitizer': {
       exports: 'Sanitizer'
     },
-    'shared/sim_settings_helper': {
-      exports: 'SimSettingsHelper'
+    'shared/screen_layout': {
+      exports: 'ScreenLayout'
+    },
+    'shared/search_provider': {
+      exports: 'SearchProvider'
     },
     'shared/settings_helper': {
       exports: 'SettingsHelper'
     },
-    'shared/tz_select': {
-      exports: 'tzSelect',
-      deps: ['shared/icc_helper']
-    },
-    'shared/uuid': {
-      exports: 'uuid'
+    'shared/settings_listener': {
+      exports: 'SettingsListener'
     },
-    'shared/wifi_helper': {
-      exports: 'WifiHelper'
+    'shared/settings_url': {
+      exports: 'SettingsURL'
     },
-    'shared/bluetooth_helper': {
-      exports: 'BluetoothHelper'
+    'shared/sim_settings_helper': {
+      exports: 'SimSettingsHelper'
     },
     'shared/simslot': {
       exports: 'SIMSlot'
@@ -95,23 +88,27 @@ require.config({
       exports: 'SIMSlotManager',
       deps: ['shared/simslot']
     },
-    'shared/mobile_operator': {
-      exports: 'MobileOperator'
+    'shared/stk_helper': {
+      exports: 'STKHelper'
     },
-    'utils': {
-      exports: ''
+    'shared/toaster': {
+      exports: 'Toaster'
     },
-    'shared/device_storage/enumerate_all': {
-      exports: 'enumerateAll'
+    'shared/tz_select': {
+      exports: 'tzSelect',
+      deps: ['shared/icc_helper']
     },
-    'shared/airplane_mode_helper': {
-      exports: 'AirplaneModeHelper'
+    'shared/uuid': {
+      exports: 'uuid'
     },
-    'shared/homescreens/homescreen_settings': {
-      exports: 'homescreenSettings'
+    'shared/wifi_helper': {
+      exports: 'WifiHelper'
     },
-    'shared/stk_helper': {
-      exports: 'STKHelper'
+    'utils': {
+      exports: ''
+    },
+    'vendor/jszip': {
+      exports: 'JSZip'
     }
   },
   // exclude reusable file in modules