Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
b299843618
|
@ -51,8 +51,10 @@ class ClientSideShortenPlugin extends Plugin
|
|||
}
|
||||
|
||||
function onEndShowScripts($action){
|
||||
$action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
|
||||
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');
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,10 +31,21 @@
|
|||
|
||||
})(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()
|
||||
{
|
||||
$noticeDataText = $('#'+SN.C.S.NoticeDataText);
|
||||
if(Notice_maxContent > 0 && $noticeDataText.val().length > Notice_maxContent){
|
||||
var $noticeDataText = $('#'+SN.C.S.NoticeDataText);
|
||||
var noticeText = $noticeDataText.val();
|
||||
|
||||
if(noticeText.length > maxNoticeLength || longestWordInString(noticeText) > maxUrlLength) {
|
||||
var original = $noticeDataText.val();
|
||||
shortenAjax = $.ajax({
|
||||
url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',
|
||||
|
|
Loading…
Reference in New Issue
Block a user