svnno****@sourc*****
svnno****@sourc*****
2013年 3月 3日 (日) 10:49:52 JST
Revision: 940
http://sourceforge.jp/projects/p2-php/scm/svn/commits/940
Author: akid
Date: 2013-03-03 10:49:51 +0900 (Sun, 03 Mar 2013)
Log Message:
-----------
p2/ showHtmlPopUp()のsandbox引数忘れを修正。
Modified Paths:
--------------
p2/trunk/js/htmlpopup.js
-------------- next part --------------
Modified: p2/trunk/js/htmlpopup.js
===================================================================
--- p2/trunk/js/htmlpopup.js 2013-03-01 07:03:11 UTC (rev 939)
+++ p2/trunk/js/htmlpopup.js 2013-03-03 01:49:51 UTC (rev 940)
@@ -15,7 +15,7 @@
gHtmlPopupMouseY = 0;
gShowHtmlTimerID = null;
-gNodePopup = null; // iframe\x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9div\x97v\x91f
+gNodePopup = null; // iframe\x82̂\xBD\x82߂̗v\x91f
//gNodeClose = null; // \x81~\x82\xF0\x8Ai\x94[\x82\xB7\x82\xE9div\x97v\x91f
iResizable = null;
@@ -28,7 +28,7 @@
*
* @access public
*/
-function showHtmlPopUp(url, ev, showHtmlDelaySec)
+function showHtmlPopUp(url, ev, showHtmlDelaySec, sandbox)
{
if (!document.createElement) { return; } // DOM\x94\xF1\x91Ή\x9E\x82Ȃ甲\x82\xAF\x82\xE9
@@ -73,11 +73,11 @@
*/
function showHtmlPopUpDo()
{
-
// \x82\xA0\x82炩\x82\xB6\x82ߊ\xF9\x91\xB6\x82\xCCHTML\x83|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x95‚\xB6\x82Ă\xA8\x82\xAD
hideHtmlPopUp(null, true);
gHtmlPopupUrl = tHtmlPopupUrl;
+
var popup_x_adjust = 7; // popup(iframe)\x82\xCCx\x8E\xB2\x88ʒu\x92\xB2\x90\xAE
var closebox_width = 18; // \x81~\x82̉\xA1\x95\x9D
var adjust_for_scrollbar = 22; // 22 \x83X\x83N\x83\x8D\x81[\x83\x8B\x83o\x81[\x82\xF0\x8Dl\x97\xB6\x82\xB5\x82ď\xAD\x82\xB5\x8F\xAC\x82\xB3\x96ڂɔ\x{1D2C90}\xAE
@@ -331,7 +331,6 @@
{
if (gShowHtmlTimerID) { clearTimeout(gShowHtmlTimerID); } // HTML\x95\\x8E\xA6\x83f\x83B\x83\x8C\x83C\x83^\x83C\x83}\x81[\x82\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9
-
if (gNodePopup) {
gNodePopup.style.visibility = "hidden";
gNodePopup.parentNode.removeChild(gNodePopup);
@@ -348,13 +347,12 @@
}
/**
- * HTML\x95\\x8E\xA6\x83^\x83C\x83}\x81[\x82\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9
+ * HTML\x95\\x8E\xA6\x83f\x83B\x83\x8C\x83C\x83^\x83C\x83}\x81[\x82\xAA\x82\xA0\x82\xEA\x82Ή\xF0\x8F\x9C\x82\xB7\x82\xE9
*
* (p)\x82\xCC onMouseout \x82ŌĂяo\x82\xB3\x82\xEA\x82\xE9
*/
function offHtmlPopUp()
{
- // HTML\x95\\x8E\xA6\x83f\x83B\x83\x8C\x83C\x83^\x83C\x83}\x81[\x82\xAA\x82\xA0\x82\xEA\x82Ή\xF0\x8F\x9C\x82\xB5\x82Ă\xA8\x82\xAD
if (gShowHtmlTimerID) {
clearTimeout(gShowHtmlTimerID);
}