We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit ecf9dc6d authored by Craig Andrews's avatar Craig Andrews

use the new maxNoticeLength and maxUrlLength functionality introduced in...

use the new maxNoticeLength and maxUrlLength functionality introduced in commit 14adb7cc
parent 8c0f1197
......@@ -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',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment