Merge branch 'ToolFixes' of github.com:mqg734/ninja-internal into working

9 files changed, 45 insertions, 12 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 5efbccd0..48072309 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -76,6 +76,7 @@ exports.ShapesController = Montage.create(CanvasController, {
                 case "fillMaterial":
                 case "border":
                 case "background":
+                case "useWebGl":
                     return this.getShapeProperty(el, p);
                 default:
                     return CanvasController.getProperty(el, p);
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 1f8870ca..8ccf17cc 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -288,7 +288,6 @@ exports.PiData = Montage.create( Montage, {
                             type : "color",
                             prop: "background",
                             id : "fill",
-                            prop : "fill",
                             divider : true
                         }
                     ],
@@ -370,6 +369,16 @@ exports.PiData = Montage.create( Montage, {
                 Section: [
                     [
                         {
+                            type: "checkbox",
+                            id: "useWebGl",
+                            prop: "useWebGl",
+                            defaultValue: false,
+                            value: "Use WebGL",
+                            checked: false
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
@@ -435,6 +444,16 @@ exports.PiData = Montage.create( Montage, {
                 Section: [
                     [
                         {
+                            type: "checkbox",
+                            id: "useWebGl",
+                            prop: "useWebGl",
+                            defaultValue: false,
+                            value: "Use WebGL",
+                            checked: false
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "stroke",
                             label: "Stroke",
@@ -462,7 +481,6 @@ exports.PiData = Montage.create( Montage, {
                             type : "color",
                             prop: "background",
                             id : "fill",
-                            prop : "fill",
                             divider : true
                         }
                     ],
@@ -509,6 +527,16 @@ exports.PiData = Montage.create( Montage, {
                 Section: [
                     [
                         {
+                            type: "checkbox",
+                            id: "useWebGl",
+                            prop: "useWebGl",
+                            defaultValue: false,
+                            value: "Use WebGL",
+                            checked: false
+                        }
+                    ],
+                    [
+                        {
                             type: "dropdown",
                             id:   "strokeMaterial",
                             prop:   "strokeMaterial",
diff --git a/js/mediators/drag-drop-mediator.js b/js/mediators/drag-drop-mediator.js
index 07e4a50c..aacb228c 100644
--- a/js/mediators/drag-drop-mediator.js
+++ b/js/mediators/drag-drop-mediator.js
@@ -62,7 +62,7 @@ exports.DragDropMediator = Montage.create(Component, {
 
     handleDropEvent: {
         value: function(evt){
-            var xferString, component;
+            var xferString, component, file, files, idx, len;
 
             this.baseX = evt.offsetX - this.application.ninja.stage.userContentLeft;
             this.baseY = evt.offsetY - this.application.ninja.stage.userContentTop;
@@ -85,11 +85,8 @@ exports.DragDropMediator = Montage.create(Component, {
                 return;
             }
 
-            var file;
-            const files = evt.dataTransfer.files;
-            var idx;
-            const len = files.length;
-
+            files = evt.dataTransfer.files;
+            len = files.length;
 
             // Loop over all dragged files...
             for (idx = 0; idx < len; idx++) {
diff --git a/js/mediators/element-mediator.js b/js/mediators/element-mediator.js
index 992ac620..c44e1cb5 100644
--- a/js/mediators/element-mediator.js
+++ b/js/mediators/element-mediator.js
@@ -48,10 +48,10 @@ exports.ElementMediator = Montage.create(NJComponent, {
                     len = this.application.ninja.selectedElements.length;
 
                 if(len) {
-                    for(var i = 0; i<len; i++)
-                    {
+                    for(var i = 0; i<len; i++) {
                         els.push(this.application.ninja.selectedElements[i]);
                     }
+                    
                     for(i=0; i<len; i++) {
                         this._removeElement(els[i]._element);
                     }
diff --git a/js/models/shape-model.js b/js/models/shape-model.js
index b643a7b5..1175538f 100644
--- a/js/models/shape-model.js
+++ b/js/models/shape-model.js
@@ -10,6 +10,7 @@ var Montage = require("montage/core/core").Montage,
 exports.ShapeModel = Montage.create(Component, {
 
     shapeCount:             { value: 0 },
+    useWebGl:           { value: false },
 
     GLWorld:                { value: null },
     GLGeomObj:              { value: null },
diff --git a/js/panels/properties/content.reel/content.js b/js/panels/properties/content.reel/content.js
index 20dc308f..0088447a 100644
--- a/js/panels/properties/content.reel/content.js
+++ b/js/panels/properties/content.reel/content.js
@@ -197,8 +197,11 @@ exports.Content = Montage.create(Component, {
 
                         if(control.type !== "color") {
                             currentValue = ElementsMediator.getProperty(el, control.prop, control.valueMutator);
-                            currentValue ? currentValue = currentValue : currentValue = control.defaultValue;
-                            this.customSections[0].content.controls[control.id] = currentValue;
+                            if(currentValue === null)
+                            {
+                                currentValue = control.defaultValue;
+                            }
+                            this.customSections[i].content.controls[control.id] = currentValue;
                         }
                         else
                         {
diff --git a/js/tools/LineTool.js b/js/tools/LineTool.js
index 17157f23..6a948fd8 100644
--- a/js/tools/LineTool.js
+++ b/js/tools/LineTool.js
@@ -238,6 +238,7 @@ exports.LineTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = line;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {
diff --git a/js/tools/OvalTool.js b/js/tools/OvalTool.js
index 2fa5411b..446c6754 100644
--- a/js/tools/OvalTool.js
+++ b/js/tools/OvalTool.js
@@ -95,6 +95,7 @@ exports.OvalTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = oval;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {
diff --git a/js/tools/RectTool.js b/js/tools/RectTool.js
index 94d80b53..6109ee4d 100644
--- a/js/tools/RectTool.js
+++ b/js/tools/RectTool.js
@@ -117,6 +117,7 @@ exports.RectTool = Montage.create(ShapeTool, {
                 canvas.elementModel.shapeModel.strokeStyle = strokeStyle;
 
                 canvas.elementModel.shapeModel.GLGeomObj = rect;
+                canvas.elementModel.shapeModel.useWebGl = this.options.use3D;
             }
             else
             {