Switched js-yaml to yaml.js

This commit is contained in:
benweet 2013-10-07 01:17:21 +01:00
parent 2908145c67
commit 56f13eb8f3
5 changed files with 70435 additions and 30869 deletions

View File

@ -24,12 +24,11 @@
"crel": "git@github.com:KoryNunn/crel.git#8dbda04b129fc0aec01a2a080d1cab26816e11c1",
"waitForImages": "git@github.com:alexanderdickson/waitForImages.git#~1.4.2",
"to-markdown": "git@github.com:benweet/to-markdown.git#jquery",
"js-yaml": "~2.1.0",
"Typo.js": "git@github.com:cfinke/Typo.js.git",
"xregexp": "d06eff50f87d81d2dd3afc1e854784c38b17bcc4"
"xregexp": "d06eff50f87d81d2dd3afc1e854784c38b17bcc4",
"yaml.js": "git@github.com:jeremyfa/yaml.js.git#~0.1.4"
},
"resolutions": {
"jquery": "2.0.3",
"pagedown-extra": "cca554948c362affb1cbab3bacc3861e2d90d426"
"jquery": "2.0.3"
}
}

View File

@ -1,5 +1,5 @@
CACHE MANIFEST
#Date Sun Oct 06 2013 23:25:00
#Date Mon Oct 07 2013 01:13:17
CACHE:
index.html

File diff suppressed because one or more lines are too long

View File

@ -1,7 +1,7 @@
define([
"classes/Extension",
"js-yaml",
], function(Extension, yamlFrontMatterParserSettingsBlock) {
"yaml-js",
], function(Extension, YAML) {
var yamlFrontMatterParser = new Extension("yamlFrontMatterParser", "YAML front matter");
@ -25,7 +25,7 @@ define([
if ((yaml = results[2]) && (!fileDesc.frontMatter || fileDesc.frontMatter._yaml != yaml)) {
fileDesc.frontMatter = undefined;
try {
fileDesc.frontMatter = jsyaml.load(yaml);
fileDesc.frontMatter = YAML.parse(yaml);
fileDesc.frontMatter._yaml = yaml;
}
catch (e) {}

View File

@ -51,12 +51,14 @@ requirejs.config({
'pagedown-extra': 'bower-libs/pagedown-extra/Markdown.Extra',
'ace/requirejs/text': 'libs/ace_text',
'ace/commands/default_commands': 'libs/ace_commands',
'js-yaml': 'bower-libs/js-yaml/js-yaml',
'require-css': 'bower-libs/require-css/css',
Typo: 'bower-libs/Typo.js',
'typo-js': 'bower-libs/Typo.js/typo/typo',
xregexp: 'bower-libs/xregexp/xregexp-all',
'Typo.js': 'bower-libs/Typo.js'
'Typo.js': 'bower-libs/Typo.js',
yaml: 'bower-libs/yaml.js',
'yaml.js': 'bower-libs/yaml.js',
'yaml-js': 'bower-libs/yaml.js/bin/yaml'
},
shim: {
underscore: {
@ -77,6 +79,9 @@ requirejs.config({
'typo-js': {
exports: 'Typo'
},
'yaml-js': {
exports: 'YAML'
},
'bootstrap-record': [
'mousetrap'
],