Merge branch 'refs/heads/AnanyaFileIO' into FileIO

Conflicts: js/io/system/fileio.js js/mediators/io-mediator.js
author: Jose Antonio Marquez 2012-02-09 11:18:32 -0800
committer: Jose Antonio Marquez 2012-02-09 11:18:32 -0800
commit: d7e198f5a95011679fa2c536780edbdc533a4893 (patch)
tree: cf0f7b844d466cb7af96f4779ebee505b02bcda2 /js/io/templates
parent: ea6ec16e91740211a517db72f56108a033a521fe (diff)
parent: c9d0cb73698066247c6267bba8fa446a979565fb (diff)
download: ninja-d7e198f5a95011679fa2c536780edbdc533a4893.tar.gz
1 files changed, 9 insertions, 9 deletions
diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json
index f28455fa..20870934 100644
--- a/js/io/templates/descriptor.json
+++ b/js/io/templates/descriptor.json
@@ -6,58 +6,58 @@
                "name":"Blank File",
                "uri":"/",
                "type":"directory",
-                "children":["files/html.txt", "files/js.txt", "files/css.txt", "files/json.txt", "files/php.txt", "files/pl.txt", "files/py.txt", "files/rb.txt"]
+        "children":["/js/io/templates/files/html.txt", "/js/io/templates/files/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"]
        },
