Merge branch 'FileIO' of github.com:joseeight/ninja-internal into FileIO

62 files changed, 5411 insertions, 288 deletions

diff --git a/js/panels/CSSPanel/CSSPanel.js b/js/panels/CSSPanel/CSSPanel.js
index 94860b30..cf8880a3 100755
--- a/js/panels/CSSPanel/CSSPanel.js
+++ b/js/panels/CSSPanel/CSSPanel.js
@@ -20,9 +20,9 @@ exports.CSSPanel = Montage.create(PanelBase, {
     init : {
         enumerable:true,
         value : function (){
-            this.minHeight = 300;
-            this.contentHeight = 300;
-            this.defaultHeight= 300;
+            this.minHeight = 195;
+            this.contentHeight = 195;
+            this.defaultHeight= 195;
 
             /* OLD WAY -- Removing the temporary div
             // TODO: Remove this comment once this is tested.
diff --git a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
index 9a27689a..ff738bbe 100755
--- a/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
+++ b/js/panels/Color/colorpanelbase.reel/colorpanelbase.js
@@ -1499,13 +1499,13 @@ exports.ColorPanelBase = Montage.create(Component, {
                                 //
                                 if (type._event.clientX && type._event.clientY) {
                                         //
-                                        if (type._event.clientX > (parseInt(document.width)/2)) {
+                                        //if (type._event.clientX > (parseInt(document.width)/2)) {
                                                 //TODO: Fix offset hack
                                                 this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX) +'px', (type._event.target.clientHeight/2+type._event.clientY - type._event.offsetY)+'px', 'right', 'top');
-                                        } else {
+                                        //} else {
                                                 //
-                                                this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
-                                        }
+                                        //      this.application.ninja.colorController.colorPopupManager.showColorPopup((type._event.clientX - type._event.offsetX)+parseInt(type._event.target.offsetWidth)+'px', (type._event.target.offsetHeight/2+type._event.clientY - type._event.offsetY)+'px', 'left', 'top');
+                                        //}
                                 }
                         }
                 } else {
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
index 6a418279..4db0abff 100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.css
@@ -6,7 +6,7 @@
  </copyright> */
 /* line 12, colorpanelpopup.scss */
 .cpp_popup {
-  overflow: none;
+  overflow: hidden;
   font-size: 12px;
   text-shadow: 1px 1px 1px #000;
   font-family: 'Droid Sans', sans-serif;
@@ -28,7 +28,7 @@
   text-indent: -9999px;
   overflow: hidden;
   float: right;
-  padding: none;
+  padding: 0;
   cursor: pointer;
   border: 1px solid transparent;
 }
diff --git a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
index 20481fb6..1f63658a 100755
--- a/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
+++ b/js/panels/Color/colorpanelpopup.reel/css/colorpanelpopup.scss
@@ -10,7 +10,7 @@ $grey_light: #494949;
 
 .cpp_popup
 {
-        overflow: none;
+        overflow: hidden;
         font-size: 12px;
         text-shadow: 1px 1px 1px #000;
         font-family: 'Droid Sans', sans-serif;
@@ -32,7 +32,7 @@ $grey_light: #494949;
         text-indent: -9999px;
         overflow: hidden;
         float: right;
-        padding: none;
+        padding: 0;
         cursor: pointer;
         border: 1px solid transparent;
 }
diff --git a/js/panels/Materials/Materials.xml b/js/panels/Materials/Materials.xml
index cdeee69e..e955623a 100755
--- a/js/panels/Materials/Materials.xml
+++ b/js/panels/Materials/Materials.xml
@@ -2,17 +2,10 @@
 <tree id="Materials">
     <folder id="ninjaMaterials" label="Ninja Materials">
           <leaf id="UberMaterial" label="Uber" />
-      <leaf id="RadialBlurMaterial" label="Radial Blur" />
-      <leaf id="PulseMaterial" label="Pulse" />
-      <leaf id="TunnelMaterial" label="Tunnel" />
-      <leaf id="TwistMaterial" label="Twist" />
-      <leaf id="KeleidoscopeMaterial" label="Keleidoscope" />
-      <leaf id="JuliaMaterial" label="Julia" />
-      <leaf id="MandelMaterial" label="Mandel" />
-     <leaf id="PlasmaMaterial" label="Plasma" />
         <leaf id="BumpMetalMaterial" label="Bump Metal" />
-      <leaf id="LinearGradientMaterial" label="Linear Gradient" />
-      <leaf id="RadialGradientMaterial" label="Radial Gradient" />
+        <leaf id="LinearGradientMaterial" label="Linear Gradient" />
+        <leaf id="RadialGradientMaterial" label="Radial Gradient" />
+        <leaf id="FlatMaterial" label="Flat" />
     </folder>
     <folder id="customMaterials" label="Custom Materials">
         <leaf id="CheckerBoard" label="CheckerBoard" />
diff --git a/js/panels/Materials/materials-popup.reel/materials-popup.js b/js/panels/Materials/materials-popup.reel/materials-popup.js
index afdc3628..62ca5395