Fix Bug 57874 (fix More button for FireFox and IE11)
This commit is contained in:
parent
148c8a5891
commit
a7b640b741
|
@ -503,7 +503,8 @@ define([
|
||||||
setMoreButton: function(tab, panel) {
|
setMoreButton: function(tab, panel) {
|
||||||
var me = this;
|
var me = this;
|
||||||
if (!btnsMore[tab]) {
|
if (!btnsMore[tab]) {
|
||||||
var box = $('<div class="more-box" style="position: absolute;right: 0; padding-left: 12px;padding-right: 6px;display: none;">' +
|
var top = panel.offset().top;
|
||||||
|
var box = $('<div class="more-box" style="position: absolute;right: 0; top:'+ top +'px; padding-left: 12px;padding-right: 6px;display: none;">' +
|
||||||
'<div class="separator long" style="position: relative;display: table-cell;"></div>' +
|
'<div class="separator long" style="position: relative;display: table-cell;"></div>' +
|
||||||
'<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +
|
'<div class="group" style=""><span class="btn-slot text x-huge slot-btn-more"></span></div>' +
|
||||||
'</div>');
|
'</div>');
|
||||||
|
|
|
@ -193,13 +193,18 @@ var utils = new(function() {
|
||||||
me.innerHeight = window.innerHeight * me.zoom;
|
me.innerHeight = window.innerHeight * me.zoom;
|
||||||
me.applicationPixelRatio = scale.applicationPixelRatio || scale.devicePixelRatio;
|
me.applicationPixelRatio = scale.applicationPixelRatio || scale.devicePixelRatio;
|
||||||
};
|
};
|
||||||
|
checkSizeIE = function() {
|
||||||
|
me.innerWidth = window.innerWidth;
|
||||||
|
me.innerHeight = window.innerHeight;
|
||||||
|
};
|
||||||
me.zoom = 1;
|
me.zoom = 1;
|
||||||
me.applicationPixelRatio = 1;
|
me.applicationPixelRatio = 1;
|
||||||
me.innerWidth = window.innerWidth;
|
me.innerWidth = window.innerWidth;
|
||||||
me.innerHeight = window.innerHeight;
|
me.innerHeight = window.innerHeight;
|
||||||
if ( isIE )
|
if ( isIE ) {
|
||||||
$(document.body).addClass('ie');
|
$(document.body).addClass('ie');
|
||||||
else {
|
$(window).on('resize', checkSizeIE);
|
||||||
|
} else {
|
||||||
checkSize();
|
checkSize();
|
||||||
$(window).on('resize', checkSize);
|
$(window).on('resize', checkSize);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue