Browse Source

Merge pull request #620 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'e0b00989f5ab09ed39349c7bb59257bbdbcc5b73':
  BI-30963 scale没有处理干净
es6
windy 6 years ago
parent
commit
e31f64fae6
  1. 5
      dist/bundle.js
  2. 62
      dist/bundle.min.js
  3. 5
      dist/core.js
  4. 5
      dist/fineui.js
  5. 62
      dist/fineui.min.js
  6. 5
      dist/fineui_without_jquery_polyfill.js
  7. 5
      src/core/controller/controller.tooltips.js

5
dist/bundle.js vendored

@ -26825,8 +26825,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
tooltip.element.height(tooltip.element[0].scrollHeight); tooltip.element.height(tooltip.element[0].scrollHeight);
this.showingTips[name] = true; this.showingTips[name] = true;
// scale影响要计算在内 // scale影响要计算在内
var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left; // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15; // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
x -= tooltip.element.outerWidth() + 15; x -= tooltip.element.outerWidth() + 15;
} }

62
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/core.js vendored

@ -26825,8 +26825,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
tooltip.element.height(tooltip.element[0].scrollHeight); tooltip.element.height(tooltip.element[0].scrollHeight);
this.showingTips[name] = true; this.showingTips[name] = true;
// scale影响要计算在内 // scale影响要计算在内
var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left; // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15; // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
x -= tooltip.element.outerWidth() + 15; x -= tooltip.element.outerWidth() + 15;
} }

5
dist/fineui.js vendored

@ -27064,8 +27064,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
tooltip.element.height(tooltip.element[0].scrollHeight); tooltip.element.height(tooltip.element[0].scrollHeight);
this.showingTips[name] = true; this.showingTips[name] = true;
// scale影响要计算在内 // scale影响要计算在内
var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left; // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15; // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
x -= tooltip.element.outerWidth() + 15; x -= tooltip.element.outerWidth() + 15;
} }

62
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

5
dist/fineui_without_jquery_polyfill.js vendored

@ -17210,8 +17210,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
tooltip.element.height(tooltip.element[0].scrollHeight); tooltip.element.height(tooltip.element[0].scrollHeight);
this.showingTips[name] = true; this.showingTips[name] = true;
// scale影响要计算在内 // scale影响要计算在内
var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left; // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15; // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
x -= tooltip.element.outerWidth() + 15; x -= tooltip.element.outerWidth() + 15;
} }

5
src/core/controller/controller.tooltips.js

@ -86,8 +86,9 @@ BI.TooltipsController = BI.inherit(BI.Controller, {
tooltip.element.height(tooltip.element[0].scrollHeight); tooltip.element.height(tooltip.element[0].scrollHeight);
this.showingTips[name] = true; this.showingTips[name] = true;
// scale影响要计算在内 // scale影响要计算在内
var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left; // var scale = context.element.offset().left / context.element.get(0).getBoundingClientRect().left;
var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15; // var x = (e.pageX || e.clientX) * scale + 15, y = (e.pageY || e.clientY) * scale + 15;
var x = (e.pageX || e.clientX) + 15, y = (e.pageY || e.clientY) + 15;
if (x + tooltip.element.outerWidth() > $("body").outerWidth()) { if (x + tooltip.element.outerWidth() > $("body").outerWidth()) {
x -= tooltip.element.outerWidth() + 15; x -= tooltip.element.outerWidth() + 15;
} }

Loading…
Cancel
Save