버그 수정, 커맨드 사이즈 자동 반영
This commit is contained in:
@@ -20,8 +20,9 @@ function genChiefTableObj(){
|
||||
for(var turnIdx=0;turnIdx<maxChiefTurn;turnIdx++){
|
||||
var $turn = $plate.find('.turn{0}'.format(turnIdx+1));
|
||||
var $turnTime = $turn.find('.chiefTurnTime');
|
||||
var $turnPad = $turn.find('.chiefTurnPad');
|
||||
var $turnText = $turn.find('.chiefTurnText');
|
||||
turn.push({turnTime:$turnTime,turnText:$turnText});
|
||||
turn.push({turnTime:$turnTime,turnPad:$turnPad,turnText:$turnText});
|
||||
}
|
||||
objTable[chiefIdx] = {
|
||||
levelText: $levelText,
|
||||
@@ -76,7 +77,13 @@ function reloadTable(){
|
||||
var turnList = plateObj.turn;
|
||||
$.each(chiefInfo.turn, function(turnIdx, turnText){
|
||||
turnList[turnIdx].turnTime.text(turnTimeObj.format('hh:mm'));
|
||||
turnList[turnIdx].turnText.text(turnText);
|
||||
turnList[turnIdx].turnText.text(turnText).css('font-size', '13px');
|
||||
var oWidth = turnList[turnIdx].turnPad.innerWidth();
|
||||
var iWidth = turnList[turnIdx].turnText.outerWidth();
|
||||
if(iWidth > oWidth * 0.95){
|
||||
var newFontSize = 13 * oWidth / iWidth * 0.9;
|
||||
turnList[turnIdx].turnText.css('font-size', '{0}px'.format(newFontSize));
|
||||
}
|
||||
turnTimeObj = turnTimeObj.add(turnTerm, 'minute');
|
||||
});
|
||||
});
|
||||
|
||||
+13
-2
@@ -35,7 +35,17 @@ function reloadCommandList(){
|
||||
|
||||
$tr.find('.time_pad').text(nextTurnTime.format('HH:mm'));
|
||||
$tr.find('.month_pad').text('{0}年 {1}月'.format(year, month));
|
||||
$tr.find('.turn_pad').text(turnInfo.brief);
|
||||
var $turn_pad = $tr.find('.turn_pad');
|
||||
var $turn_text = $turn_pad.find('.turn_text');
|
||||
$turn_text.text(turnInfo.brief).css('font-size','13px');
|
||||
|
||||
var oWidth = $turn_pad.innerWidth();
|
||||
var iWidth = $turn_text.outerWidth();
|
||||
if(iWidth > oWidth * 0.95){
|
||||
var newFontSize = 13 * oWidth / iWidth * 0.9;
|
||||
$turn_text.css('font-size', '{0}px'.format(newFontSize));
|
||||
}
|
||||
|
||||
nextTurnTime.add(data.turnTerm, 'minutes');
|
||||
month+=1;
|
||||
if(month >= 13){
|
||||
@@ -44,6 +54,8 @@ function reloadCommandList(){
|
||||
}
|
||||
});
|
||||
console.log(data);
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
@@ -138,7 +150,6 @@ $('#reserveTurn').click(function(){
|
||||
return false;
|
||||
})
|
||||
|
||||
|
||||
setInterval(myclock, 500);
|
||||
reloadCommandList();
|
||||
});
|
||||
Reference in New Issue
Block a user