aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-02-02 12:38:29 -0800
committerAnanya Sen2012-02-02 12:38:29 -0800
commite806afea0eb1b66ac457471983db0e3d5942d222 (patch)
treed2b712293dc0c8b5f6d9dfe77f7b7eebfd62ac7c
parent0e595c4e11ce9b44eff157de8616ed15fcd5d6fc (diff)
parent33e655cbbb0816340c5a2e5d5cc0a6b0c7d9f53c (diff)
downloadninja-e806afea0eb1b66ac457471983db0e3d5942d222.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Diffstat
-rw-r--r--document-templates/files/template.css3
-rw-r--r--document-templates/files/template.html18
-rw-r--r--document-templates/files/template.js3
-rw-r--r--document-templates/files/template.xml1
-rw-r--r--document-templates/projects/montage/index.html16
-rw-r--r--document-templates/projects/montage/package.json8
-rw-r--r--document-templates/projects/montage/styles.css0
-rwxr-xr-xindex.html56
-rwxr-xr-xjs/io/system/coreioapi.js1
-rwxr-xr-xjs/io/system/fileio.js22
-rwxr-xr-xjs/io/system/filesystem.js715
-rwxr-xr-xjs/io/system/projectio.js70
-rw-r--r--js/io/templates/descriptor.json51
-rwxr-xr-xjs/io/templates/files/_bin/template.css0
-rwxr-xr-xjs/io/templates/files/_bin/template.html0
-rwxr-xr-xjs/io/templates/files/_bin/template.js0
-rwxr-xr-xjs/io/templates/files/_bin/template.json0
-rwxr-xr-xjs/io/templates/files/_bin/template.php0
-rwxr-xr-xjs/io/templates/files/_bin/template.pl0
-rwxr-xr-xjs/io/templates/files/_bin/template.py0
-rwxr-xr-xjs/io/templates/files/_bin/template.rb0
-rwxr-xr-xjs/io/templates/files/_bin/template.xml0
-rwxr-xr-xjs/io/templates/files/_bin/xml.txt0
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.html2
-rwxr-xr-xjs/io/ui/cloudpopup.reel/cloudpopup.js15
-rw-r--r--js/io/ui/cloudpopup.reel/css/cloudpopup.css13
-rwxr-xr-xjs/io/ui/cloudpopup.reel/css/cloudpopup.scss1
-rw-r--r--js/mediators/io-mediator.js27
-rw-r--r--ninja.appcache18
29 files changed, 169 insertions, 871 deletions
diff --git a/document-templates/files/template.css b/document-templates/files/template.css
deleted file mode 100644
index f5bb9e48..00000000
--- a/document-templates/files/template.css
+++ /dev/null
@@ -1,3 +0,0 @@
1@charset "UTF-8";
2/*Created with Ninja by Motorola Mobility*/
3
diff --git a/document-templates/files/template.html b/document-templates/files/template.html
deleted file mode 100644
index 974ca5ed..00000000
--- a/document-templates/files/template.html
+++ /dev/null
@@ -1,18 +0,0 @@
1<!DOCTYPE html>
2<html lang="en">
3
4 <head>
5
6 <meta charset="utf-8">
7
8 <meta name="generator" content="Motorola Mobility Ninja" />
9
10 <title>Untitled</title>
11
12 </head>
13
14 <body>
15
16 </body>
17
18</html> \ No newline at end of file
diff --git a/document-templates/files/template.js b/document-templates/files/template.js
deleted file mode 100644
index 15b3b9df..00000000
--- a/document-templates/files/template.js
+++ /dev/null
@@ -1,3 +0,0 @@
1/*
2** Created with Ninja by Motorola Mobility
3*/
diff --git a/document-templates/files/template.xml b/document-templates/files/template.xml
deleted file mode 100644
index 1f0b1a77..00000000
--- a/document-templates/files/template.xml
+++ /dev/null
@@ -1 +0,0 @@
1<!-- Created with Ninja by Motorola Mobility --> \ No newline at end of file
diff --git a/document-templates/projects/montage/index.html b/document-templates/projects/montage/index.html
deleted file mode 100644
index 422a7fb6..00000000
--- a/document-templates/projects/montage/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
1<!DOCTYPE html>
2<html>
3
4 <head>
5
6 <title>Untitled</title>
7
8 <link rel="stylesheet" type="text/css" href="styles.css" />
9
10 <script type="text/javascript" data-package="." src="m-js/lib/montage.js"></script>
11
12 </head>
13
14 <body></body>
15
16</html> \ No newline at end of file
diff --git a/document-templates/projects/montage/package.json b/document-templates/projects/montage/package.json
deleted file mode 100644
index 2349ff2f..00000000
--- a/document-templates/projects/montage/package.json
+++ /dev/null
@@ -1,8 +0,0 @@
1{
2 "directories": {
3 "lib": ""
4 },
5 "mappings": {
6 "montage": "m-js/"
7 }
8} \ No newline at end of file
diff --git a/document-templates/projects/montage/styles.css b/document-templates/projects/montage/styles.css
deleted file mode 100644
index e69de29b..00000000
--- a/document-templates/projects/montage/styles.css
+++ /dev/null
diff --git a/index.html b/index.html
index 9ee3e381..2fbf524a 100755
--- a/index.html
+++ b/index.html
@@ -4,7 +4,7 @@
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. 5 (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
6 </copyright> --> 6 </copyright> -->
7<!-- <html manifest="ninja.appcache"> --> 7
8<html> 8<html>
9 9
10 <head lang="en"> 10 <head lang="en">
@@ -44,13 +44,7 @@
44 background-size: auto, 115%; 44 background-size: auto, 115%;
45 background-color: rgba(150, 0, 0, 1); 45 background-color: rgba(150, 0, 0, 1);
46 background-position: center center; 46 background-position: center center;
47 background-repeat: no-repeat;/* 47 background-repeat: no-repeat;
48
49 -webkit-animation-name: background-animation;
50 -webkit-animation-duration: 3s;
51 -webkit-animation-iteration-count: infinite;
52 -webkit-animation-timing-function: linear;
53*/
54 } 48 }
55 49
56 .montage-app-loaded body 50 .montage-app-loaded body
@@ -81,10 +75,6 @@
81 left: 50%; 75 left: 50%;
82 margin: -160px 0px 0px -160px; 76 margin: -160px 0px 0px -160px;
83 overflow: visible; 77 overflow: visible;
84 -webkit-animation-name: zoom;
85 -webkit-animation-duration: 3s;
86 -webkit-animation-iteration-count: infinite;
87 -webkit-animation-timing-function: ease-in-out;
88 } 78 }
89 79
90 #ninja_logo .gradient 80 #ninja_logo .gradient
@@ -118,51 +108,13 @@
118 border-radius: 50%; 108 border-radius: 50%;
119 position: absolute; 109 position: absolute;
120 top: 0px; 110 top: 0px;
121 left: 0px;/* 111 left: 0px;
122
123 -webkit-animation-name: solid-animation;
124 -webkit-animation-duration: 3s;
125 -webkit-animation-iteration-count: infinite;
126 -webkit-animation-timing-function: linear;
127*/
128 } 112 }
129 113
130 #ninja_logo canvas 114 #ninja_logo canvas
131 { 115 {
132 position: absolute; 116 position: absolute;
133 margin: -45px -110px;/* 117 margin: -45px -110px;
134
135 -webkit-animation-name: rotate;
136 -webkit-animation-duration: 1.5s;
137 -webkit-animation-iteration-count: infinite;
138 -webkit-animation-timing-function: linear;
139*/
140 }
141
142 @-webkit-keyframes solid-animation {
143 0% {background: #000;}
144 50% {background: #666;}
145 100% {background: #000;}
146 }
147
148 @-webkit-keyframes background-animation {
149 0% {background-size: 200%}
150 50% {background-size: 100%}
151 100% {background-size: 200%}
152 }
153
154 @-webkit-keyframes rotate {
155 0% {-webkit-transform: rotate(0deg); margin: -45px -110px;}
156 25% {-webkit-transform: rotate(90deg); margin: -90px -55px;}
157 50% {-webkit-transform: rotate(180deg); margin: -55px 0px;}
158 75% {-webkit-transform: rotate(270deg); margin: 0px -55px;}
159 100% {-webkit-transform: rotate(360deg); margin: -45px -110px;}
160 }
161
162 @-webkit-keyframes zoom {
163 0% {-webkit-transform: scale(.9);}
164 50% {-webkit-transform: scale(.5);}
165 100% {-webkit-transform: scale(.9);}
166 } 118 }
167 119
168 </style> 120 </style>
diff --git a/js/io/system/coreioapi.js b/js/io/system/coreioapi.js
index 7839acee..f4ab56b6 100755
--- a/js/io/system/coreioapi.js
+++ b/js/io/system/coreioapi.js
@@ -207,7 +207,6 @@ exports.CoreIoApi = Montage.create(Component, {
207 directoryServiceURL: { 207 directoryServiceURL: {
208 enumerable: false, 208 enumerable: false,
209 get: function() { 209 get: function() {
210 console.log(this);
211 return String(this.rootUrl+this._directoryServiceURL); 210 return String(this.rootUrl+this._directoryServiceURL);
212 }, 211 },
213 set: function(value) { 212 set: function(value) {
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js
index ac5812e9..f40aa96b 100755
--- a/js/io/system/fileio.js
+++ b/js/io/system/fileio.js
@@ -11,7 +11,7 @@ NOTES:
11 empty file will be created. 'contents' should be a string to be saved 11 empty file will be created. 'contents' should be a string to be saved
12 as the file. 'contentType' is the mime type of the file. 12 as the file. 'contentType' is the mime type of the file.
13 13
14 coreIoApi: this.application.ninja.coreIoApi 14 Core API reference in NINJA: this.application.ninja.coreIoApi
15