Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal

4 files changed, 15 insertions, 20 deletions

diff --git a/js/data/tools-data.js b/js/data/tools-data.js
index 00de9236..cf48757d 100755
--- a/js/data/tools-data.js
+++ b/js/data/tools-data.js
@@ -153,21 +153,21 @@ exports.ToolsData = Montage.create(Montage, {
                 "action":       "FillTool",
                 "toolTip":      "Fill Tool",
                 "cursor":       "url('images/tools/bucket_down.png'), default",
+                "lastInGroup":  false,
+                "container":    false,
+                "selected":     false
+            },
+            {
+                "id":           "InkBottleTool",
+                "properties":   "inkbottleProperties",
+                "spriteSheet":  true,
+                "action":       "InkBottleTool",
+                "toolTip":      "Ink Bottle Tool",
+                "cursor":       "url('images/tools/inkbottle_down.png'), default",
                 "lastInGroup":  true,
                 "container":    false,
                 "selected":     false
             },
-//            {
-//                "id":           "InkBottleTool",
-//                "properties":   "inkbottleProperties",
-//                "spriteSheet":  true,
-//                "action":       "InkBottleTool",
-//                "toolTip":      "Ink Bottle Tool",
-//                "cursor":       "url('images/tools/inkbottle_down.png'), default",
-//                "lastInGroup":  false,
-//                "container":    false,
-//                "selected":     false
-//            },
             {
                 "id":           "EyedropperTool",
                 "properties":   "eyedropperProperties",
diff --git a/js/helper-classes/3D/LinePlaneIntersectRec.js b/js/helper-classes/3D/LinePlaneIntersectRec.js
index e075dd3d..cb172bf7 100755
--- a/js/helper-classes/3D/LinePlaneIntersectRec.js
+++ b/js/helper-classes/3D/LinePlaneIntersectRec.js
@@ -42,9 +42,6 @@ var LinePlaneIntersectRec = exports.LinePlaneIntersectRec = Object.create(Object
         setDeltaVis: { value: function(d)       {  this._deltaVis = d;          } },
         getDeltaVis: { value: function()        {  return this._deltaVis;       } },
 
-        getElementPlanes: { value: function()           {  return this._deltaVis;               } },
-        setElementPlanes: { value: function(p)          {  this._elementPlanes = p;             } },
-
         setNext: { value: function(n)           {  this._next = n;                              } },
         getNext: { value: function()            {  return this._next;                   } },
 
diff --git a/js/helper-classes/3D/hit-record.js b/js/helper-classes/3D/hit-record.js
index 5546cc5a..2c60adc6 100755
--- a/js/helper-classes/3D/hit-record.js
+++ b/js/helper-classes/3D/hit-record.js
@@ -139,12 +139,10 @@ var HitRecord = exports.HitRecord = Object.create(Object.prototype,
 
         isSomeGridTypeSnap : {
         value: function() {
-            return
-            (
-                (this._type == this.SNAP_TYPE_GRID_VERTEX) ||
+            return ((this._type == this.SNAP_TYPE_GRID_VERTEX) ||
                     (this._type == this.SNAP_TYPE_GRID_HORIZONTAL) ||
                     (this._type == this.SNAP_TYPE_GRID_VERTICAL)
-            )
+                   );
         }
     },
 
diff --git a/js/mediators/keyboard-mediator.js b/js/mediators/keyboard-mediator.js
index a4bf9baa..5b044f8a 100755
--- a/js/mediators/keyboard-mediator.js
+++ b/js/mediators/keyboard-mediator.js
@@ -165,14 +165,14 @@ exports.KeyboardMediator = Montage.create(Component, {
                 // Hand tool
                 if(evt.keyCode === Keyboard.H ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[13]});
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
                     return;
                 }
 
                 // Zoom tool
                 if(evt.keyCode === Keyboard.Z ) {
                     evt.preventDefault();
-                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[14]});
+                    this.application.ninja.handleSelectTool({"detail": this.application.ninja.toolsData.defaultToolsData[15]});
                     return;
                 }