-        "files/html.txt":{
+        "/js/io/templates/files/html.txt":{
                "name":"HTML",
                "uri":"/js/io/templates/files/html.txt",
                "type":"file",
        "fileExtension":".html",
        "children":["defaultTemplate"]
        },
-        "files/js.txt":{
+        "/js/io/templates/files/files/js.txt":{
                "name":"JavaScript",
                "uri":"/js/io/templates/files/files/js.txt",
                "type":"file",
        "fileExtension":".js",
        "children":["defaultTemplate"]
        },
-        "files/css.txt":{
+        "/js/io/templates/files/css.txt":{
                "name":"Cascading Style Sheets",
                "uri":"/js/io/templates/files/css.txt",
                "type":"file",
        "fileExtension":".css",
        "children":["defaultTemplate"]
        },
-        "files/json.txt":{
+        "/js/io/templates/files/json.txt":{
                "name":"JSON",
                "uri":"/js/io/templates/files/json.txt",
                "type":"file",
        "fileExtension":".json",
        "children":["defaultTemplate"]
        },
-        "files/php.txt":{
+        "/js/io/templates/files/php.txt":{
                "name":"PHP",
                "uri":"/js/io/templates/files/php.txt",
                "type":"file",
        "fileExtension":".php",
        "children":["defaultTemplate"]
        },
-        "files/pl.txt":{
+        "/js/io/templates/files/pl.txt":{
                "name":"Perl",
                "uri":"/js/io/templates/files/pl.txt",
                "type":"file",
        "fileExtension":".pl",
        "children":["defaultTemplate"]
        },
-        "files/py.txt":{
+        "/js/io/templates/files/py.txt":{
                "name":"Python",
                "uri":"/js/io/templates/files/py.txt",
                "type":"file",
        "fileExtension":".py",
        "children":["defaultTemplate"]
        },
-        "files/rb.txt":{
+        "/js/io/templates/files/rb.txt":{
                "name":"Ruby",
                "uri":"/js/io/templates/files/rb.txt",
                "type":"file",
author	Jose Antonio Marquez	2012-02-09 11:18:32 -0800
committer	Jose Antonio Marquez	2012-02-09 11:18:32 -0800
commit	d7e198f5a95011679fa2c536780edbdc533a4893 (patch)
tree	cf0f7b844d466cb7af96f4779ebee505b02bcda2 /js/io/templates
parent	ea6ec16e91740211a517db72f56108a033a521fe (diff)
parent	c9d0cb73698066247c6267bba8fa446a979565fb (diff)
download	ninja-d7e198f5a95011679fa2c536780edbdc533a4893.tar.gz

diff --git a/js/io/templates/descriptor.json b/js/io/templates/descriptor.json index f28455fa..20870934 100644 --- a/js/io/templates/descriptor.json +++ b/js/io/templates/descriptor.json
@@ -6,58 +6,58 @@
6	"name":"Blank File",	6	"name":"Blank File",
7	"uri":"/",	7	"uri":"/",
8	"type":"directory",	8	"type":"directory",
9	"children":["files/html.txt", "files/js.txt", "files/css.txt", "files/json.txt", "files/php.txt", "files/pl.txt", "files/py.txt", "files/rb.txt"]	9	"children":["/js/io/templates/files/html.txt", "/js/io/templates/files/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"]
10	},	10	},
11	"files/html.txt":{	11	"/js/io/templates/files/html.txt":{
12	"name":"HTML",	12	"name":"HTML",
13	"uri":"/js/io/templates/files/html.txt",	13	"uri":"/js/io/templates/files/html.txt",
14	"type":"file",	14	"type":"file",
15	"fileExtension":".html",	15	"fileExtension":".html",
16	"children":["defaultTemplate"]	16	"children":["defaultTemplate"]
17	},	17	},
18	"files/js.txt":{	18	"/js/io/templates/files/files/js.txt":{
19	"name":"JavaScript",	19	"name":"JavaScript",
20	"uri":"/js/io/templates/files/files/js.txt",	20	"uri":"/js/io/templates/files/files/js.txt",
21	"type":"file",	21	"type":"file",
22	"fileExtension":".js",	22	"fileExtension":".js",
23	"children":["defaultTemplate"]	23	"children":["defaultTemplate"]
24	},	24	},
25	"files/css.txt":{	25	"/js/io/templates/files/css.txt":{
26	"name":"Cascading Style Sheets",	26	"name":"Cascading Style Sheets",
27	"uri":"/js/io/templates/files/css.txt",	27	"uri":"/js/io/templates/files/css.txt",
28	"type":"file",	28	"type":"file",
29	"fileExtension":".css",	29	"fileExtension":".css",
30	"children":["defaultTemplate"]	30	"children":["defaultTemplate"]
31	},	31	},
32	"files/json.txt":{	32	"/js/io/templates/files/json.txt":{
33	"name":"JSON",	33	"name":"JSON",
34	"uri":"/js/io/templates/files/json.txt",	34	"uri":"/js/io/templates/files/json.txt",
35	"type":"file",	35	"type":"file",
36	"fileExtension":".json",	36	"fileExtension":".json",
37	"children":["defaultTemplate"]	37	"children":["defaultTemplate"]
38	},	38	},
39	"files/php.txt":{	39	"/js/io/templates/files/php.txt":{
40	"name":"PHP",	40	"name":"PHP",
41	"uri":"/js/io/templates/files/php.txt",	41	"uri":"/js/io/templates/files/php.txt",
42	"type":"file",	42	"type":"file",
43	"fileExtension":".php",	43	"fileExtension":".php",
44	"children":["defaultTemplate"]	44	"children":["defaultTemplate"]
45	},	45	},
46	"files/pl.txt":{	46	"/js/io/templates/files/pl.txt":{
47	"name":"Perl",	47	"name":"Perl",
48	"uri":"/js/io/templates/files/pl.txt",	48	"uri":"/js/io/templates/files/pl.txt",
49	"type":"file",	49	"type":"file",
50	"fileExtension":".pl",	50	"fileExtension":".pl",
51	"children":["defaultTemplate"]	51	"children":["defaultTemplate"]
52	},	52	},
53	"files/py.txt":{	53	"/js/io/templates/files/py.txt":{
54	"name":"Python",	54	"name":"Python",
55	"uri":"/js/io/templates/files/py.txt",	55	"uri":"/js/io/templates/files/py.txt",
56	"type":"file",	56	"type":"file",
57	"fileExtension":".py",	57	"fileExtension":".py",
58	"children":["defaultTemplate"]	58	"children":["defaultTemplate"]
59	},	59	},
60	"files/rb.txt":{	60	"/js/io/templates/files/rb.txt":{
61	"name":"Ruby",	61	"name":"Ruby",
62	"uri":"/js/io/templates/files/rb.txt",	62	"uri":"/js/io/templates/files/rb.txt",
63	"type":"file",	63	"type":"file",