Fix CRLF issues when building on Windows.
This commit is contained in:
parent
7c93cf3b86
commit
3cd715273a
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -1,6 +1,8 @@
|
|||||||
# Auto detect text files and perform LF normalization
|
# Auto detect text files and perform LF normalization
|
||||||
* text=auto
|
* text=auto
|
||||||
|
|
||||||
|
builds/* -text
|
||||||
|
|
||||||
# Custom for Visual Studio
|
# Custom for Visual Studio
|
||||||
*.cs diff=csharp
|
*.cs diff=csharp
|
||||||
*.sln merge=union
|
*.sln merge=union
|
||||||
|
|||||||
@ -2,7 +2,7 @@ module.exports = (grunt) ->
|
|||||||
grunt.util.linefeed = '\n'
|
grunt.util.linefeed = '\n'
|
||||||
|
|
||||||
importHTML = (filename) ->
|
importHTML = (filename) ->
|
||||||
"(innerHTML: #{JSON.stringify grunt.file.read("src/General/html/#{filename}.html").replace(/^\s+|\s+$</gm, '').replace(/\n/g, '')})"
|
"(innerHTML: #{JSON.stringify grunt.file.read("src/General/html/#{filename}.html").replace(/^ +| +$</gm, '').replace(/\r?\n/g, '')})"
|
||||||
|
|
||||||
html = (template) ->
|
html = (template) ->
|
||||||
parts = template.split /([\$&@]){([^}`]*)}/
|
parts = template.split /([\$&@]){([^}`]*)}/
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user