Bug 1211767 - [smart-system] Use the same naming for Firefox Account …

…files as the ones in apps/system
mozilla-b2g · Oct 6, 2015 · e264322 · e264322
1 parent 8c58d62
commit e264322
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/tv_apps/smart-system/fxa/js/fxam_server_request.js b/tv_apps/smart-system/fxa/js/fxam_server_request.js
@@ -28,7 +28,7 @@
   }
 
   function _ensureFxaClient(callback) {
-    window.parent.LazyLoader.load('../js/fxa_client.js', function() {
+    window.parent.LazyLoader.load('../js/fx_accounts_client.js', function() {
       callback && callback();
     });
   }

diff --git a/tv_apps/smart-system/index.html b/tv_apps/smart-system/index.html
@@ -343,8 +343,8 @@
 
     <!-- Firefox Accounts -->
     <link rel="stylesheet" type="text/css" href="style/firefox_account/firefox_account_container.css">
-    <script defer src="js/fxa_ui.js"></script>
-    <script defer src="js/fxa_manager.js"></script>
+    <script defer src="js/fx_accounts_u_i.js"></script>
+    <script defer src="js/fx_accounts_manager.js"></script>
 
     <!-- App Usage Metrics -->
     <script defer src="js/app_usage_metrics.js"></script>

diff --git a/tv_apps/smart-system/js/fxa_client.js → ...pps/smart-system/js/fx_accounts_client.js b/tv_apps/smart-system/js/fxa_client.js → ...pps/smart-system/js/fx_accounts_client.js
diff --git a/tv_apps/smart-system/js/fxa_manager.js → ...ps/smart-system/js/fx_accounts_manager.js b/tv_apps/smart-system/js/fxa_manager.js → ...ps/smart-system/js/fx_accounts_manager.js
@@ -81,7 +81,7 @@ var FxAccountsManager = {
       case 'logout':
       case 'resendVerificationEmail':
         (function(methodName) {
-          LazyLoader.load('js/fxa_client.js', function() {
+          LazyLoader.load('js/fx_accounts_client.js', function() {
             FxAccountsClient[methodName](function(data) {
               self.sendPortMessage({ methodName: methodName, data: data });
             }, function(error) {

diff --git a/tv_apps/smart-system/js/fxa_ui.js → tv_apps/smart-system/js/fx_accounts_u_i.js b/tv_apps/smart-system/js/fxa_ui.js → tv_apps/smart-system/js/fx_accounts_u_i.js
diff --git a/...smart-system/test/unit/fxa_client_test.js → ...stem/test/unit/fx_accounts_client_test.js b/...smart-system/test/unit/fxa_client_test.js → ...stem/test/unit/fx_accounts_client_test.js
@@ -1,7 +1,7 @@
 /* global FxAccountsClient */
 'use strict';
 
-requireApp('smart-system/js/fxa_client.js');
+requireApp('smart-system/js/fx_accounts_client.js');
 
 var MockEventListener = {};
 var MockDispatchedEvents = [];