diff options
author | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-05-04 14:54:35 -0700 |
commit | ce2d581894f9e433a7b73e4b622352a657b6ddaa (patch) | |
tree | bbd4eb9f6d00ee9d3c0bcc53ce560cfc1e71127b /js/io/system/fileio.js | |
parent | 8f8f7f9a36fb9abadea2a9f25aef0084946bebc9 (diff) | |
parent | 8dcbac5d4c30e9dfbc543a5f997939111e9c9f89 (diff) | |
download | ninja-ce2d581894f9e433a7b73e4b622352a657b6ddaa.tar.gz |
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Conflicts:
js/document/templates/montage-web/default_html.css
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/io/system/fileio.js')
-rwxr-xr-x | js/io/system/fileio.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/io/system/fileio.js b/js/io/system/fileio.js index f78ad173..1680ca7f 100755 --- a/js/io/system/fileio.js +++ b/js/io/system/fileio.js | |||
@@ -146,7 +146,7 @@ exports.FileIo = Montage.create(Component, { | |||
146 | } | 146 | } |
147 | }, | 147 | }, |
148 | //////////////////////////////////////////////////////////////////// | 148 | //////////////////////////////////////////////////////////////////// |
149 | // | 149 | //TODO: Add functionality |
150 | deleteFile: { | 150 | deleteFile: { |
151 | enumerable: true, | 151 | enumerable: true, |
152 | value: function() { | 152 | value: function() { |
@@ -159,7 +159,7 @@ exports.FileIo = Montage.create(Component, { | |||
159 | } | 159 | } |
160 | }, | 160 | }, |
161 | //////////////////////////////////////////////////////////////////// | 161 | //////////////////////////////////////////////////////////////////// |
162 | // | 162 | //TODO: Add functionality |
163 | copyFile: { | 163 | copyFile: { |
164 | enumerable: true, | 164 | enumerable: true, |
165 | value: function() { | 165 | value: function() { |