diff options
author | Armen Kesablyan | 2012-06-19 01:05:51 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:05:51 -0700 |
commit | 1007cbf983ad0f2460a4122a492a96023fdb4439 (patch) | |
tree | bb04e69fbad4ce9e792f8e799bf9aeac25657483 /js/stage | |
parent | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (diff) | |
download | ninja-1007cbf983ad0f2460a4122a492a96023fdb4439.tar.gz |
Bug: Text Tool Breaking canvas space.
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/stage')
-rwxr-xr-x | js/stage/binding-view.reel/binding-view.js | 4 | ||||
-rwxr-xr-x | js/stage/stage.reel/stage.css | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/js/stage/binding-view.reel/binding-view.js b/js/stage/binding-view.reel/binding-view.js index 4fa82789..8c201ba1 100755 --- a/js/stage/binding-view.reel/binding-view.js +++ b/js/stage/binding-view.reel/binding-view.js | |||
@@ -388,10 +388,10 @@ exports.BindingView = Montage.create(Component, { | |||
388 | if(nodeEl.classList.contains("connectorBubble")) { | 388 | if(nodeEl.classList.contains("connectorBubble")) { |
389 | // var mouseUpPoint = new WebKitPoint(e.pageX, e.pageY); | 389 | // var mouseUpPoint = new WebKitPoint(e.pageX, e.pageY); |
390 | // var nodeEl = new webkitConvertPointFromPageToNode(this.element, mouseUpPoint); | 390 | // var nodeEl = new webkitConvertPointFromPageToNode(this.element, mouseUpPoint); |
391 | debugger; | 391 | //debugger; |
392 | this.connectionElementEnd = nodeEl.parentElement.controller.parentComponent.parentComponent.userComponent; | 392 | this.connectionElementEnd = nodeEl.parentElement.controller.parentComponent.parentComponent.userComponent; |
393 | this.connectionPropertyEnd = nodeEl.parentElement.controller.title; | 393 | this.connectionPropertyEnd = nodeEl.parentElement.controller.title; |
394 | console.log(this.connectionElementStart, this.connectionPropertyStart, this.connectionElementEnd, this.connectionPropertyEnd); | 394 | //console.log(this.connectionElementStart, this.connectionPropertyStart, this.connectionElementEnd, this.connectionPropertyEnd); |
395 | this.application.ninja.objectsController.addBinding({ | 395 | this.application.ninja.objectsController.addBinding({ |
396 | sourceObject: this.connectionElementStart, | 396 | sourceObject: this.connectionElementStart, |
397 | sourceObjectPropertyPath: this.connectionPropertyStart, | 397 | sourceObjectPropertyPath: this.connectionPropertyStart, |
diff --git a/js/stage/stage.reel/stage.css b/js/stage/stage.reel/stage.css index 2271cd8a..2c2e30d3 100755 --- a/js/stage/stage.reel/stage.css +++ b/js/stage/stage.reel/stage.css | |||
@@ -14,6 +14,8 @@ | |||
14 | 14 | ||
15 | .montage-editor-container { | 15 | .montage-editor-container { |
16 | z-index: 8; | 16 | z-index: 8; |
17 | display: none; | ||
18 | position: absolute; | ||
17 | } | 19 | } |
18 | 20 | ||
19 | .stageAndScenesContainer .montage-editor { | 21 | .stageAndScenesContainer .montage-editor { |
@@ -64,3 +66,4 @@ div.CodeMirror span.CodeMirror-matchingbracket {color: #000 !important;backgroun | |||
64 | .cm-s-rubyblue .activeline {background: #3E7087; !important} | 66 | .cm-s-rubyblue .activeline {background: #3E7087; !important} |
65 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} | 67 | .cm-s-lesser-dark .activeline {background: #8da6ce; !important} |
66 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} | 68 | .cm-s-xq-dark .activeline {background: #8da6ce; !important} |
69 | |||