Merge pull request #789 from cvan/fxa-css-locally

mstriemer · mstriemer · commit a0ba8736a1c0 · 2014-11-13T17:14:00.000-06:00
fix FxA migration popup for when HTML is served locally or from real packaged app (bug 1097409)
diff --git a/src/app.html b/src/app.html
@@ -13,7 +13,7 @@
     <link rel="dns-prefetch" href="//firefoxos.persona.org">
     <link rel="dns-prefetch" href="//static.login.persona.org">
   </head>
-  <body data-languages="[&#34;bg&#34;, &#34;bn-BD&#34;, &#34;ca&#34;, &#34;cs&#34;, &#34;da&#34;, &#34;de&#34;, &#34;el&#34;, &#34;en-US&#34;, &#34;es&#34;, &#34;fr&#34;, &#34;ga-IE&#34;, &#34;hr&#34;, &#34;hu&#34;, &#34;it&#34;, &#34;ja&#34;, &#34;ko&#34;, &#34;mk&#34;, &#34;nb-NO&#34;, &#34;nl&#34;, &#34;pl&#34;, &#34;pt-BR&#34;, &#34;ro&#34;, &#34;ru&#34;, &#34;sk&#34;, &#34;sq&#34;, &#34;sr&#34;, &#34;sr-Latn&#34;, &#34;tr&#34;, &#34;zh-CN&#34;, &#34;zh-TW&#34;]">
+  <body data-languages="[&#34;bg&#34;, &#34;bn-BD&#34;, &#34;ca&#34;, &#34;cs&#34;, &#34;da&#34;, &#34;de&#34;, &#34;el&#34;, &#34;en-US&#34;, &#34;es&#34;, &#34;fr&#34;, &#34;ga-IE&#34;, &#34;hr&#34;, &#34;hu&#34;, &#34;it&#34;, &#34;ja&#34;, &#34;ko&#34;, &#34;mk&#34;, &#34;nb-NO&#34;, &#34;nl&#34;, &#34;pl&#34;, &#34;pt-BR&#34;, &#34;ro&#34;, &#34;ru&#34;, &#34;sk&#34;, &#34;sq&#34;, &#34;sr&#34;, &#34;sr-Latn&#34;, &#34;tr&#34;, &#34;zh-CN&#34;, &#34;zh-TW&#34;]" data-local-html>
     <noscript><p>Sorry, you need JavaScript to access the Marketplace.</p></noscript>
 
     <div id="splash-overlay">
diff --git a/src/dev.html b/src/dev.html
@@ -52,7 +52,7 @@
     <link rel="stylesheet" href="/media/css/search.styl.css">
     <link rel="stylesheet" href="/media/css/site-banner.styl.css">
   </head>
-  <body class="overlayed" data-media="">
+  <body class="overlayed" data-media="" data-local-html>
   <!-- If you want to simulate Marketplace website production-like environment, set data-media, data-build-id-js, data-repo and data-languages to non-empty values -->
 
     <noscript><p>Sorry, you need JavaScript to access the Marketplace.</p></noscript>
diff --git a/src/media/js/settings.js b/src/media/js/settings.js
@@ -24,7 +24,8 @@ define('settings', ['l10n', 'settings_local', 'underscore'], function(l10n, sett
         app_name: 'fireplace',
         init_module: 'main',
         default_locale: 'en-US',
-        api_url: 'http://' + window.location.hostname,  // No trailing slash, please.
+        api_url: 'http://' + window.location.hostname,  // No trailing slash, please./
+        local_html: document.body.hasAttribute('data-local-html'),  // Exists or not.
 
         fxa_css_path: '/media/css/fxa.css',
 
diff --git a/src/media/js/views/fxa_popup.js b/src/media/js/views/fxa_popup.js
@@ -22,8 +22,15 @@ define('views/fxa_popup',
     }
 
     return function(builder, args, params) {
-        var cssPath = utils.urlparams(urls.media(settings.fxa_css_path),
-                                      {b: z.body.data('build-id-js')});
+        var cssPath = settings.fxa_css_path;
+
+        // If HTML is being served from the server, prefix the URL with
+        // the media URL.
+        if (!settings.local_html) {
+            cssPath = urls.media(cssPath);
+        }
+
+        cssPath = utils.urlparams(cssPath, {b: z.body.data('build-id-js')});
 
         // Ensure the splash screen stays up.
         z.body.attr('data-page-type', 'standalone-loading');
