Browse Source

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

* commit '2297e79ea2e4c5853c15cde46d617989ecc3a2b5':
  BI-28985
  BI-29038
  BI-29038 offset要减去scroll
es6
windy 6 years ago
parent
commit
57d0be2cef
  1. 16
      dist/_fineui.min.js
  2. 6
      dist/bundle.js
  3. 20
      dist/bundle.min.js
  4. 6
      dist/core.js
  5. 6
      dist/fineui.js
  6. 16
      dist/fineui.min.js
  7. 3
      src/core/func/function.js
  8. 3
      src/core/jquery.js

16
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored

@ -9402,6 +9402,9 @@ jQuery.fn.offset = function( options ) {
offsetLeft += el.offsetLeft; offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop; offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent; el = el.offsetParent;
} while( el ); } while( el );
win = getWindow( doc ); win = getWindow( doc );
@ -28833,11 +28836,12 @@ BI.extend(BI.DOM, {
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); $(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高
return { return {
width: w, width: w,
height: 24, height: 24,
src: canvas.toDataURL("image/png"), src: canvas.toDataURL("image/png"),
style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px", style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
param: param param: param
}; };
} }

20
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/core.js vendored

@ -9402,6 +9402,9 @@ jQuery.fn.offset = function( options ) {
offsetLeft += el.offsetLeft; offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop; offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent; el = el.offsetParent;
} while( el ); } while( el );
win = getWindow( doc ); win = getWindow( doc );
@ -28833,11 +28836,12 @@ BI.extend(BI.DOM, {
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); $(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高
return { return {
width: w, width: w,
height: 24, height: 24,
src: canvas.toDataURL("image/png"), src: canvas.toDataURL("image/png"),
style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px", style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
param: param param: param
}; };
} }

6
dist/fineui.js vendored

@ -9623,6 +9623,9 @@ jQuery.fn.offset = function( options ) {
offsetLeft += el.offsetLeft; offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop; offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent; el = el.offsetParent;
} while( el ); } while( el );
win = getWindow( doc ); win = getWindow( doc );
@ -29054,11 +29057,12 @@ BI.extend(BI.DOM, {
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); $(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高
return { return {
width: w, width: w,
height: 24, height: 24,
src: canvas.toDataURL("image/png"), src: canvas.toDataURL("image/png"),
style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px", style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
param: param param: param
}; };
} }

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

3
src/core/func/function.js

@ -315,11 +315,12 @@ BI.extend(BI.DOM, {
ctx.fillText(param, 6 * ratio, 12 * ratio); ctx.fillText(param, 6 * ratio, 12 * ratio);
$(canvas).destroy(); $(canvas).destroy();
var backColor = backgroundColor || "#EAF2FD"; var backColor = backgroundColor || "#EAF2FD";
// IE可以放大缩小所以要固定最大最小宽高
return { return {
width: w, width: w,
height: 24, height: 24,
src: canvas.toDataURL("image/png"), src: canvas.toDataURL("image/png"),
style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px", style: "background-color: " + backColor + ";vertical-align: middle; margin: 0 3px; width:" + w + "px;height: 24px; max-width:" + w + "px;max-height: 24px; min-width:" + w + "px;min-height: 24px",
param: param param: param
}; };
} }

3
src/core/jquery.js vendored

@ -9402,6 +9402,9 @@ jQuery.fn.offset = function( options ) {
offsetLeft += el.offsetLeft; offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop; offsetTop += el.offsetTop;
offsetLeft -= el.scrollLeft;
offsetTop -= el.scrollTop;
el = el.offsetParent; el = el.offsetParent;
} while( el ); } while( el );
win = getWindow( doc ); win = getWindow( doc );

Loading…
Cancel
Save