Merge pull request #8829 from crh0716/853420

Bug 853420 - Use absolute path for the optimized js file. r=vingtetun, a=tef+
mozilla-b2g · Apr 1, 2013 · ddb38ac · ddb38ac
2 parents 381103c + 4c1ac1e
commit ddb38ac
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/camera/index.html b/apps/camera/index.html
@@ -18,7 +18,7 @@
     <!-- <script defer src="/shared/js/media/video_player.js"></script> -->
     <!-- <script defer src="/shared/js/media/media_frame.js"></script> -->
     <!-- <script defer src="/shared/js/gesture_detector.js"></script> -->
-    <script defer src="shared/js/lazy_loader.js"></script>
+    <script defer src="/shared/js/lazy_loader.js"></script>
     <script defer src="js/camera.js"></script>
   </head>
   <body>

diff --git a/build/webapp-optimize.js b/build/webapp-optimize.js
@@ -170,7 +170,7 @@ function optimize_aggregateJsResources(doc, webapp, htmlFile) {
 
   // find the absolute root of the app's html file.
   let rootUrl = htmlFile.parent.path;
-  rootUrl = rootUrl.replace(webapp.manifestFile.parent.path, '');
+  rootUrl = rootUrl.replace(webapp.manifestFile.parent.path, '') || '.';
   // the above will yield something like: '', '/facebook/', '/contacts/', etc...
 
   function writeAggregatedScript(config) {