5 files changed, 73 insertions, 17 deletions

diff --git a/index.html b/index.html
index e9b2d1ee..7c852357 100755
--- a/index.html
+++ b/index.html
@@ -178,6 +178,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
         <script type="text/javascript">
             window.onload = function() {
+                //Check for OS support
+                if (navigator.appVersion.toLowerCase().indexOf("win") === -1 && navigator.appVersion.toLowerCase().indexOf("mac") === -1) {
+                    window.location = "./os.html";
+                }
                 // Check if we are running in Chrome
                 if(navigator.userAgent.toLowerCase().indexOf("chrome") === -1) {
                     window.location = "./redirect.html";
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 6dabff47..ad0f40a2 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -56,10 +56,11 @@ exports.ShapesController = Montage.create(CanvasController, {
                     {
                         // Changing stroke size should grow/shrink the shape from the center.
                         var delta = ~~(val - el.elementModel.shapeModel.GLGeomObj.getStrokeWidth()),
-                            l = this.application.ninja.elementMediator.getProperty(el, "left", parseInt),
-                            t = this.application.ninja.elementMediator.getProperty(el, "top", parseInt),
-                            w = this.application.ninja.elementMediator.getProperty(el, "width", parseInt),
-                            h = this.application.ninja.elementMediator.getProperty(el, "height", parseInt);
+                            ol = this.application.ninja.elementMediator.getProperty(el, "left", parseInt),
+                            ot = this.application.ninja.elementMediator.getProperty(el, "top", parseInt),
+                            ow = this.application.ninja.elementMediator.getProperty(el, "width", parseInt),
+                            oh = this.application.ninja.elementMediator.getProperty(el, "height", parseInt),
+                            l, t, w, h;
 
                         if(geomType === 3)
                         {
@@ -68,12 +69,12 @@ exports.ShapesController = Montage.create(CanvasController, {
                             if(slope === "horizontal")
                             {
                                 h = Math.max(val, 1);
-                                t -= ~~(delta/2);
+                                t = ot - ~~(delta/2);
                             }
                             else if(slope === "vertical")
                             {
                                 w = Math.max(val, 1);
-                                l -= ~~(delta/2);
+                                l = ol - ~~(delta/2);
                             }
                             else
                             {
@@ -85,10 +86,10 @@ exports.ShapesController = Montage.create(CanvasController, {
                                 var dX = ~~(xAdj*2 - oldXAdj*2);
                                 var dY = ~~(yAdj*2 - oldYAdj*2);
 
-                                l -= dX;
-                                t -= dY;
-                                w += dX*2;
-                                h += dY*2;
+                                l = ol - dX;
+                                t = ot - dY;
+                                w = ow + dX*2;
+                                h = oh + dY*2;
 
                                 el.elementModel.shapeModel.GLGeomObj.setXAdj(xAdj);
                                 el.elementModel.shapeModel.GLGeomObj.setYAdj(yAdj);
@@ -96,13 +97,16 @@ exports.ShapesController = Montage.create(CanvasController, {
                         }
                         else
                         {
-                            l -= ~~(delta/2);
-                            t -= ~~(delta/2);
-                            w += delta;
-                            h += delta;
+                            l = ol - ~~(delta/2);
+                            t = ot - ~~(delta/2);
+                            w = ow + delta;
+                            h = oh + delta;
                         }
 
-                        this.application.ninja.elementMediator.setProperties([{element:el, properties:{left: l + "px", top: t + "px", width: w + "px", height:h + "px"}}], eventType, source);
+                        this.application.ninja.elementMediator.setProperties([{element:el,
+                                        properties:{left: l + "px", top: t + "px", width: w + "px", height: h + "px"},
+                                        previousProperties:{left: ol + "px", top: ot + "px", width: ow + "px", height: oh + "px"}}],
+                                        eventType, source);
 
                     }
                     el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val);
diff --git a/js/helper-classes/3D/draw-utils.js b/js/helper-classes/3D/draw-utils.js
index b59bbf39..11c27b03 100755
--- a/js/helper-classes/3D/draw-utils.js
+++ b/js/helper-classes/3D/draw-utils.js
@@ -326,7 +326,7 @@ var DrawUtils = exports.DrawUtils = Montage.create(Component, {
                     eltModel = elt.elementModel;
                     eltModel.setProperty("offsetCache", false);
 
-                    if(eltModel.selection !== "body") {
+                    if(eltModel.pi !== "bodyPi") {
                         if(isChanging) {
                             eltModel.props3D.matrix3d = null;
                         } else {
diff --git a/manifest.json b/manifest.json
index 14d8b239..8c9e8a66 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "name": "Ninja Authoring Tool Preview",
   "description": "Ninja HTML5 Authoring Tool Preview",
-  "version": "0.8.0.0",
+  "version": "0.7.1.0",
   "app": {
     "launch": {
       "local_path": "index.html"
diff --git a/os.html b/os.html
new file mode 100644
index 00000000..703c2b0d
--- /dev/null
+++ b/os.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<!-- <copyright>
+Copyright (c) 2012, Motorola Mobility LLC.
+All Rights Reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+* Neither the name of Motorola Mobility LLC nor the names of its
+  contributors may be used to endorse or promote products derived from this
+  software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</copyright> -->
+<html>
+
+<head>
+
+    <title>Ninja - OS Support</title>
+
+</head>
+
+<body>
+
+    <div>
+        <p>Your operating system is currently not supported by Ninja. Please visit <a href="http://tetsubo.org/home/ninja/system-requirements/">Tetsubo</a> for more information on system requirements and more information.</p>
+    </div>
+
+</body>
+
+</html>