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

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source
This commit is contained in:
Brion Vibber 2010-05-04 09:15:37 -07:00
commit b299843618
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/ClientSideShorten/ClientSideShortenPlugin.php
View File

@ -51,8 +51,10 @@ 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()) {
$user = common_current_user();
$action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user));
$action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user));
$action->script('plugins/ClientSideShorten/shorten.js'); $action->script('plugins/ClientSideShorten/shorten.js');
} }
} }

15
plugins/ClientSideShorten/shorten.js
View File

@ -31,10 +31,21 @@
})(jQuery,'smartkeypress'); })(jQuery,'smartkeypress');
function longestWordInString(string)
{
var words = string.split(/\s/);
var longestWord = 0;
for(var i=0;i<words.length;i++)
if(words[i].length > longestWord) longestWord = words[i].length;
return longestWord;
}
function shorten() function shorten()
{ {
$noticeDataText = $('#'+SN.C.S.NoticeDataText); var $noticeDataText = $('#'+SN.C.S.NoticeDataText);
if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){ var noticeText = $noticeDataText.val();
if(noticeText.length > maxNoticeLength || longestWordInString(noticeText) > maxUrlLength) {
var original = $noticeDataText.val(); var original = $noticeDataText.val();
shortenAjax = $.ajax({ shortenAjax = $.ajax({
url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten', url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',