svnno****@sourc*****
svnno****@sourc*****
2013年 7月 3日 (水) 08:55:30 JST
Revision: 964 http://sourceforge.jp/projects/p2-php/scm/svn/commits/964 Author: akid Date: 2013-07-03 08:55:30 +0900 (Wed, 03 Jul 2013) Log Message: ----------- Modified Paths: -------------- p2/trunk/doc/ChangeLog.txt p2/trunk/iphone/sb_footer_k.inc.php p2/trunk/js/order.js p2/trunk/js/setfavjs.js -------------- next part -------------- Modified: p2/trunk/doc/ChangeLog.txt =================================================================== --- p2/trunk/doc/ChangeLog.txt 2013-07-02 23:52:13 UTC (rev 963) +++ p2/trunk/doc/ChangeLog.txt 2013-07-02 23:55:30 UTC (rev 964) @@ -1,4 +1,4 @@ -2013/06/14 +2013/06/24 * rep2 version 1.8.91 [\x8FC\x90\xB3] \x8F\x91\x82\xAB\x8D\x9E\x82\xE3\x82ɁA\x91O\x89\xAB\x8D\x9E\x82\x81\x83b\x83Z\x81[\x83W\x82\xAA\x8F\x91\x82\xAB\x8D\x9E\x82ݗ\x93\x82ɂ\xBB\x82̂܂c\x82\xC1\x82Ă\xB5\x82܂\xA4\x82\xB1\x82Ƃ\xAA\x82\xA0\x82\xC1\x82\xBD\x82̂\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B Modified: p2/trunk/iphone/sb_footer_k.inc.php =================================================================== --- p2/trunk/iphone/sb_footer_k.inc.php 2013-07-02 23:52:13 UTC (rev 963) +++ p2/trunk/iphone/sb_footer_k.inc.php 2013-07-02 23:55:30 UTC (rev 964) @@ -27,7 +27,7 @@ $qs = array_merge($word_qs, $qs); $tugi_ht = P2View::tagA( UriUtil::buildQueryUri($_conf['subject_php'], $qs), - hs("\x8E\x9F") // {$_conf['k_accesskey']['next']}.\x8E\x9F + hs('\x8E\x9F') // {$_conf['k_accesskey']['next']}.\x8E\x9F //,array($_conf['accesskey_for_k'] => $_conf['k_accesskey']['next']) ); } Modified: p2/trunk/js/order.js =================================================================== --- p2/trunk/js/order.js 2013-07-02 23:52:13 UTC (rev 963) +++ p2/trunk/js/order.js 2013-07-02 23:55:30 UTC (rev 964) @@ -3,9 +3,9 @@ //// // makeOptionList // -function makeOptionList(fidx) +function makeOptionList(form_idx) { - if (fidx == null) { fidx = 0; } + if (form_idx == null) {fidx = 0;} var val = ""; for (j=0; j<document.form[fidx].length; j++) { if (val > "") { val += ","; } @@ -19,9 +19,9 @@ //// // submitApply // -function submitApply(fidx) +function submitApply(form_idx) { - if (fidx == null) { fidx = 0; } + if (form_idx == null) {fidx = 0;} document.form['list'].value = makeOptionList(fidx); document.form.submit(); } @@ -29,9 +29,9 @@ //// // order // -function order(action, fidx) +function order(action,form_idx) { - if (fidx == null) {fidx = 0;} + if (form_idx == null){fidx = 0;} sel = document.form[fidx].selectedIndex; if (sel != -1 && document.form[fidx].options[sel].value > "") { selText = document.form[fidx].options[sel].text; Modified: p2/trunk/js/setfavjs.js =================================================================== --- p2/trunk/js/setfavjs.js 2013-07-02 23:52:13 UTC (rev 963) +++ p2/trunk/js/setfavjs.js 2013-07-02 23:55:30 UTC (rev 964) @@ -1,63 +1,63 @@ -//// -// \x82\xA8\x8BC\x82ɃZ\x83b\x83g\x8A\x94 -// setFavJs('host={$aThread->host}&bbs={$aThread->bbs}&key={$aThread->key}{$ttitle_en_q}{$sid_q}', '{$favvalue}',{$STYLE['info_pop_size']}, this); -// -function setFavJs(tquery, favvalue, info_pop_width, info_pop_height, page, obj) -{ - // read.php\x82ł́A\x83y\x81[\x83W\x82̓ǂݍ\x9E\x82݂\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82A\x82Ȃɂ\xE0\x82\xB5\x82Ȃ\xA2 - // \x81iread.php \x82͓ǂݍ\x9E\x82݊\xAE\x97\xB9\x8E\x9E\x82\xC9idx\x8BL\x98^\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82邽\x82߁j - if ((page == 'read') && !gIsPageLoaded) { - return false; - } - - var xmlHttpObj = getXmlHttp(); - if (!xmlHttpObj) { - // alert("Error: XMLHTTP \x92ʐM\x83I\x83u\x83W\x83F\x83N\x83g\x82̍쐬\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B") ; - // XMLHTTP\x81i\x82\xC6innerHTML\x81j \x82ɖ\xA2\x91Ή\x9E\x82Ȃ珬\x91\x8B\x82\xC5 - infourl = 'info.php?' + tquery + '&setfav=' + favvalue + '&popup=2'; - return !openSubWin(infourl,info_pop_width,info_pop_height,0,0); - } - - url = 'httpcmd.php?' + tquery + '&setfav=' + favvalue + '&cmd=setfav'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8 - - var res = getResponseTextHttp(xmlHttpObj, url, 'nc'); - var rmsg = ""; - if (res) { - if (res == '1') { - rmsg = '\x8A\xAE\x97\xB9'; - } - if (rmsg) { - if (favvalue == '1') { - nextset = '0'; - favmark = '\x81\x9A'; - favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82\xA9\x82\xE7\x8AO\x82\xB7'; - } else { - nextset = '1'; - favmark = '+'; - favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1'; - } - if (obj.className) { - objClass = ' class="' + obj.className + '"'; - } else { - objClass = ''; - } - if (page != 'subject') { - favstr = '\x82\xA8\x8BC\x82\xC9'; - } else { - favstr = ''; - } - var favhtm = '<a' + objClass + ' href="info.php?' + tquery + '&setfav=' + nextset + '" target="info" onClick="return setFavJs(\'' + tquery + '\', \''+nextset+'\', '+info_pop_width+', '+info_pop_height+', \'' + page + '\', this);" title="' + favtitle + '">' + favstr + favmark + '</a>'; - if (page != 'read') { - obj.parentNode.innerHTML = favhtm; - } else { - var span = document.getElementsByTagName('span'); - for (var i = 0; i < span.length; i++) { - if (span[i].className == 'setfav') { - span[i].innerHTML = favhtm; - } - } - } - } - } - return false; -} +//// +// \x82\xA8\x8BC\x82ɃZ\x83b\x83g\x8A\x94 +// setFavJs('host={$aThread->host}&bbs={$aThread->bbs}&key={$aThread->key}{$ttitle_en_q}{$sid_q}', '{$favvalue}',{$STYLE['info_pop_size']}, this); +// +function setFavJs(tquery, favvalue, info_pop_width, info_pop_height, page, obj) +{ + // read.php\x82ł́A\x83y\x81[\x83W\x82̓ǂݍ\x9E\x82݂\xAA\x8A\xAE\x97\xB9\x82\xB5\x82Ă\xA2\x82Ȃ\xAF\x82\xEA\x82A\x82Ȃɂ\xE0\x82\xB5\x82Ȃ\xA2 + // \x81iread.php \x82͓ǂݍ\x9E\x82݊\xAE\x97\xB9\x8E\x9E\x82\xC9idx\x8BL\x98^\x82\xAA\x90\xB6\x90\xAC\x82\xB3\x82\xEA\x82邽\x82߁j + if ((page == 'read') && !gIsPageLoaded) { + return false; + } + + var xmlHttpObj = getXmlHttp(); + if (!xmlHttpObj) { + // alert("Error: XMLHTTP \x92ʐM\x83I\x83u\x83W\x83F\x83N\x83g\x82̍쐬\x82Ɏ\xB8\x94s\x82\xB5\x82܂\xB5\x82\xBD\x81B") ; + // XMLHTTP\x81i\x82\xC6innerHTML\x81j \x82ɖ\xA2\x91Ή\x9E\x82Ȃ珬\x91\x8B\x82\xC5 + infourl = 'info.php?' + tquery + '&setfav=' + favvalue + '&popup=2'; + return !openSubWin(infourl,info_pop_width,info_pop_height,0,0); + } + + url = 'httpcmd.php?' + tquery + '&setfav=' + favvalue + '&cmd=setfav'; // \x83X\x83N\x83\x8A\x83v\x83g\x82ƁA\x83R\x83}\x83\x93\x83h\x8Ew\x92\xE8 + + var res = getResponseTextHttp(xmlHttpObj, url, 'nc'); + var rmsg = ""; + if (res) { + if (res == '1') { + rmsg = '\x8A\xAE\x97\xB9'; + } + if (rmsg) { + if (favvalue == '1') { + nextset = '0'; + favmark = '\x81\x9A'; + favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82\xA9\x82\xE7\x8AO\x82\xB7'; + } else { + nextset = '1'; + favmark = '+'; + favtitle = '\x82\xA8\x8BC\x82ɃX\x83\x8C\x82ɒlj\xC1'; + } + if (obj.className) { + objClass = ' class="' + obj.className + '"'; + } else { + objClass = ''; + } + if (page != 'subject') { + favstr = '\x82\xA8\x8BC\x82\xC9'; + } else { + favstr = ''; + } + var favhtm = '<a' + objClass + ' href="info.php?' + tquery + '&setfav=' + nextset + '" target="info" onClick="return setFavJs(\'' + tquery + '\', \''+nextset+'\', '+info_pop_width+', '+info_pop_height+', \'' + page + '\', this);" title="' + favtitle + '">' + favstr + favmark + '</a>'; + if (page != 'read') { + obj.parentNode.innerHTML = favhtm; + } else { + var span = document.getElementsByTagName('span'); + for (var i = 0; i < span.length; i++) { + if (span[i].className == 'setfav') { + span[i].innerHTML = favhtm; + } + } + } + } + } + return false; +}