From c7b8d5d07834f85c530baf041ec2c818e86cc3a3 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 09:24:00 -0800 Subject: Removing duplicate get/setElementPlanes method. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/LinePlaneIntersectRec.js | 3 --- 1 file changed, 3 deletions(-) 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; } }, -- cgit v1.2.3 From 2f2472efe0ca55d52fcdf4934bfa52008b68e1de Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 09:40:16 -0800 Subject: Javascript does not evaluate a return with its expression in a new line. The return expression must begin on the same line as the return keyword. Signed-off-by: Nivesh Rajbhandari --- js/helper-classes/3D/hit-record.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) 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) - ) + ); } }, -- cgit v1.2.3 From d4a110bf2c7a949c627966ed01db7a4d32d62757 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:04:19 -0800 Subject: Adding back Ink Bottle tool in the tool bar so QE can test ink bottle functionality without having to wait for the new icon and location of the tool. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 22 +++++++++++----------- js/mediators/keyboard-mediator.js | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 00de9236..96367203 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -157,17 +157,17 @@ exports.ToolsData = Montage.create(Montage, { "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": "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/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; } -- cgit v1.2.3 From 6ad427c4975b9a30f87dfb8ad53614cd4b6e65b9 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 24 Feb 2012 10:12:16 -0800 Subject: Marking inkbottle as the final tool in the set. Signed-off-by: Nivesh Rajbhandari --- js/data/tools-data.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/data/tools-data.js b/js/data/tools-data.js index 96367203..cf48757d 100755 --- a/js/data/tools-data.js +++ b/js/data/tools-data.js @@ -153,7 +153,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "FillTool", "toolTip": "Fill Tool", "cursor": "url('images/tools/bucket_down.png'), default", - "lastInGroup": true, + "lastInGroup": false, "container": false, "selected": false }, @@ -164,7 +164,7 @@ exports.ToolsData = Montage.create(Montage, { "action": "InkBottleTool", "toolTip": "Ink Bottle Tool", "cursor": "url('images/tools/inkbottle_down.png'), default", - "lastInGroup": false, + "lastInGroup": true, "container": false, "selected": false }, -- cgit v1.2.3