diff options
author | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-05-22 13:22:26 -0700 |
commit | 01dbc1f329a95bc7e3b93224543d88ad5bdbd315 (patch) | |
tree | ceb527713554f506c537168e36a10452cd09ad10 /js/io/templates/descriptor.json | |
parent | b9262c831952e77135b79c2de7c455d5e7ff0589 (diff) | |
parent | c37a876b373ddc7cb19277aaeaa6bb2d2d5a50ac (diff) | |
download | ninja-01dbc1f329a95bc7e3b93224543d88ad5bdbd315.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/io/templates/descriptor.json')
-rw-r--r-- | js/io/templates/descriptor.json | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json index acc03979..21c4b58c 100644 --- a/js/io/templates/descriptor.json +++ b/js/io/templates/descriptor.json | |||
@@ -6,7 +6,7 @@ | |||
6 | "name":"Blank File", | 6 | "name":"Blank File", |
7 | "uri":"/", | 7 | "uri":"/", |
8 | "type":"directory", | 8 | "type":"directory", |
9 | "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt"] | 9 | "children":["js/io/templates/files/html.txt", "js/io/templates/files/js.txt", "js/io/templates/files/css.txt", "js/io/templates/files/json.txt", "js/io/templates/files/php.txt", "js/io/templates/files/pl.txt", "js/io/templates/files/py.txt", "js/io/templates/files/rb.txt", "js/io/templates/files/xml.txt"] |
10 | }, | 10 | }, |
11 | "js/io/templates/files/html.txt":{ | 11 | "js/io/templates/files/html.txt":{ |
12 | "name":"HTML", | 12 | "name":"HTML", |
@@ -64,6 +64,13 @@ | |||
64 | "fileExtension":".rb", | 64 | "fileExtension":".rb", |
65 | "children":["defaultTemplate"] | 65 | "children":["defaultTemplate"] |
66 | }, | 66 | }, |
67 | "js/io/templates/files/xml.txt":{ | ||
68 | "name":"XML", | ||
69 | "uri":"js/io/templates/files/xml.txt", | ||
70 | "type":"file", | ||
71 | "fileExtension":".xml", | ||
72 | "children":["defaultTemplate"] | ||
73 | }, | ||
67 | "defaultTemplate":{ | 74 | "defaultTemplate":{ |
68 | "name": "Basic", | 75 | "name": "Basic", |
69 | "uri": "defaultTemplate", | 76 | "uri": "defaultTemplate", |