[Pkg-javascript-commits] [uglifyjs] 20/77: using the original sourcemap as the base

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to tag v2.4.18
in repository uglifyjs.

commit ad18689d926d25c7a25b95c630c2ad05b7b5f5b5
Author: Caridy Patino <caridy at gmail.com>
Date:   Tue Nov 11 14:38:01 2014 -0500

    using the original sourcemap as the base
    
    * Creates a new SourceMapGenerator based on a SourceMapConsumer:
      https://github.com/mozilla/source-map#sourcemapgeneratorfromsourcemapsourcemapconsumer
---
 lib/sourcemap.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/sourcemap.js b/lib/sourcemap.js
index 948e3b3..3998e40 100644
--- a/lib/sourcemap.js
+++ b/lib/sourcemap.js
@@ -53,11 +53,16 @@ function SourceMap(options) {
         orig_line_diff : 0,
         dest_line_diff : 0,
     });
-    var generator = new MOZ_SourceMap.SourceMapGenerator({
-        file       : options.file,
-        sourceRoot : options.root
-    });
     var orig_map = options.orig && new MOZ_SourceMap.SourceMapConsumer(options.orig);
+    var generator;
+    if (orig_map) {
+      generator = MOZ_SourceMap.SourceMapGenerator.fromSourceMap(orig_map);
+    } else {
+        generator = new MOZ_SourceMap.SourceMapGenerator({
+            file       : options.file,
+            sourceRoot : options.root
+        });
+    }
     function add(source, gen_line, gen_col, orig_line, orig_col, name) {
         if (orig_map) {
             var info = orig_map.originalPositionFor({
@@ -78,7 +83,7 @@ function SourceMap(options) {
             source    : source,
             name      : name
         });
-    };
+    }
     return {
         add        : add,
         get        : function() { return generator },

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/uglifyjs.git