Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

2 files changed, 11 insertions, 36 deletions

diff --git a/js/ninja.reel/ninja.html b/js/ninja.reel/ninja.html
index a20a6090..8f6f6d7b 100755
--- a/js/ninja.reel/ninja.html
+++ b/js/ninja.reel/ninja.html
@@ -16,12 +16,6 @@
 
     <script type="text/montage-serialization">
         {
-
-            "preloader1": {
-                "module": "js/preloader/preloader",
-                "name": "Preloader"
-            },
-
             "localStorage": {
                 "module": "js/controllers/local-storage-controller",
                 "name": "LocalStorage"
@@ -37,6 +31,11 @@
                 "name": "AppModel"
             },
 
+            "materialsModel": {
+                "module": "js/models/materials-model",
+                "name": "MaterialsModel"
+            },
+
             "menu": {
                 "module": "js/components/menu/menu.reel",
                 "name": "Menu",
@@ -167,7 +166,7 @@
             },
 
             "panelContainer": {
-                "module": "js/panels/PanelContainer/PanelContainer.reel",
+                "module": "js/panels/PanelContainer.reel",
                 "name": "PanelContainer",
                 "properties": {
                     "element": {"#": "rightPanelContent"},
@@ -389,8 +388,8 @@
 
                 <section data-montage-id="rightPanelResizer" class="rightPanelResizer resizeBar"></section>
 
-                <section id="rightPanelContainer" class="panelContainer">
-                    <section id="rightPanelContent">
+                <section id="rightPanelContainer" class="rightPanelContainer panelContainer">
+                    <section id="rightPanelContent" class="rightPanelContent">
                     </section>
                 </section>
             </section>
diff --git a/js/ninja.reel/ninja.js b/js/ninja.reel/ninja.js
index 6efeef8a..88361fd9 100755
--- a/js/ninja.reel/ninja.js
+++ b/js/ninja.reel/ninja.js
@@ -8,10 +8,9 @@ var Montage = require("montage/core/core").Montage,
     Component   = require("montage/ui/component").Component,
     AppData     = require("js/data/appdata").AppData;
 
-exports.Ninja = Montage.create(Component, {
+var matrix = require("js/lib/math/matrix");
 
-    _appLoaded: { value: false },
-    _preload: { value: false },
+exports.Ninja = Montage.create(Component, {
 
     ninjaVersion: {
         value: null
@@ -54,7 +53,7 @@ exports.Ninja = Montage.create(Component, {
 
             window.addEventListener("resize", this, false);
 
-            this.eventManager.addEventListener( "appLoading", this, false);
+//            this.eventManager.addEventListener( "appLoading", this, false); // Don't need this anymore
             this.eventManager.addEventListener( "selectTool", this, false);
             this.eventManager.addEventListener( "selectSubTool", this, false);
             this.eventManager.addEventListener( "onOpenDocument", this, false);
@@ -79,29 +78,6 @@ exports.Ninja = Montage.create(Component, {
         }
     },
 
-    handlePreloadFinish: {
-            value: function(e) {
-                this._preload = true;
-                this.appLoaded();
-            }
-    },
-
-    handleAppLoading: {
-        value: function(e) {
-            this._appLoaded = true;
-            this.appLoaded();
-        }
-    },
-
-    appLoaded: {
-        value: function() {
-            if(this._appLoaded && this._preload) {
-                // App is now deserialized and files are preloaded
-                this.appModel.materials = MaterialsLibrary.materials;
-            }
-        }
-    },
-
     _didDraw: {
         value: false
     },