Merge commit '154fc79e99' into develop

Conflicts:
	classes/security/EmbedFilter.class.php
	common/js/common.js
	common/js/xe.min.js
	config/config.inc.php
This commit is contained in:
bnu 2014-01-06 11:23:59 +09:00
commit 711cd1ea35
6 changed files with 12 additions and 37 deletions

View file

@ -143,11 +143,6 @@ if(jQuery) jQuery.noConflict();
/* jQuery(document).ready() */
jQuery(function($) {
// Anchor: focus move to target
$('a[href^="#"]').click(function(){
$($(this).attr('href')).attr('tabindex','0').focus();
});
/* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */
if($.browser.msie) {
$('select').each(function(i, sels) {