Merge branch 'refs/heads/NINJAmaster' into TimelineUber

2 files changed, 25 insertions, 8 deletions

diff --git a/js/tools/EyedropperTool.js b/js/tools/EyedropperTool.js
index 927b86cf..d627f03b 100755
--- a/js/tools/EyedropperTool.js
+++ b/js/tools/EyedropperTool.js
@@ -148,7 +148,11 @@ exports.EyedropperTool = Montage.create(toolBase, {
                         c = this._getColorFromElement(obj, event);
                     }
 
-                    if(typeof(c) === "string")
+                    if(!c)
+                    {
+                        color = null;
+                    }
+                    else if(typeof(c) === "string")
                     {
                         color = this.application.ninja.colorController.getColorObjFromCss(c);
                     }
@@ -368,7 +372,7 @@ exports.EyedropperTool = Montage.create(toolBase, {
                 this._imageDataContext = this._imageDataCanvas.getContext("2d");
                 if(isWebGl)
                 {
-                    var worldData = elt.elementModel.shapeModel.GLWorld.export();
+                    var worldData = elt.elementModel.shapeModel.GLWorld.exportJSON();
                     if(worldData)
                     {
                         this._webGlDataCanvas = njModule.NJUtils.makeNJElement("canvas", "Canvas", "shape", {"data-RDGE-id": njModule.NJUtils.generateRandom()}, true);
@@ -379,12 +383,24 @@ exports.EyedropperTool = Montage.create(toolBase, {
                         this._webGlDataCanvas.width = w;
                         this._webGlDataCanvas.height = h;
                         this._webGlWorld = new World(this._webGlDataCanvas, true, true);
-                        this._webGlWorld.import(worldData);
+
+                        var index = worldData.indexOf( ';' );
+                        if ((worldData[0] === 'v') && (index < 24))
+                        {
+                            // JSON format.  separate the version info from the JSON info
+                            var jStr = worldData.substr( index+1 );
+                            worldData = JSON.parse( jStr );
+                        }
+
+                        this._webGlWorld.importJSON(worldData);
                         this._webGlWorld.render();
                         setTimeout(function() {
-                            this._webGlWorld.draw();
-                            this._imageDataContext.drawImage(this._webGlDataCanvas, 0, 0);
-                            return this._getColorFromCanvas(this._imageDataContext, tmpPt, true);
+                            if(this._webGlWorld)
+                            {
+                                this._webGlWorld.draw();
+                                this._imageDataContext.drawImage(this._webGlDataCanvas, 0, 0);
+                                return this._getColorFromCanvas(this._imageDataContext, tmpPt, true);
+                            }
                         }.bind(this), 250);
                     }
                 }
diff --git a/js/tools/TextTool.js b/js/tools/TextTool.js
index 4c464173..d27a32bb 100755
--- a/js/tools/TextTool.js
+++ b/js/tools/TextTool.js
@@ -6,7 +6,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 
 var Montage = require("montage/core/core").Montage,
     DrawingTool = require("js/tools/drawing-tool").DrawingTool;
-    RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor;
+    RichTextEditor = require("node_modules/labs/rich-text-editor.reel").RichTextEditor,
+    ElementsMediator = require("js/mediators/element-mediator").ElementMediator;
 
 exports.TextTool = Montage.create(DrawingTool, {
 
@@ -21,7 +22,7 @@ exports.TextTool = Montage.create(DrawingTool, {
                 this.selectedElement.innerHTML = this.application.ninja.stage.textTool.value;
                 this.application.ninja.stage.textTool.value = "";
                 this.application.ninja.stage.textTool.element.style.display = "none";
-                this.applyElementStyles(this.application.ninja.stage.textTool.element.firstChild, this.selectedElement, ["color"]);
+                ElementsMediator.setProperty(this.application.ninja.selectedElements, "color", [window.getComputedStyle(this.application.ninja.stage.textTool.element.firstChild)["color"]], "Change", "textTool");
             }
             //Set Selected Element
             this._selectedElement = val;