Updated Materials Library and Materials Editor Popup to work with latest version of Montage.

We had to change our css to not use id's.
Also, updated the popup to use Montage's Popup component.
It looks like bump material has a bug. So loading that material results in a runtime error.

1 files changed, 14 insertions, 6 deletions

diff --git a/js/components/ui/color-chip.reel/color-chip.js b/js/components/ui/color-chip.reel/color-chip.js
index e51bdd8a..ed1ac27a 100755
--- a/js/components/ui/color-chip.reel/color-chip.js
+++ b/js/components/ui/color-chip.reel/color-chip.js
@@ -29,12 +29,20 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
         value: 20
     },
 
-    initialColor: {
-        value: false
+    color: {
+        value: {r:0, g:0, b:0, a:1, css:'rgb(0,0,0)', mode:'rgb'}
     },
 
     changeDelegate: {
-        value: null
+        value: function(event) {
+            this.color = event._event.color;
+
+            var evt = document.createEvent("CustomEvent");
+            evt.initEvent("change", true, true);
+            evt.type = "change";
+
+            this.dispatchEvent(evt);
+        }
     },
 
     prepareForDraw: {
@@ -60,10 +68,10 @@ var ColorChip = exports.ColorChip = Montage.create(Component, {
         value: function(evt) {
             if(this.chip) {
                 // This is a single chip - Not related to the color panel -- Set the initial color if found
-                var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(255,0,0)";
+                var mode = "rgb", r = 0, g = 0, b = 0, a = 1, css = "rgb(0,0,0)";
 
-                if(this.initialColor) {
-                    var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.initialColor);
+                if(this.color) {
+                    var colorObj = this.application.ninja.colorController.getColorObjFromCss(this.color.css);
                     mode = colorObj.mode;
                     r = colorObj.value.r;
                     g = colorObj.value.g;