Merge branch 'refs/heads/ninja-internal-master' into FileIO

3 files changed, 7 insertions, 4 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index 94202dc5..372be345 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -597,7 +597,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         }
 
             // TODO - Don't traverse components' children
-            if(elt.elementModel && elt.elementModel.isComponent)
+//            if(elt.elementModel && elt.elementModel.isComponent)
+            if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG"))))
             {
                 return;
             }
@@ -1007,7 +1008,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                         }
 
             // TODO - Don't traverse components' children
-            if(elt.elementModel && elt.elementModel.isComponent)
+//            if(elt.elementModel && elt.elementModel.isComponent)
+            if(elt.nodeName.toLowerCase() === "svg" || (elt.elementModel && (elt.elementModel.isComponent || (elt.elementModel.selection === "SVG"))))
             {
                 return;
             }
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index bedda8bf..c1f59397 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -580,7 +580,8 @@ exports.ViewUtils = Montage.create(Component, {
                 if (elt.style.height)   h  = MathUtils.styleToNumber(elt.style.height);
             }
 
-            if (elt instanceof SVGSVGElement) {
+//            if (elt instanceof SVGSVGElement) {
+            if(elt.nodeName.toLowerCase() === "svg") {
                         if(w instanceof SVGAnimatedLength)
                             w = w.animVal.value;
                         if(h instanceof SVGAnimatedLength)
diff --git a/js/helper-classes/RDGE/GLWorld.js b/js/helper-classes/RDGE/GLWorld.js
index 0addcadc..64086bee 100755
--- a/js/helper-classes/RDGE/GLWorld.js
+++ b/js/helper-classes/RDGE/GLWorld.js
@@ -824,7 +824,7 @@ GLWorld.prototype.export = function()
 
         // we need 2 export modes:  One for save/restore, one for publish.
         // hardcoding for now
-        var exportForPublish = true;
+        var exportForPublish = false;
         exportStr += "publish: " + exportForPublish + "\n";
 
         if (exportForPublish)