diff options
author | Armen Kesablyan | 2012-06-19 22:51:04 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 22:51:04 -0700 |
commit | 20ea3997661b068fc6628ffa573e1b2d47e3a800 (patch) | |
tree | a797d8566c0bd73b76f9a77e025a5bf5b02988e3 /js/tools | |
parent | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (diff) | |
download | ninja-20ea3997661b068fc6628ffa573e1b2d47e3a800.tar.gz |
Binding View - Mouse Over Element Pop up Hud
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/tools')
-rw-r--r-- | js/tools/bindingTool.js | 34 |
1 files changed, 18 insertions, 16 deletions
diff --git a/js/tools/bindingTool.js b/js/tools/bindingTool.js index 93af11c2..b284fc47 100644 --- a/js/tools/bindingTool.js +++ b/js/tools/bindingTool.js | |||
@@ -59,6 +59,7 @@ exports.BindingTool = Montage.create(ModifierToolBase, { | |||
59 | In the mouse over event we need to validate if the mouse over is over a hud. | 59 | In the mouse over event we need to validate if the mouse over is over a hud. |
60 | If it on top of a hud bring that single hud to the top to associate with. | 60 | If it on top of a hud bring that single hud to the top to associate with. |
61 | */ | 61 | */ |
62 | |||
62 | this.application.ninja.stage.bindingView.handleMousemove(event); | 63 | this.application.ninja.stage.bindingView.handleMousemove(event); |
63 | //this.doDraw(event); | 64 | //this.doDraw(event); |
64 | } | 65 | } |
@@ -66,25 +67,26 @@ exports.BindingTool = Montage.create(ModifierToolBase, { | |||
66 | 67 | ||
67 | HandleLeftButtonUp: { | 68 | HandleLeftButtonUp: { |
68 | value: function(event) { | 69 | value: function(event) { |
70 | if(!this.application.ninja.stage.bindingView._isDrawingConnection) { | ||
71 | if(this._escape) { | ||
72 | this._escape = false; | ||
73 | return; | ||
74 | } | ||
69 | 75 | ||
70 | if(this._escape) { | 76 | if(this._hasDraw) { |
71 | this._escape = false; | 77 | this._hasDraw = false; |
72 | return; | 78 | //this.endDraw(event); |
73 | } | ||
74 | |||
75 | if(this._hasDraw) { | ||
76 | this._hasDraw = false; | ||
77 | //this.endDraw(event); | ||
78 | } else { | ||
79 | this.doSelection(event); | ||
80 | if (this.application.ninja.selectedElements.length !== 0 ) { | ||
81 | if(this.application.ninja.selectedElements[0].controller) { | ||
82 | this.selectedComponent = this.application.ninja.selectedElements[0].controller; | ||
83 | } | ||
84 | } else { | 79 | } else { |
85 | this.selectedComponent = null; | 80 | this.doSelection(event); |
81 | if (this.application.ninja.selectedElements.length !== 0 ) { | ||
82 | if(this.application.ninja.selectedElements[0].controller) { | ||
83 | this.selectedComponent = this.application.ninja.selectedElements[0].controller; | ||
84 | } | ||
85 | } else { | ||
86 | this.selectedComponent = null; | ||
87 | } | ||
88 | this._isDrawing = false; | ||
86 | } | 89 | } |
87 | this._isDrawing = false; | ||
88 | } | 90 | } |
89 | //this.endDraw(event); | 91 | //this.endDraw(event); |
90 | //NJevent("disableStageMove"); | 92 | //NJevent("disableStageMove"); |