Merge lp:~hatch/juju-gui/sourcemap-1248654 into lp:juju-gui/experimental

[Jeff Pihach]

Switch to new sourcemap syntax

The //@ syntax for source maps now causes IE10 to throw
an error. This branch switches to the new //# syntax which
works as expected across Chrome/FF/IE10.

https://codereview.appspot.com/22450044/

[Jeff Pihach (hatch)]

Reviewers: mp+194220_code.launchpad.net,

Message:
Please take a look.

Description:
Switch to new sourcemap syntax

The //@ syntax for source maps now causes IE10 to throw
an error. This branch switches to the new //# syntax which
works as expected across Chrome/FF/IE10.

To QA:
Make and open in chrome, you should see the source as usual.
Open in IE it should not throw two alert errors on load.

https://code.launchpad.net/~hatch/juju-gui/sourcemap-1248654/+merge/194220

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/22450044/

Affected files (+3, -1 lines):
   A [revision details]
   M lib/merge-files.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: lib/merge-files.js
=== modified file 'lib/merge-files.js'
--- lib/merge-files.js 2013-09-06 00:26:54 +0000
+++ lib/merge-files.js 2013-11-06 19:56:35 +0000
@@ -66,7 +66,7 @@
      });
      // The uglifyjs script does this instead of the library, so we have to
do
      // it ourselves since we are using uglify as a library and not a
script.
- result.code += '\n//@ sourceMappingURL=' + sourceMapName;
+ result.code += '\n//# sourceMappingURL=' + sourceMapName;
      fs.writeFileSync(outputFile, result.code, 'utf8', throw_error);
      fs.writeFileSync(sourceMapName, result.map, 'utf8', throw_error);
    }

[Madison Scott-Clary (makyo)]

LGTM, QA okay

https://codereview.appspot.com/22450044/

[Jeff Pihach (hatch)]

Thanks for the review!

https://codereview.appspot.com/22450044/

[Jeff Pihach (hatch)]

*** Submitted:

Switch to new sourcemap syntax

The //@ syntax for source maps now causes IE10 to throw
an error. This branch switches to the new //# syntax which
works as expected across Chrome/FF/IE10.

R=matthew.scott
CC=
https://codereview.appspot.com/22450044

https://codereview.appspot.com/22450044/

=== modified file 'lib/merge-files.js'
--- lib/merge-files.js	2013-09-06 00:26:54 +0000
+++ lib/merge-files.js	2013-11-06 20:00:54 +0000
@@ -66,7 +66,7 @@
     });
     // The uglifyjs script does this instead of the library, so we have to do
     // it ourselves since we are using uglify as a library and not a script.
-    result.code += '\n//@ sourceMappingURL=' + sourceMapName;
+    result.code += '\n//# sourceMappingURL=' + sourceMapName;
     fs.writeFileSync(outputFile, result.code, 'utf8', throw_error);
     fs.writeFileSync(sourceMapName, result.map, 'utf8', throw_error);
   }