19 files changed, 464 insertions, 321 deletions

diff --git a/assets/descriptor.json b/assets/descriptor.json
new file mode 100644
index 00000000..53bfb684
--- /dev/null
+++ b/assets/descriptor.json
@@ -0,0 +1,34 @@
+{
+        "copyright": "This file contains proprietary software owned by Motorola Mobility, Inc. No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder. (c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.",
+        "version": "0.0.0.0",
+        "root": "/assets/",
+        "directories": [{"name": "images"}, {"name": "shaders"}],
+        "files": [
+                "images/black.png",
+                "images/blue.png",
+                "images/BoxB2_AO.png",
+                "images/BoxB2_DM.png",
+                "images/cubelight.png",
+                "images/grey.png",
+                "images/material_paint.png",
+                "images/metal.png",
+                "images/normalMap.png",
+                "images/random_normal.png",
+                "images/rocky-diffuse.jpg",
+                "images/rocky-normal.jpg",
+                "images/rocky-spec.jpg",
+                "images/silver.png",
+                "images/white.png",
+                "shaders/Basic.frag.glsl",
+                "shaders/Basic.vert.glsl",
+                "shaders/linearGradient.frag.glsl",
+                "shaders/linearGradient.vert.glsl",
+                "shaders/radialGradient.frag.glsl",
+                "shaders/radialGradient.vert.glsl",
+                "shaders/test_fshader.glsl",
+                "shaders/test_fshader_full.glsl",
+                "shaders/test_vshader.glsl",
+                "shaders/ub_fshader.glsl",
+                "shaders/ub_vshader.glsl"
+        ]
+}
\ No newline at end of file
diff --git a/css/ninja.css b/css/ninja.css
index d22cfc22..0be30434 100755
--- a/css/ninja.css
+++ b/css/ninja.css
@@ -174,6 +174,8 @@ body { position: absolute; margin: 0px; width: 100%; height: 100%; background-co
 
 #documentBar { height: 25px; width: 1000px; position: relative; overflow: hidden; color: white; }
 
+.montage-popup-modal-mask { opacity: 1; background: -webkit-radial-gradient(center, ellipse cover, rgba(0, 0, 0, 0.65) 0%, rgba(0, 0, 0, 0.8) 80%); }
+
 #middleDocArea { -webkit-box-orient: horizontal; -moz-box-orient: horizontal; box-orient: horizontal; -moz-box-flex: 1; -webkit-box-flex: 1; box-flex: 1; margin: 1px; margin-bottom: 3px; border-style: solid; border-width: 1px; }
 
 #mainStageIFrame { border: none; margin: 4px; }
diff --git a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
index 9c85c6b5..796c283f 100644
--- a/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
+++ b/js/components/ui/FilePicker/pickerNavigator.reel/pickerNavigator.css
@@ -6,7 +6,7 @@
 
 .picker{
     font-size:12px;
-    width:510px;
+    width:523px;
     height:500px;
     padding-top:15px;
     padding-left:15px;
@@ -53,6 +53,7 @@
     height:75%;
     width:auto;
     border-right: none;
+    margin: 8px 0px 0px 8px;
 }
 
 .picker .right-bottom{
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.css b/js/components/ui/icon-list-basic/icon.reel/icon.css
index 4d71f6b8..9fb180d2 100644
--- a/js/components/ui/icon-list-basic/icon.reel/icon.css
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.css
@@ -5,14 +5,14 @@
  </copyright> */
 
 .icon{
-    width:90px;
-    height:80px;
+    width:88px;
+    height:78px;
     display: inline;
     float: left;
     -moz-border-radius: 8px;
     border-radius: 8px;
-    margin-bottom: 5px;
-    margin-right: 5px;
+    margin-bottom: 8px;
+    margin-right: 8px;
     background-color: #5f5f5f;
 }
 
@@ -29,17 +29,17 @@
 .icon .iconImg{
     width:35px;
     height:35px;
-    margin-left: 20px;
+    margin-left: 26px;
     margin-top: 10px;
 }
 
 .icon .iconLabel{
     margin-top:8px;
     white-space: nowrap;
-    text-overflow:ellipsis;
+    text-overflow: ellipsis;
     line-height:15px;
     overflow: hidden;
-    max-width:80%;
+    width: 72px;
+    padding: 0px 8px;
     text-align: center;
-    padding-left: 2px;
 }
\ No newline at end of file
diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 84b994ce..f397ace7 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -9,8 +9,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage =           require("montage/core/core").Montage,
     Component =         require("montage/ui/component").Component,
     Uuid =                      require("montage/core/uuid").Uuid,
-    HTMLDocument =      require("js/io/document/html-document").HTMLDocument,
-    TextDocument =      require("js/io/document/text-document").TextDocument,
+    HTMLDocument =      require("js/document/html-document").HTMLDocument,
+    TextDocument =      require("js/document/text-document").TextDocument,
     DocumentController;
 ////////////////////////////////////////////////////////////////////////
 //
@@ -28,13 +28,7 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     _iframeHolder: { value: null, enumerable: false },
     _textHolder: { value: null, enumerable: false },
     _codeMirrorCounter: {value: 1, enumerable: false},
-
-    tmpSourceForTesting: {
-        value: "function CodeMirror(place, givenOptions) {" +
-                "// Determine effective options based on given values and defaults." +
-                "var options = {}, defaults = CodeMirror.defaults; }"
-            },
-
+    
     activeDocument: {
         get: function() {
             return this._activeDocument;
@@ -62,21 +56,12 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
             this.eventManager.addEventListener("executeSave", this, false);
 
             this.eventManager.addEventListener("recordStyleChanged", this, false);
-
-                        // Temporary testing opening a new file after Ninja has loaded
-                        this.eventManager.addEventListener("executeNewProject", this, false);
         }
     },
 
     handleAppLoaded: {
         value: function() {
-            //this.openDocument({"type": "html"});
-        }
-    },
-        
-        handleExecuteNewProject: {
-        value: function() {
-            this.openDocument({"type": "html"});
+            //
         }
     },
 
@@ -104,16 +89,26 @@ DocumentController = exports.DocumentController = Montage.create(Component, {
     handleExecuteSave: {
         value: function(event) {
                 //Text and HTML document classes should return the same save object for fileSave
-                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.clearDocumentDirtyFlag.bind(this));
+                this.application.ninja.ioMediator.fileSave(this.activeDocument.save(), this.fileSaveResult.bind(this));
                 }
     },