Merge pull request #7111 from fabi1cazenave/camera-shared-stuff

bug 823540: use absolute URLs for the shared resources in the Camera app, r=ochameau

Makefile

@@ -230,7 +230,6 @@ webapp-zip: stamp-commit-hash install-xulrunner-sdk
 ifneq ($(DEBUG),1)
 	@rm -rf apps/system/camera
 	@cp -r apps/camera apps/system/camera
-	@cat apps/camera/index.html | sed -e 's:shared/:../shared/:' > apps/system/camera/index.html
 	@rm apps/system/camera/manifest.webapp
 	@mkdir -p profile/webapps
 	@$(call run-js-command, webapp-zip)

apps/camera/index.html

@@ -5,7 +5,7 @@
     <meta http-equiv="pragma" content="no-cache">
     <title>Camera</title>
     <link rel="resource" type="application/l10n" href="locales/locales.ini" />
-    <link rel="resource" type="application/l10n" href="shared/locales/date.ini" />
+    <link rel="resource" type="application/l10n" href="/shared/locales/date.ini" />
     <link type="text/css" rel="stylesheet" href="style/camera.css"/>
     <link type="text/css" rel="stylesheet" href="style/filmstrip.css"/>
     <link type="text/css" rel="stylesheet" href="style/VideoPlayer.css"/>
@@ -51,15 +51,15 @@ <h1 id="overlay-title"></h1>
       </footer>  
     </div>
 
-    <script type="text/javascript" src="shared/js/l10n.js"></script>
-    <script type="text/javascript" src="shared/js/l10n_date.js"></script>
-    <script type="text/javascript" src="shared/js/async_storage.js"></script>
-    <script type="text/javascript" src="shared/js/blobview.js"></script>
-    <script type="text/javascript" src="shared/js/media/jpeg_metadata_parser.js"></script>
-    <script type="text/javascript" src="shared/js/media/get_video_rotation.js"></script>
-    <script type="text/javascript" src="shared/js/media/video_player.js"></script>
-    <script type="text/javascript" src="shared/js/media/media_frame.js"></script>
-    <script type="text/javascript" src="shared/js/gesture_detector.js"></script>
+    <script type="text/javascript" src="/shared/js/l10n.js"></script>
+    <script type="text/javascript" src="/shared/js/l10n_date.js"></script>
+    <script type="text/javascript" src="/shared/js/async_storage.js"></script>
+    <script type="text/javascript" src="/shared/js/blobview.js"></script>
+    <script type="text/javascript" src="/shared/js/media/jpeg_metadata_parser.js"></script>
+    <script type="text/javascript" src="/shared/js/media/get_video_rotation.js"></script>
+    <script type="text/javascript" src="/shared/js/media/video_player.js"></script>
+    <script type="text/javascript" src="/shared/js/media/media_frame.js"></script>
+    <script type="text/javascript" src="/shared/js/gesture_detector.js"></script>
     <script type="text/javascript" src="js/camera.js"></script>
     <script type="text/javascript" src="js/filmstrip.js"></script>
   </body>