diff options
author | Valerio Virgillito | 2012-07-20 15:44:57 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-07-20 15:44:57 -0700 |
commit | d0526d124f2bbc1c28912d2d3de925d175f5e2d5 (patch) | |
tree | 9010ff97310f209fe35fef06899056cab8169282 /js/panels/Materials/materials-library-panel.reel | |
parent | c6965b0329672daeffbb3f76746821ab72ad03c8 (diff) | |
parent | d7f5d6ffb39d55f2d4f4f366421571826df1e8bb (diff) | |
download | ninja-d0526d124f2bbc1c28912d2d3de925d175f5e2d5.tar.gz |
Merge branch 'Fixes_071' of https://github.com/mqg734/ninja into v0.7.1
Diffstat (limited to 'js/panels/Materials/materials-library-panel.reel')
-rwxr-xr-x | js/panels/Materials/materials-library-panel.reel/materials-library-panel.js | 20 |
1 files changed, 16 insertions, 4 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 4b9044ae..c3c2a6de 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 | |||
@@ -217,15 +217,27 @@ exports.MaterialsLibraryPanel = Montage.create(Component, { | |||
217 | 217 | ||
218 | willPositionPopup: { | 218 | willPositionPopup: { |
219 | value: function(popup, defaultPosition) { | 219 | value: function(popup, defaultPosition) { |
220 | var content = popup.content.element, | 220 | var left, |
221 | top, | ||
222 | content = popup.content.element, | ||
221 | contentHt = parseFloat(content.style.height) || content.offsetHeight || 0, | 223 | contentHt = parseFloat(content.style.height) || content.offsetHeight || 0, |
222 | contentWd = parseFloat(content.style.width) || content.offsetWidth || 0, | 224 | contentWd = parseFloat(content.style.width) || content.offsetWidth || 0, |
223 | pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0)); | 225 | pt = webkitConvertPointFromNodeToPage(this.selectedMaterialNode, new WebKitPoint(0, 0)); |
224 | if(!pt) { | 226 | |
227 | if(!pt) { | ||
225 | return defaultPosition; | 228 | return defaultPosition; |
226 | } else { | 229 | } |
227 | return {top: pt.y - contentHt + 10, left: pt.x - contentWd + 10}; | 230 | |
231 | top = pt.y - contentHt + 10; | ||
232 | if(top < 0) { | ||
233 | top = 0; | ||
228 | } | 234 | } |
235 | left = pt.x - contentWd + 10; | ||
236 | if(left < 0) { | ||
237 | left = 0; | ||
238 | } | ||
239 | |||
240 | return {top:top, left:left}; | ||
229 | } | 241 | } |
230 | } | 242 | } |
231 | }); | 243 | }); |