Merge branch 'refs/heads/NinjaInternal' into Color

3 files changed, 78 insertions, 5 deletions

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 39300eb8..f69e6fc9 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -43,11 +43,11 @@ exports.ShapesController = Montage.create(CanvasController, {
                     canvas.height = el.height;
                     this.application.ninja.elementMediator.replaceElement(el, canvas);
                     NJevent("elementDeleted", el);
-                    this.application.ninja.selectionController.selectElement(canvas);
                     el = canvas;
                     this.toggleWebGlMode(el, value);
-                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
-                    break;
+                    el.elementModel.shapeModel.GLWorld.render();
+                    this.application.ninja.selectionController.selectElement(el);
+                    return;
                 case "strokeMaterial":
                     var sm = Object.create(MaterialsLibrary.getMaterial(value));
                     if(sm)
@@ -318,7 +318,9 @@ exports.ShapesController = Montage.create(CanvasController, {
             {
                 return;
             }
-            var world,
+            var sm,
+                fm,
+                world,
                 worldData = el.elementModel.shapeModel.GLWorld.export();
             if(worldData)
             {
@@ -326,6 +328,22 @@ exports.ShapesController = Montage.create(CanvasController, {
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = true;
                 world.import(worldData);
+                el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
+
+                sm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
+                if(sm)
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(sm);
+                    el.elementModel.shapeModel.strokeMaterial = sm;
+                }
+                fm = Object.create(MaterialsLibrary.getMaterial("FlatMaterial"));
+                // TODO - Use consts after GL code is converted to object literal notation
+//                if( fm && (el.elementModel.shapeModel.GLGeomObj.geomType() !== GLGeomObj.GEOM_TYPE_LINE) )
+                if( fm && (el.elementModel.shapeModel.GLGeomObj.geomType() !== 3) )
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(fm);
+                    el.elementModel.shapeModel.fillMaterial = fm;
+                }
             }
 
         }
@@ -346,8 +364,16 @@ exports.ShapesController = Montage.create(CanvasController, {
                 el.elementModel.shapeModel.GLWorld = world;
                 el.elementModel.shapeModel.useWebGl = false;
                 world.import(worldData);
+                el.elementModel.shapeModel.GLGeomObj = world.getGeomRoot();
+                el.elementModel.shapeModel.GLGeomObj.setStrokeMaterial(null);
+                el.elementModel.shapeModel.strokeMaterial = null;
+                // TODO - Use consts after GL code is converted to object literal notation
+                if(el.elementModel.shapeModel.GLGeomObj.geomType() !== 3)
+                {
+                    el.elementModel.shapeModel.GLGeomObj.setFillMaterial(null);
+                    el.elementModel.shapeModel.fillMaterial = null;
+                }
             }
-
         }
     }
 
diff --git a/js/controllers/main-menu-controller.js b/js/controllers/main-menu-controller.js
new file mode 100644
index 00000000..5e126617
--- /dev/null
+++ b/js/controllers/main-menu-controller.js
@@ -0,0 +1,43 @@
+/* <copyright>
+This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
+No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
+(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
+</copyright> */
+
+
+var Montage = require("montage/core/core").Montage,
+    Component = require("montage/ui/component").Component;
+
+exports.MainMenuController = Montage.create(Component, {
+    deserializedFromTemplate:{
+        value:function () {
+            this.eventManager.addEventListener("executeHelpFAQ", this, false);
+            this.eventManager.addEventListener("executeHelpForums", this, false);
+            this.eventManager.addEventListener("executeHelpTopics", this, false);
+            this.eventManager.addEventListener("executeHelpAbout", this, false);
+        }
+    },
+
+    // Basic help menu handling methods
+    handleExecuteHelpFAQ:{
+        value:function () {
+            window.open('http://www.tetsubo.org/go/ninjafaq');
+        }
+    },
+    handleExecuteHelpForums:{
+        value:function () {
+            window.open('http://www.tetsubo.org/go/ninjaforums');
+        }
+    },
+    handleExecuteHelpTopics:{
+        value:function () {
+            window.open('http://www.tetsubo.org/go/ninjadocs');
+        }
+    },
+    handleExecuteHelpAbout:{
+        value:function () {
+            // TODO
+            console.log("Pull up the about popup");
+        }
+    }
+});
diff --git a/js/controllers/styles-controller.js b/js/controllers/styles-controller.js
index 011caec5..44e0e798 100644
--- a/js/controllers/styles-controller.js
+++ b/js/controllers/styles-controller.js
@@ -181,6 +181,10 @@ var stylesController = exports.StylesController = Montage.create(Component, {
             rule = stylesheet.rules[index];
             
             ///// attach specificity to rule object
+            // if rule is css keyframes, return rule and don't attach specificity
+            if (rule instanceof WebKitCSSKeyframesRule) {
+                return rule;
+            }
             rule[this.CONST.SPECIFICITY_KEY] = this.getSpecificity(rule.selectorText);
             
             ///// return the rule we just inserted