Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 370a1383acde
Choose a base ref
...
head repository: opal/opal
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2bd3ed4d007c
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 1, 2014

  1. Update sourcemap gem

    @elia
    elia committed Oct 1, 2014

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    26e7760 View commit details

  2. Backport maccman/sourcemap#13

    @elia
    elia committed Oct 1, 2014

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    2bd3ed4 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 opal.gemspec
  2. +1 −1 stdlib/source_map/map.rb
2 changes: 1 addition & 1 deletion opal.gemspec
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
s.require_paths = ['lib']

s.add_dependency 'sourcemap', '~> 0.0.2'
s.add_dependency 'sourcemap', '~> 0.1.0'
s.add_dependency 'sprockets', '~> 2.12.1'
s.add_dependency 'hike', '~> 1.2'
s.add_dependency 'tilt', '~> 1.4'
2 changes: 1 addition & 1 deletion stdlib/source_map/map.rb
View file
Original file line number Diff line number Diff line change
@@ -193,7 +193,7 @@ def build_vlq_string
sources_index = Hash[sources.each_with_index.to_a]
names_index = Hash[names.each_with_index.to_a]

ary = (1..by_lines.keys.max).map do |line|
ary = (1..(by_lines.keys.max || 1)).map do |line|
generated_column = 0

(by_lines[line] || []).map do |mapping|