aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Materials
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-20 15:45:23 -0700
committerValerio Virgillito2012-07-20 15:45:23 -0700
commita9b17cef34d3c4f222b6f4d0949fa3c2bbfe867b (patch)
tree5adb6c7c4bf4e13c70379050627ad6d42a7a86e6 /js/panels/Materials
parent288b81e06db68b785524db5c7f7ae1ecbc3d83b1 (diff)
parentd7f5d6ffb39d55f2d4f4f366421571826df1e8bb (diff)
downloadninja-a9b17cef34d3c4f222b6f4d0949fa3c2bbfe867b.tar.gz
Merge branch 'Fixes_071' of https://github.com/mqg734/ninja
Diffstat (limited to 'js/panels/Materials')
-rwxr-xr-xjs/panels/Materials/materials-library-panel.reel/materials-library-panel.js20
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});