diff options
| author | John Mayhew | 2012-05-07 16:30:19 -0700 |
|---|---|---|
| committer | John Mayhew | 2012-05-07 16:30:19 -0700 |
| commit | db4ba95f50148198759dde503ec1c778184d9dbe (patch) | |
| tree | 8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/io/templates | |
| parent | 843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff) | |
| parent | 526e423e4a2734c2b139af23911e912452a4443f (diff) | |
| download | ninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/components/tools-properties/brush-properties.reel/brush-properties.html
js/components/tools-properties/fill-properties.reel/fill-properties.html
js/components/tools-properties/pen-properties.reel/pen-properties.html
js/components/tools-properties/pencil-properties.reel/pencil-properties.html
js/components/tools-properties/selection-properties.reel/selection-properties.html
js/components/tools-properties/shape-properties.reel/shape-properties.html
js/components/tools-properties/tag-properties.reel/tag-properties.html
js/components/tools-properties/text-properties.reel/text-properties.html
Diffstat (limited to 'js/io/templates')
| -rw-r--r-- | js/io/templates/descriptor.json | 9 | ||||
| -rw-r--r-- | js/io/templates/files/xml.txt | 1 |
2 files changed, 9 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", |
diff --git a/js/io/templates/files/xml.txt b/js/io/templates/files/xml.txt new file mode 100644 index 00000000..8906a78b --- /dev/null +++ b/js/io/templates/files/xml.txt | |||
| @@ -0,0 +1 @@ | |||
| <!-- Created with Motorola Mobility Ninja --> \ No newline at end of file | |||