firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Merge branch 'master' of github.com:gnuboard/g4s

Browse Source
This commit is contained in:
whitedot
2013-03-06 11:13:23 +09:00
parent 758f2ea10d 7e102aaa76
commit 55900a04bf
2 changed files with 22 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
head.php
View File

@ -161,6 +161,6 @@ if ($config['cf_include_head']) {
<div id="container"> <div id="container">
<? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?> <? if ((!$bo_table || $w == 's' ) && !defined("_INDEX_")) {?><h1 id="wrapper_title"><?=$g4['title']?></h1><?}?>
<div id="text_size"> <div id="text_size">
<button id="text_increase" class="no_text_resize">크게</button> <button class="no_text_resize" onclick="font_resize('container', 'increase');">크게</button>
<button id="text_decrease" class="no_text_resize">작게</button> <button class="no_text_resize" onclick="font_resize('container', 'decrease');">작게</button>
</div> </div>

71
js/common.js
View File

@ -520,12 +520,12 @@ var win_poll = function(href) {
} }
/** /**
* 텍스트 크게 * 텍스트 리사이즈
**/ **/
function text_increase() function font_resize(id, act)
{ {
var $elements = $("#container *:visible"); var $elements = $("#"+id+" *");
var mode = "increase"; $elements.removeClass("applied");
$elements.each(function() { $elements.each(function() {
if($(this).hasClass("no_text_resize")) if($(this).hasClass("no_text_resize"))
@ -534,44 +534,21 @@ function text_increase()
if($(this).children().length != 0) { if($(this).children().length != 0) {
return true; return true;
} else { } else {
set_font_size($(this), act);
// 텍스트 노드가 있는 경우 부모에 스타일 적용
var $parent = $(this).parent(); var $parent = $(this).parent();
var text = $parent.contents().filter(function() { var text = $parent.contents().filter(function() {
return this.nodeType == 3; return this.nodeType == 3;
}).text().replace(/\s*/, ""); }).text().replace(/\s*/, "");
if(text.length) { if(text.length) {
font_resize($parent, mode); // 텍스트노드와 형제가 있을 경우 마지막 형제엘리먼트에 스타일 적용 후 부모에 스타일 적용
} else { var $child = $parent.children();
font_resize($(this), mode); var chdlen = $child.length;
} if(chdlen == ($child.index($(this)) + 1)) {
} set_font_size($parent, act);
}); }
}
/**
* 텍스트 작게
**/
function text_decrease()
{
var $elements = $("#container *:visible");
var mode = "decrease";
$elements.each(function() {
if($(this).hasClass("no_text_resize"))
return true;
if($(this).children().length != 0) {
return true;
} else {
var $parent = $(this).parent();
var text = $parent.contents().filter(function() {
return this.nodeType == 3;
}).text().replace(/\s*/, "");
if(text.length) {
font_resize($parent, mode);
} else {
font_resize($(this), mode);
} }
} }
}); });
@ -579,10 +556,13 @@ function text_decrease()
/** /**
* 텍스트 resize * font size 적용
**/ **/
function font_resize(el, mode) function set_font_size(el, act)
{ {
if(el.hasClass("applied"))
return true;
var x = 0; var x = 0;
var fs = el.css("font-size"); var fs = el.css("font-size");
var unit = fs.replace(/[0-9\.]/g, ""); var unit = fs.replace(/[0-9\.]/g, "");
@ -595,7 +575,7 @@ function font_resize(el, mode)
if(unit == "em") if(unit == "em")
x = 1; x = 1;
if(mode == "increase") { if(act == "increase") {
nfsize = (fsize * 1.2); nfsize = (fsize * 1.2);
} else { } else {
nfsize = (fsize / 1.2); nfsize = (fsize / 1.2);
@ -603,7 +583,7 @@ function font_resize(el, mode)
nfsize = nfsize.toFixed(x); nfsize = nfsize.toFixed(x);
el.css("font-size", nfsize+unit); el.css("font-size", nfsize+unit).addClass("applied");
} }
@ -696,15 +676,4 @@ $(function(){
$('.sv').removeClass('sv_on'); $('.sv').removeClass('sv_on');
} }
}); });
// 텍스트 리사이즈
$("#text_increase").click(function() {
text_increase();
return false;
});
$("#text_decrease").click(function() {
text_decrease();
return false;
});
}); });