Commit ac1f297a authored by David's avatar David Committed by Commit Bot

CrOS Media App: Update app.html script import order.

With cl/343193875 app_main.js reads window.loadTimeData. Re-order
our imports so window.loadTimeData always exists before we try
read it (see the chat thread from
https://buganizer.corp.google.com/issues/172985712#comment5)

Note: this needs to land before cl/343193875.

Bug: b/172985712
Change-Id: I884426062c255470a226d75a2d479ce858a2c11d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2548582Reviewed-by: default avatarDavid Lei <dlei@google.com>
Reviewed-by: default avatarRachel Carpenter <carpenterr@chromium.org>
Commit-Queue: David Lei <dlei@google.com>
Commit-Queue: Rachel Carpenter <carpenterr@chromium.org>
Auto-Submit: David Lei <dlei@google.com>
Cr-Commit-Position: refs/heads/master@{#829076}
parent cb7c958b
...@@ -11,11 +11,14 @@ ...@@ -11,11 +11,14 @@
} }
</style> </style>
<script src="/js/app_main.js"></script> <!-- Order is important for these files since "app_main.js" reads from
`window.loadTimeData`. -->
<script src="/media_app_app_scripts.js"></script> <script src="/media_app_app_scripts.js"></script>
<!-- Populates `window.loadTimeData`, needs to be after <!-- Populates `window.loadTimeData`, needs to be after
"media_app_app_scripts.js" which loads "load_time_data.js" --> "media_app_app_scripts.js" which loads "load_time_data.js" -->
<script src="/strings.js"></script> <script src="/strings.js"></script>
<script src="/js/app_main.js"></script>
</html> </html>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment