From 0c036afae3c338887128f14f83c467de665121eb Mon Sep 17 00:00:00 2001 From: Brandon Arnold Date: Fri, 12 Sep 2014 08:40:42 -0700 Subject: [PATCH] Revert "Merge branch 'istrasoft-PR-dropdown-fit-bounds'" This reverts commit feb991b977c0185e6947731945cdd000c2b97e33, reversing changes made to 429b8e8b02a438bd363c6867fa02b2a4fad53285. --- js/foundation/foundation.dropdown.js | 45 +--------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/js/foundation/foundation.dropdown.js b/js/foundation/foundation.dropdown.js index cb8993d9a..09cbe3bf1 100644 --- a/js/foundation/foundation.dropdown.js +++ b/js/foundation/foundation.dropdown.js @@ -11,13 +11,6 @@ mega_class: 'mega', align: 'bottom', is_hover: false, - smart_position: true, - smart_position_arrays: { - right: ['right', 'bottom', 'top', 'left', 'right'], - left: ['left', 'right', 'bottom', 'top', 'left'], - top: ['top', 'right', 'bottom', 'left', 'top'], - bottom : ['bottom', 'top', 'right', 'left', 'bottom'] - }, opened: function(){}, closed: function(){} }, @@ -207,45 +200,10 @@ style : function (dropdown, target, settings) { var css = $.extend({position: 'absolute'}, - - this.position(dropdown, target, settings)); + this.dirs[settings.align].call(dropdown, target, settings)); dropdown.attr('style', '').css(css); }, - // return CSS property object - position: function(d, t, s) { - var res = {}, - vp = {}, - list = s.smart_position_arrays[s.align], - len = list.length, - dd_w = d.outerWidth(), - dd_h = d.outerHeight(), - o = d.offsetParent().offset(); - - if (s.smart_position) { - var $win = $(window); - vp.top = $win.scrollTop(); - vp.left = $win.scrollLeft(); - vp.right = vp.left + $win.width(); - vp.bottom = vp.top + $win.height(); - - for (var i=0; i < len; i++) { - res = this.dirs[list[i]].call(d, t, s); - if (this.is_out(vp, res.top + o.top, res.left + o.left, dd_w, dd_h, 3) === false) - break; - } - } - else { - res = this.dirs[s.align].call(d, t, s); - } - - return res; - }, - - is_out: function (vp, top, left, width, height, buffer) { - return (top < vp.top + buffer || left < vp.left + buffer - || top + height > vp.bottom - buffer || left + width > vp.right - buffer); - }, // return CSS property object // `this` is the dropdown @@ -308,7 +266,6 @@ } }, - // Insert rule to style psuedo elements adjust_pip : function (dropdown,target,settings,position) { var sheet = Foundation.stylesheet, -- 2.47.3