Merge branch 'refs/heads/master' into components

3 files changed, 14 insertions, 3 deletions

diff --git a/js/helper-classes/3D/snap-manager.js b/js/helper-classes/3D/snap-manager.js
index a755e9e2..5b467b41 100755
--- a/js/helper-classes/3D/snap-manager.js
+++ b/js/helper-classes/3D/snap-manager.js
@@ -1411,6 +1411,8 @@ var SnapManager = exports.SnapManager = Montage.create(Component, {
                 case glObj.GEOM_TYPE_PATH:
                     // Snapping not implemented for these type, but don't throw an error...
                                         break;
+                case glObj.GEOM_TYPE_BRUSH_STROKE:
+                    break; //don't throw error because snapping not yet implemented
                 case glObj.GEOM_TYPE_CUBIC_BEZIER:
                     {
                         var nearVrt = glObj.getNearVertex( eyePt, dir );
diff --git a/js/helper-classes/3D/vec-utils.js b/js/helper-classes/3D/vec-utils.js
index e6db4a8d..4eacd856 100755
--- a/js/helper-classes/3D/vec-utils.js
+++ b/js/helper-classes/3D/vec-utils.js
@@ -259,6 +259,6 @@ var VecUtils = exports.VecUtils = Object.create(Object.prototype,
                         glmat4.rotate(mat, angle, axis);
                         return mat;
                 }
-        },
+        }
 
 });
\ No newline at end of file
diff --git a/js/helper-classes/3D/view-utils.js b/js/helper-classes/3D/view-utils.js
index 5a820fc2..a72b7906 100755
--- a/js/helper-classes/3D/view-utils.js
+++ b/js/helper-classes/3D/view-utils.js
@@ -1200,10 +1200,19 @@ exports.ViewUtils = Montage.create(Component, {
 //      MISCELLANEOUS
 //      event.layerX/Y:                                 var pt = viewUtils.getMousePoint(event);
 
+    getStageDimension: {
+        value: function()
+        {
+            var width = parseInt(this.application.ninja.stage.documentRoot.elementModel.stageDimension.style.getProperty("width"));
+            var height= parseInt(this.application.ninja.stage.documentRoot.elementModel.stageDimension.style.getProperty("height"));
+            return[width,height];
+        }
+    },
+
     getStage: {
         value: function()
                 {
-                        return snapManagerModule.SnapManager.getStage();
+                        return this.application.ninja.stage.snapManager.getStage();
                 }
         },
 
@@ -1303,7 +1312,7 @@ exports.ViewUtils = Montage.create(Component, {
         {
                 value: function()
                 {
-                        return this.application.ninjs.stage.canvas;
+                        return this.application.ninja.stage.canvas;
                 }
         },