Permalink
Browse files

Fixed Yaml comments parsing on Windows.

  • Loading branch information...
1 parent 2ba3054 commit c94ba1328aa42624eae8c7ae9348080b7a958188 Goal Smashers Dev Team committed Aug 7, 2012
Showing with 2 additions and 1 deletion.
  1. +1 −0 test/assets/assets.yml
  2. +1 −1 vendor/yaml.js
@@ -1,3 +1,4 @@
+# Comment (just to test that parsing them works)
stylesheets:
desktop/public1: 'asset3,asset2,*,folder1/subfolder1/*'
desktop/public2:
View
@@ -36,7 +36,7 @@ function context(str) {
*/
var tokens = [
- ['comment', /^#[^\n]*/],
+ ['comment', isWindows ? /^#[^\r\n]*/ : /^#[^\n]*/],
['indent', isWindows ? /^\r\n( *)/ : /^\n( *)/],
['space', /^ +/],
['empty', isWindows ? /^\r\n$/ : /^\n$/],

0 comments on commit c94ba13

Please sign in to comment.