Merge pull request twbs#12 from yabawock/issue-4

Updated handling of less escaped strings (Closes twbs#4)
DocX · Jul 30, 2013 · 307fa54 · 307fa54
2 parents 368bd4b + c22add4
commit 307fa54
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/tasks/converter.rb b/tasks/converter.rb
@@ -171,8 +171,8 @@ def replace_image_paths(less)
 
   def replace_escaping(less)
     less = less.gsub(/\~"([^"]+)"/, '#{\1}') # Get rid of ~"" escape
-    #less.gsub(/(\W)e\("([^\)]+)"\)/) {|s| "#{$1 if $1 != /\s/}#{$2}"} # Get rid of e escape
-    less.gsub(/(\W)e\(%\((.*)\)\)/, '\1\2') # Get rid of e(%("")) escape
+    less.gsub!(/\${([^}]+)}/, '$\1') # Get rid of @{} escape
+    less.gsub(/(\W)e\(%\("?([^"]*)"?\)\)/, '\1\2') # Get rid of e(%("")) escape
   end
 
   def insert_default_vars(scss)