diff options
author | Nivesh Rajbhandari | 2012-07-19 10:55:22 -0700 |
---|---|---|
committer | Nivesh Rajbhandari | 2012-07-19 10:55:22 -0700 |
commit | fc13ef1e806116bb7ece5bb06604fa4f5714a6ed (patch) | |
tree | 8e8d87b31fffb7163aff0634ba4128f08be66343 /js/panels | |
parent | 16d06bac95ce8334f8c5586750e98360dbc9cbd9 (diff) | |
download | ninja-fc13ef1e806116bb7ece5bb06604fa4f5714a6ed.tar.gz |
Squashed commit of the following:
commit 0285afe3d4bd458a51f11241f13ea6ffdb0283ed
Merge: 2f9f5e3 16d06ba
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 19 10:54:25 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit 2f9f5e369eb96f6c81b5e4bcbe09b418825e2864
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Wed Jul 18 17:15:19 2012 -0700
Fixed selection bounds not drawing in nested tags.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit b0a3507f9d27579ad511c69314a09136d7f7c6a0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Wed Jul 18 11:07:44 2012 -0700
Layout info needs to redraw if stage is updated.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 63c5e0bf52c33706ba597cb69f7794e287bd0f06
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Jul 17 15:40:54 2012 -0700
Per feedback from QE, we are still going to draw tool feedback on each mouse move so the selection bounds are not out of sync with the elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 0599a742092b985c4002977e501e3b457173f1d9
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Jul 17 15:28:25 2012 -0700
Fixed grid not drawing correctly when switching documents and when adding/removing elements.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit fd9410606ee6358910d65b2cb5f71812fd44a7c4
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Tue Jul 17 11:36:09 2012 -0700
Updated drawing feedback to handle matrix 2d values entered via CSS Panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 559c16c7ac8c9f40b94a011a6f932d4f97df66a7
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 17:14:28 2012 -0700
IKNinja-751 - Selection boundary doesn't follow the transform applied in the CSS Panel.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit e2da5340159db5cd6f75bf6c9b7eb9cbf959e5cd
Merge: 7cc5de3 5146f22
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 15:36:28 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit 7cc5de39e41b4220f53c91b15b0cf0ed53e0b0f6
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 14:52:06 2012 -0700
Check if ownerDocument.defaultValue is null.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 5ae97995a28a4b06fb7f8703eb8090ea16d88acd
Merge: d17974d 0ede302
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 09:27:22 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit d17974d77273bb635311cb6466f4427cf4d9e5d4
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 16 08:45:05 2012 -0700
Pass in selectedElements array directly to drawUtils when drawing selection bounds instead of creating a duplicate array.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 0b1ea3144cb3e2c1d272f60da32423d0604ace3b
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Fri Jul 13 14:03:40 2012 -0700
Fixed line tool not drawing the width and height info.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit b9c70e8d9ae324aa21fa5490edc71d8503bcefbc
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Fri Jul 13 12:42:25 2012 -0700
Used cached offsetWidth and offsetHeight.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 9e17ac7124745ba745014efe149b31dee4fe658f
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 16:25:41 2012 -0700
Converting tabs to spaces … again!
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 351726c951bb73c28f0e15ea1ab32e85cc735688
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 16:14:31 2012 -0700
Tabs should be 4 spaces.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 250c419aa2dbcb10f012817ee7039aca77cb2518
Merge: 3f8d61a 2880e1d
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 16:08:31 2012 -0700
Merge branch 'refs/heads/ninja-mqg734-master' into StageToolDrawingOptimizations
commit 3f8d61a676da3992947ed9a2ed0e449780fcfbe0
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 15:53:44 2012 -0700
Rotate tool was not working immediately after switching selection and selection bounds were not drawing after resizing canvases.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit e2e1f81e3b6917e1032e1b99b79c266937f3bb25
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Thu Jul 12 12:15:59 2012 -0700
Single draw cycle for stage updates and tool drawings.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 95a90b4c95ee3163c97bea317144366674e49ade
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jun 18 11:46:38 2012 -0700
Single draw cycle for the stage and layout.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 21966b1515d80d2161a14e5a19bc66f3f49a92ce
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Fri Jun 15 13:33:14 2012 -0700
Cache element offsets, including offsetParent.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
commit 80c563c8ba06149691c6c1e754dd9a5e43bc7d4b
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date: Mon Jul 9 17:30:00 2012 -0700
Open materials editor popup next to PI button.
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
Diffstat (limited to 'js/panels')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | 14 | ||||
-rwxr-xr-x | js/panels/Splitter.js | 2 | ||||
-rw-r--r-- | js/panels/css-panel/styles-view-delegate.js | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js index aef48230..4b9044ae 100755 --- a/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js +++ b/js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | |||
@@ -116,6 +116,14 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
116 | handleShowMaterialPopup: { | 116 | handleShowMaterialPopup: { |
117 | enumerable: false, | 117 | enumerable: false, |
118 | value: function (event) { | 118 | value: function (event) { |
119 | var piButton = this.application.eventManager.componentClaimingPointer("mouse"); | ||
120 | if(piButton) { | ||
121 | this.selectedMaterialNode = piButton.element; | ||
122 | } else { | ||
123 | this.selectedMaterialNode = null; | ||
124 | } | ||
125 | |||
126 | this.materialId = event.detail.materialId; | ||
119 | this._showMaterialPopup(event.detail); | 127 | this._showMaterialPopup(event.detail); |
120 | } | 128 | } |
121 | }, | 129 | }, |
@@ -213,7 +221,11 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
213 | contentHt = parseFloat(content.style.height) || content.offsetHeight || 0, | 221 | contentHt = parseFloat(content.style.height) || content.offsetHeight || 0, |
214 | contentWd = parseFloat(content.style.width) || content.offsetWidth || 0, | 222 | contentWd = parseFloat(content.style.width) || content.offsetWidth || 0, |
215 | pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0)); | 223 | pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0)); |
216 | return {top: pt.y - contentHt + 10, left: pt.x - contentWd + 10}; | 224 | if(!pt) { |
225 | return defaultPosition; | ||
226 | } else { | ||
227 | return {top: pt.y - contentHt + 10, left: pt.x - contentWd + 10}; | ||
228 | } | ||
217 | } | 229 | } |
218 | } | 230 | } |
219 | }); | 231 | }); |
diff --git a/js/panels/Splitter.js b/js/panels/Splitter.js index 39e51901..0e7a4e68 100755 --- a/js/panels/Splitter.js +++ b/js/panels/Splitter.js | |||
@@ -111,6 +111,8 @@ exports.Splitter = Montage.create(Component, { | |||
111 | else this.panel.classList.remove("collapsed"); | 111 | else this.panel.classList.remove("collapsed"); |
112 | this.element.classList.remove("collapsed"); | 112 | this.element.classList.remove("collapsed"); |
113 | if(this._resizeBar != null) this.resizeBar.classList.remove("collapsed"); | 113 | if(this._resizeBar != null) this.resizeBar.classList.remove("collapsed"); |
114 | // webkitTransitionEnd is not fired when expanded, so force draw here. | ||
115 | this.application.ninja.stage.resizeCanvases = true; | ||
114 | } | 116 | } |
115 | } | 117 | } |
116 | }, | 118 | }, |
diff --git a/js/panels/css-panel/styles-view-delegate.js b/js/panels/css-panel/styles-view-delegate.js index 6b80663a..113300b2 100644 --- a/js/panels/css-panel/styles-view-delegate.js +++ b/js/panels/css-panel/styles-view-delegate.js | |||
@@ -337,7 +337,8 @@ exports.StylesViewDelegate = Montage.create(Component, { | |||
337 | type : 'cssChange', | 337 | type : 'cssChange', |
338 | data: { | 338 | data: { |
339 | "prop": property, | 339 | "prop": property, |
340 | "value": value | 340 | "value": value, |
341 | "els": this.application.ninja.selectedElements | ||
341 | }, | 342 | }, |
342 | redraw: null | 343 | redraw: null |
343 | }); | 344 | }); |