Commit c19bef6f by doszhang

dos

parent 5d499f15
...@@ -247,7 +247,7 @@ $(document).ready(function () { ...@@ -247,7 +247,7 @@ $(document).ready(function () {
}); });
// $('.logo').css('top',getTranslateDistance(15)); // $('.logo').css('top',getTranslateDistance(15));
$('.gif-block').append('<img class="musicgif" src="' + picUrl + 'music.gif" />'); $('.gif-block').append('<img class="musicgif" src="' + picUrl + 'music.gif" />');
$('.btn-music').css('top', 'auto').css('bottom', getTranslateDistance(10)); $('.btn-music').css('top', 'auto').css('bottom', getTranslateDistance(10, true));
initPage(); initPage();
...@@ -976,12 +976,17 @@ CanvasRenderingContext2D.prototype.sector = function (x, y, r, angle1, angle2) { ...@@ -976,12 +976,17 @@ CanvasRenderingContext2D.prototype.sector = function (x, y, r, angle1, angle2) {
return this; return this;
} }
function getTranslateDistance(cardinal = 0) { function getTranslateDistance(cardinal = 0, abs = false) {
var wrapInnerTransform = $('.wrap-inner').css('transform'); var wrapInnerTransform = $('.wrap-inner').css('transform');
var wrapInnertop = parseFloat($('.wrap-inner').css('top')); var wrapInnertop = parseFloat($('.wrap-inner').css('top'));
wrapInnerTransform = wrapInnerTransform.match(/^matrix\(1,\s0,\s0,\s1,\s0,\s\-?(\d+)/); wrapInnerTransform = wrapInnerTransform.match(/^matrix\(1,\s0,\s0,\s1,\s0,\s\-?(\d+)/);
wrapInnerTransform = parseFloat(wrapInnerTransform[1]); wrapInnerTransform = parseFloat(wrapInnerTransform[1]);
if (abs) {
var wrapInnerjl = Math.abs(wrapInnertop - wrapInnerTransform);
} else {
var wrapInnerjl = wrapInnertop - wrapInnerTransform; var wrapInnerjl = wrapInnertop - wrapInnerTransform;
}
return wrapInnerjl + cardinal + 'px'; return wrapInnerjl + cardinal + 'px';
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment