equal
deleted
inserted
replaced
134 .css('overflow', '') |
134 .css('overflow', '') |
135 .css(prop, ''); |
135 .css(prop, ''); |
136 |
136 |
137 if (value) { |
137 if (value) { |
138 var body = this.$element.find(this.options.overflow); |
138 var body = this.$element.find(this.options.overflow); |
139 body.style('overflow', 'auto', 'important') |
139 if (body.css('overflow') === undefined) { |
140 .style(prop, (typeof(value) == 'function' ? value() : value) + 'px', 'important'); |
140 body.style('overflow', 'auto', 'important'); |
|
141 } |
|
142 body.style(prop, (typeof(value) == 'function' ? value() : value) + 'px', 'important'); |
141 } |
143 } |
142 |
144 |
143 var modalOverflow = $(window).height() - 10 < this.$element.height(); |
145 var modalOverflow = $(window).height() - 10 < this.$element.height(); |
144 |
146 |
145 // if (modalOverflow || this.options.modalOverflow) { |
147 // if (modalOverflow || this.options.modalOverflow) { |