fallback to newnotice on reply button, new button with mouseover
darcs-hash:20080709071439-84dde-f85f0e97f7c14bb77b7174f281e3e9f75c23cac1.gz
This commit is contained in:
parent
680738e053
commit
a7db6216fa
|
@ -94,6 +94,13 @@ class NewnoticeAction extends Action {
|
|||
|
||||
function show_form($msg=NULL) {
|
||||
$content = $this->trimmed('status_textarea');
|
||||
if (!$content) {
|
||||
$replyto = $this->trimmed('replyto');
|
||||
$profile = Profile::staticGet('nickname', $replyto);
|
||||
if ($profile) {
|
||||
$content = "@$profile ";
|
||||
}
|
||||
}
|
||||
common_show_header(_t('New notice'), NULL, $content,
|
||||
array($this, 'show_top'));
|
||||
if ($msg) {
|
||||
|
|
|
@ -19,14 +19,17 @@ $(document).ready(function(){
|
|||
// run once in case there's something in there
|
||||
counter();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
function doreply(nick) {
|
||||
rgx_username = /^[0-9a-zA-Z\-_.]*$/;
|
||||
if (nick.match(rgx_username)) {
|
||||
replyto = "@" + nick + " ";
|
||||
document.getElementById("status_textarea").value=replyto;
|
||||
document.getElementById("status_textarea").focus();
|
||||
if ($("#status_textarea")) {
|
||||
$("#status_textarea").value=replyto;
|
||||
$("#status_textarea").focus();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
|
@ -86,7 +86,6 @@ class StreamAction extends Action {
|
|||
'href' => $noticeurl,
|
||||
'title' => common_exact_date($notice->created)),
|
||||
common_date_string($notice->created));
|
||||
common_element('a', array('href' => "#", 'onclick' => 'javascript: doreply("'.$profile->nickname.'")', 'class' => 'replybutton'), 'reply');
|
||||
if ($replied_id) {
|
||||
$replyurl = common_local_url('shownotice', array('notice' => $replied_id));
|
||||
common_text('(');
|
||||
|
@ -95,6 +94,13 @@ class StreamAction extends Action {
|
|||
_t(' in reply to...'));
|
||||
common_text(')');
|
||||
}
|
||||
common_element('a',
|
||||
array('href' => common_local_url('newnotice',
|
||||
array('replyto' => $profile->nickname)),
|
||||
'onclick' => 'doreply("'.$profile->nickname.'")',
|
||||
'title' => _t('reply'),
|
||||
'class' => 'replybutton'),
|
||||
_t('↺'));
|
||||
common_element_end('p');
|
||||
common_element_end('li');
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user