wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only shorten when notice length exceeds max length

Browse Source
This commit is contained in:
Craig Andrews 2010-04-26 15:58:35 -04:00
parent 728a4961d1
commit edc6cf39a0
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/ClientSideShorten/ClientSideShortenPlugin.php
View File

@ -51,6 +51,7 @@ class ClientSideShortenPlugin extends Plugin
} }
function onEndShowScripts($action){ function onEndShowScripts($action){
$action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
if (common_logged_in()) { if (common_logged_in()) {
$action->script('plugins/ClientSideShorten/shorten.js'); $action->script('plugins/ClientSideShorten/shorten.js');
} }

26
plugins/ClientSideShorten/shorten.js
View File

@ -34,29 +34,31 @@
function shorten() function shorten()
{ {
$noticeDataText = $('#'+SN.C.S.NoticeDataText); $noticeDataText = $('#'+SN.C.S.NoticeDataText);
var original = $noticeDataText.val(); if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){
shortenAjax = $.ajax({ var original = $noticeDataText.val();
url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', shortenAjax = $.ajax({
data: { text: $noticeDataText.val() }, url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',
dataType: 'text', data: { text: $noticeDataText.val() },
success: function(data) { dataType: 'text',
if(original == $noticeDataText.val()) { success: function(data) {
$noticeDataText.val(data).keyup(); if(original == $noticeDataText.val()) {
$noticeDataText.val(data).keyup();
}
} }
} });
}); }
} }
$(document).ready(function(){ $(document).ready(function(){
$noticeDataText = $('#'+SN.C.S.NoticeDataText); $noticeDataText = $('#'+SN.C.S.NoticeDataText);
$noticeDataText.smartkeypress(function(e){ $noticeDataText.smartkeypress(function(e){
if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
if(e.charCode == '32') { if(e.charCode == '32') {
shorten(); shorten();
} }
}); });
$noticeDataText.bind('paste', function() { $noticeDataText.bind('paste', function() {
if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort(); //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
setTimeout(shorten,1); setTimeout(shorten,1);
}); });
}); });

2
plugins/ClientSideShorten/shorten.php
View File

@ -61,7 +61,7 @@ class ShortenAction extends Action
{ {
parent::handle($args); parent::handle($args);
header('Content-Type: text/plain'); header('Content-Type: text/plain');
$shortened_text = common_shorten_links($this->text, true); $shortened_text = common_shorten_links($this->text);
print $shortened_text; print $shortened_text;
} }
} }