fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-09 11:44:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1732 inconsistent 'target' attribute in popup menus

Browse source
This commit is contained in:
Kijin Sung 2021-06-19 22:30:18 +09:00
parent 865e83a46a
commit 856f2af743
5 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

29
common/js/common.js
View file

@ -215,20 +215,23 @@
var classText = 'class="' + (classname ? classname : (act ? (act + ' ') : '')); var classText = 'class="' + (classname ? classname : (act ? (act + ' ') : ''));
var styleText = ""; var styleText = "";
var click_str = ""; var click_str = "";
var matches = [];
/* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */ /* if(icon) styleText = " style=\"background-image:url('"+icon+"')\" "; */
switch(target) { if (target === 'popup') {
case "popup" : click_str = 'onclick="popopen(this.href, \''+target+'\'); return false;"';
click_str = 'onclick="popopen(this.href, \''+target+'\'); return false;"'; classText += 'popup ';
classText += 'popup '; } else if (target === 'javascript') {
break; click_str = 'onclick="'+url+'; return false; "';
case "javascript" : classText += 'javascript ';
click_str = 'onclick="'+url+'; return false; "'; url = '#';
classText += 'script '; } else if (target.match(/^_(self|blank|parent|top)$/)) {
url='#'; click_str = 'target="' + target + '"';
break; classText += 'frame_' + target + ' ';
default : } else if (matches = target.match(/^i?frame:([a-zA-Z0-9_]+)$/)) {
click_str = 'target="_blank"'; click_str = 'target="' + matches[1] + '"';
break; classText += 'frame_' + matches[1] + ' ';
} else {
click_str = 'target="_blank"';
} }
classText = classText.trim() + '" '; classText = classText.trim() + '" ';

2
modules/comment/comment.controller.php
View file

@ -1720,7 +1720,7 @@ class commentController extends comment
* @param strgin $target * @param strgin $target
* @return void * @return void
*/ */
function addCommentPopupMenu($url, $str, $icon = '', $target = 'self') function addCommentPopupMenu($url, $str, $icon = '', $target = '_blank')
{ {
$comment_popup_menu_list = Context::get('comment_popup_menu_list'); $comment_popup_menu_list = Context::get('comment_popup_menu_list');
if(!is_array($comment_popup_menu_list)) if(!is_array($comment_popup_menu_list))

2
modules/document/document.controller.php
View file

@ -2736,7 +2736,7 @@ class documentController extends document
* @param string $target * @param string $target
* @return void * @return void
*/ */
function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self') function addDocumentPopupMenu($url, $str, $icon = '', $target = '_blank')
{ {
$document_popup_menu_list = Context::get('document_popup_menu_list'); $document_popup_menu_list = Context::get('document_popup_menu_list');
if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array(); if(!is_array($document_popup_menu_list)) $document_popup_menu_list = array();

2
modules/member/member.controller.php
View file

@ -2585,7 +2585,7 @@ class memberController extends member
/** /**
* Nickname and click Log In to add a pop-up menu that appears when the method * Nickname and click Log In to add a pop-up menu that appears when the method
*/ */
function addMemberPopupMenu($url, $str, $icon = '', $target = 'self', $class = '') function addMemberPopupMenu($url, $str, $icon = '', $target = '_blank', $class = '')
{ {
$member_popup_menu_list = Context::get('member_popup_menu_list'); $member_popup_menu_list = Context::get('member_popup_menu_list');
if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array(); if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();

6
modules/member/member.model.php
View file

@ -161,7 +161,7 @@ class memberModel extends member
if($logged_info->member_srl) if($logged_info->member_srl)
{ {
$url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl); $url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
$oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self'); $oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path);
} }
// When click other's nickname // When click other's nickname
@ -215,13 +215,13 @@ class memberModel extends member
// View homepage info // View homepage info
if($member_info->homepage && $homepage_is_public) if($member_info->homepage && $homepage_is_public)
{ {
$oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', 'blank', 'homepage'); $oMemberController->addMemberPopupMenu(escape($member_info->homepage, false), 'homepage', '', '_blank', 'homepage');
} }
// View blog info // View blog info
if($member_info->blog && $blog_is_public) if($member_info->blog && $blog_is_public)
{ {
$oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', 'blank', 'blog'); $oMemberController->addMemberPopupMenu(escape($member_info->blog, false), 'blog', '', '_blank', 'blog');
} }
// Call a trigger (after) // Call a trigger (after)