aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnanya Sen2012-01-31 07:00:49 -0800
committerAnanya Sen2012-01-31 07:00:49 -0800
commit61ff730a1897890f71403cbfac4d15269e2d271f (patch)
tree4a2893e935c259ec9fbe9446d64af5172ec6299d
parent906776893138257f96a0530674eda456ca3d817b (diff)
parent6dc03672707a91085954359d82c14bd876f85b12 (diff)
downloadninja-61ff730a1897890f71403cbfac4d15269e2d271f.tar.gz
Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO
Conflicts: _scss/imports/scss/_Stage.scss js/io/system/coreioapi.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
-rw-r--r--.gitignore4
-rw-r--r--_scss/compass_app_log.txt108
-rwxr-xr-x_scss/imports/scss/_Stage.scss155
-rwxr-xr-xassets/images/BasePlatformA01_AO.pngbin65754 -> 0 bytes
-rwxr-xr-xassets/images/BasePlatformA01_DM.pngbin70207 -> 0 bytes
-rwxr-xr-xassets/images/BoxA01_AO.pngbin62516 -> 0 bytes
-rwxr-xr-xassets/images/BoxA01_DM.pngbin54892 -> 0 bytes
-rwxr-xr-xassets/images/Grunge.pngbin2174259 -> 0 bytes
-rwxr-xr-xassets/images/LabelFrame.tgabin12306 -> 0 bytes
-rwxr-xr-xassets/images/MArmBaseN_DM.pngbin136280 -> 0 bytes
-rwxr-xr-xassets/images/MArmBaseN_NM.pngbin109974 -> 0 bytes
-rwxr-xr-xassets/images/MArmTopN_DM.pngbin136902 -> 0 bytes
-rwxr-xr-xassets/images/MArmTopN_NM.pngbin97275 -> 0 bytes
-rwxr-xr-xassets/images/MArm_AO.pngbin157336 -> 0 bytes
-rwxr-xr-xassets/images/MBaseWallA01_AO.pngbin134056 -> 0 bytes
-rwxr-xr-xassets/images/MBaseWallA01_DM.pngbin136022 -> 0 bytes
-rwxr-xr-xassets/images/MBaseWallA01_GM.pngbin26051 -> 0 bytes
-rwxr-xr-xassets/images/MBase_AO.pngbin165449 -> 0 bytes
-rwxr-xr-xassets/images/MCoreBase_DM.pngbin130589 -> 0 bytes
-rwxr-xr-xassets/images/MCoreBase_GM.pngbin9853 -> 0 bytes
-rwxr-xr-xassets/images/MEjectorBaseN_DM.pngbin119768 -> 0 bytes
-rwxr-xr-xassets/images/MEjectorBaseN_NM.pngbin57808 -> 0 bytes
-rwxr-xr-xassets/images/MRingBaseN_DM.pngbin107671 -> 0 bytes
-rwxr-xr-xassets/images/MRingBaseN_NM.pngbin94852 -> 0 bytes
-rwxr-xr-xassets/images/MSquareBaseN_DM.pngbin76400 -> 0 bytes
-rwxr-xr-xassets/images/MWall_AO.pngbin108536 -> 0 bytes
-rwxr-xr-xassets/images/MWall_DM.pngbin133125 -> 0 bytes
-rwxr-xr-xassets/images/MWall_GM.pngbin9294 -> 0 bytes
-rwxr-xr-xassets/images/MWall_NM.pngbin89287 -> 0 bytes
-rwxr-xr-xassets/images/Ref.pngbin13632 -> 0 bytes
-rwxr-xr-xassets/images/Spec.pngbin2321526 -> 0 bytes
-rwxr-xr-xassets/images/black.tgabin210 -> 0 bytes
-rwxr-xr-xassets/images/cube.pngbin34506 -> 0 bytes
-rwxr-xr-xassets/images/cubelight_Glow.pngbin3635 -> 0 bytes
-rwxr-xr-xassets/images/cubelight_spec.pngbin33249 -> 0 bytes
-rwxr-xr-xassets/images/default_white.pngbin90 -> 0 bytes
-rwxr-xr-xassets/images/droid.pngbin885 -> 0 bytes
-rwxr-xr-xassets/images/env.pngbin85724 -> 0 bytes
-rwxr-xr-xassets/images/femaleRobot.pngbin2857 -> 0 bytes
-rwxr-xr-xassets/images/femaleRobot_Glow.pngbin2855 -> 0 bytes
-rwxr-xr-xassets/images/lightRack.pngbin2857 -> 0 bytes
-rwxr-xr-xassets/images/lightRack_Glow.pngbin2857 -> 0 bytes
-rwxr-xr-xassets/images/metal.pngbin2366049 -> 696663 bytes
-rwxr-xr-xassets/images/particle-star.pngbin3665 -> 0 bytes
-rwxr-xr-xassets/images/quilt01.pngbin572888 -> 0 bytes
-rwxr-xr-xassets/images/quilt01_E.pngbin3273 -> 0 bytes
-rwxr-xr-xassets/images/quilt01_N.pngbin116034 -> 0 bytes
-rwxr-xr-xassets/images/quilt02.pngbin391471 -> 0 bytes
-rwxr-xr-xassets/images/quilt02_E.pngbin3273 -> 0 bytes
-rwxr-xr-xassets/images/quilt02_N.pngbin34939 -> 0 bytes
-rwxr-xr-xassets/images/white.tgabin236 -> 0 bytes
-rwxr-xr-xindex.html18
-rwxr-xr-xjs/io/system/coreioapi.js111
-rwxr-xr-xjs/io/system/fileio.js175
-rwxr-xr-xjs/io/templates/files/_bin/template.css (renamed from js/io/templates/files/template.css)0
-rwxr-xr-xjs/io/templates/files/_bin/template.html (renamed from js/io/templates/files/template.html)0
-rwxr-xr-xjs/io/templates/files/_bin/template.js (renamed from js/io/templates/files/template.js)0
-rwxr-xr-xjs/io/templates/files/_bin/template.json (renamed from js/io/templates/files/template.json)0
-rwxr-xr-xjs/io/templates/files/_bin/template.php (renamed from js/io/templates/files/template.php)0
-rwxr-xr-xjs/io/templates/files/_bin/template.pl (renamed from js/io/templates/files/template.pl)0
-rwxr-xr-xjs/io/templates/files/_bin/template.py (renamed from js/io/templates/files/template.py)0
-rwxr-xr-xjs/io/templates/files/_bin/template.rb (renamed from js/io/templates/files/template.rb)0
-rwxr-xr-xjs/io/templates/files/_bin/template.xml (renamed from js/io/templates/files/template.xml)0
-rwxr-xr-xjs/io/templates/files/_bin/xml.txt (renamed from js/io/templates/files/xml.txt)0
-rwxr-xr-xjs/io/templates/files/css.txt2
-rwxr-xr-xjs/io/templates/files/html.txt19
-rwxr-xr-xjs/io/templates/files/js.txt1
-rwxr-xr-xjs/io/templates/files/php.txt3
-rwxr-xr-xjs/io/templates/files/pl.txt1
-rwxr-xr-xjs/io/templates/files/py.txt1
-rwxr-xr-xjs/io/templates/files/rb.txt1
-rwxr-xr-xjs/ninja.reel/ninja.js5
-rwxr-xr-xjs/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css2
-rwxr-xr-xjs/preloader/Preloader.js1
-rw-r--r--versions.json8
75 files changed, 284 insertions, 331 deletions
diff --git a/.gitignore b/.gitignore
index b92bd629..fd016bd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ js/components/gradientpicker.reel/.sass-cache/6f8390f69a31f1a976968b9c18d0824d78
20 20
21cloud/ 21cloud/
22 22
23/.idea/scopes/scope_settings.xml \ No newline at end of file 23/.idea/scopes/scope_settings.xml
24_scss/imports/scss/_Stage.scss
25compass_app_log.txt \ No newline at end of file
diff --git a/_scss/compass_app_log.txt b/_scss/compass_app_log.txt
deleted file mode 100644
index 00a7f071..00000000
--- a/_scss/compass_app_log.txt
+++ /dev/null
@@ -1,108 +0,0 @@
12011-09-02 13:25:28 overwrite ../css/ninja.css
22011-09-02 13:38:07 overwrite ../css/ninja.css
32011-09-02 13:38:27 overwrite ../css/ninja.css
42011-09-02 13:39:16 overwrite ../css/ninja.css
52011-09-02 13:42:04 overwrite ../css/ninja.css
62011-09-02 13:42:48 overwrite ../css/ninja.css
72011-09-14 16:53:51 overwrite ../css/ninja.css
82011-09-14 16:54:56 overwrite ../css/ninja.css
92011-09-14 16:55:59 overwrite ../css/ninja.css
102011-09-14 16:57:48 overwrite ../css/ninja.css
112011-09-14 17:00:26 overwrite ../css/ninja.css
122011-09-14 17:02:28 error ninja.scss (Line 19: Invalid CSS after ".SubselectionTool": expected "{", was "",")
132011-09-14 17:02:28 overwrite ../css/ninja.css
142011-09-14 17:04:10 overwrite ../css/ninja.css
152011-09-14 17:05:49 overwrite ../css/ninja.css
162011-09-14 17:08:00 overwrite ../css/ninja.css
172011-09-14 17:08:36 overwrite ../css/ninja.css
182011-09-14 17:09:27 overwrite ../css/ninja.css
192011-09-14 17:10:02 overwrite ../css/ninja.css
202011-09-14 17:11:37 overwrite ../css/ninja.css
212011-09-14 17:12:37 overwrite ../css/ninja.css
222011-09-14 17:14:35 overwrite ../css/ninja.css
232011-09-14 17:15:36 overwrite ../css/ninja.css
242011-09-14 17:16:33 overwrite ../css/ninja.css
252011-09-14 17:17:11 overwrite ../css/ninja.css
262011-09-14 17:17:19 overwrite ../css/ninja.css
272011-09-14 17:18:27 overwrite ../css/ninja.css
282011-09-14 17:19:06 overwrite ../css/ninja.css
292011-09-14 17:19:22 overwrite ../css/ninja.css
302011-09-14 17:19:43 overwrite ../css/ninja.css
312011-09-14 17:20:16 overwrite ../css/ninja.css
322011-09-14 17:20:39 overwrite ../css/ninja.css
332011-09-14 17:21:09 overwrite ../css/ninja.css
342011-09-14 17:21:51 overwrite ../css/ninja.css
352011-09-14 17:22:33 overwrite ../css/ninja.css
362011-09-15 13:56:59 overwrite ../css/ninja.css
372011-09-15 13:57:29 overwrite ../css/ninja.css
382011-10-03 13:19:40 overwrite ../css/ninja.css
392011-10-03 13:21:00 overwrite ../css/ninja.css
402011-10-03 13:21:21 overwrite ../css/ninja.css
412011-10-03 13:26:42 overwrite ../css/ninja.css
422011-10-03 13:44:20 overwrite ../css/ninja.css
432011-10-03 13:44:54 overwrite ../css/ninja.css
442011-10-03 13:45:14 overwrite ../css/ninja.css
452011-10-03 13:46:26 overwrite ../css/ninja.css
462011-10-03 13:46:29 overwrite ../css/ninja.css
472011-10-04 15:06:33 overwrite ../css/ninja.css
482011-10-04 15:06:36 overwrite ../css/ninja.css
492011-10-04 15:06:43 overwrite ../css/ninja.css
502011-10-04 15:15:22 overwrite ../css/ninja.css
512011-10-11 16:02:52 overwrite ../css/ninja.css
522011-10-13 00:13:38 identical ../css/ninja.css
532011-10-13 00:14:12 overwrite ../css/ninja.css
542011-10-13 00:15:03 overwrite ../css/ninja.css
552011-10-26 15:19:00 overwrite ../css/ninja.css
562011-10-26 15:19:33 overwrite ../css/ninja.css
572011-11-22 16:21:56 overwrite ../css/ninja.css
582011-11-22 17:47:41 overwrite ../css/ninja.css
592011-11-30 01:14:42 overwrite ../css/ninja.css
602011-11-30 01:15:04 overwrite ../css/ninja.css
612011-11-30 01:15:09 overwrite ../css/ninja.css
622011-11-30 16:54:38 overwrite ../css/ninja.css
632011-12-01 11:38:06 overwrite ../css/ninja.css
642011-12-01 11:38:11 overwrite ../css/ninja.css
652011-12-07 12:10:05 overwrite ../css/ninja.css
662011-12-07 12:10:22 overwrite ../css/ninja.css
672011-12-07 12:12:11 overwrite ../css/ninja.css
682011-12-07 12:14:43 overwrite ../css/ninja.css
692011-12-07 17:32:10 overwrite ../css/ninja.css
702011-12-07 17:55:01 overwrite ../css/ninja.css
712011-12-15 14:51:46 overwrite ../css/ninja.css
722011-12-15 14:52:46 overwrite ../css/ninja.css
732011-12-15 14:52:59 overwrite ../css/ninja.css
742011-12-15 14:53:25 overwrite ../css/ninja.css
752011-12-20 21:56:57 overwrite ../css/ninja.css
762011-12-30 15:41:28 overwrite ../css/ninja.css
772011-12-30 15:43:24 overwrite ../css/ninja.css
782011-12-30 15:45:49 overwrite ../css/ninja.css
792012-01-12 16:26:20 overwrite ../css/ninja.css
802012-01-12 16:26:22 overwrite ../css/ninja.css
812012-01-12 16:26:25 overwrite ../css/ninja.css
822012-01-19 11:06:48 overwrite ../css/ninja.css
832012-01-19 11:06:55 overwrite ../css/ninja.css
842012-01-19 11:11:16 overwrite ../css/ninja.css
852012-01-19 14:30:22 overwrite ../css/ninja.css
862012-01-19 14:35:47 overwrite ../css/ninja.css
872012-01-19 14:38:18 overwrite ../css/ninja.css
882012-01-19 14:40:59 overwrite ../css/ninja.css
892012-01-19 14:41:24 overwrite ../css/ninja.css
902012-01-20 15:13:41 overwrite ../css/ninja.css
912012-01-20 15:14:27 overwrite ../css/ninja.css
922012-01-20 15:15:32 overwrite ../css/ninja.css
932012-01-20 15:16:38 overwrite ../css/ninja.css
942012-01-20 15:17:03 overwrite ../css/ninja.css
952012-01-20 15:17:39 overwrite ../css/ninja.css
962012-01-27 16:08:54 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...")
972012-01-27 16:08:54 overwrite ../css/ninja.css
982012-01-27 16:09:18 error ninja.scss (Line 26: Invalid CSS after "resize:": expected pseudoclass or pseudoelement, was "/* Base colors ...")
992012-01-27 16:09:18 overwrite ../css/ninja.css
1002012-01-27 16:09:34 error ninja.scss (Line 93: Invalid CSS after " z-index:": expected pseudoclass or pseudoelement, was " 2;")
1012012-01-27 16:09:34 overwrite ../css/ninja.css
1022012-01-27 16:11:17 error ninja.scss (Line 20: Invalid CSS after "...nately it doesn": expected "{", was "'t seem to work...")
1032012-01-27 16:11:17 overwrite ../css/ninja.css
1042012-01-27 16:11:57 error ninja.scss (Line 106: Invalid CSS after "...how the corner.": expected class name, was "Setting the ::-...")
1052012-01-27 16:11:57 overwrite ../css/ninja.css
1062012-01-27 16:12:29 overwrite ../css/ninja.css
1072012-01-27 16:13:46 overwrite ../css/ninja.css
1082012-01-27 16:14:02 overwrite ../css/ninja.css
diff --git a/_scss/imports/scss/_Stage.scss b/_scss/imports/scss/_Stage.scss
deleted file mode 100755
index faf8ee94..00000000
--- a/_scss/imports/scss/_Stage.scss
+++ /dev/null
@@ -1,155 +0,0 @@
1// <copyright>
2// This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3// No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4// (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5// </copyright>
6
7#middleDocArea {
8 -webkit-box-orient: horizontal;
9 -moz-box-orient: horizontal;
10 box-orient: horizontal;
11
12 -moz-box-flex: 1;
13 -webkit-box-flex: 1;
14 box-flex: 1;
15
16 margin: 1px;
17 margin-bottom:3px;
18
19 border-style: solid;
20 border-width: 1px;
21}