use the new maxNoticeLength and maxUrlLength functionality introduced in commit 14adb...

[quix0rs-gnu-social.git] / plugins / ClientSideShorten / shorten.js

diff --git a/plugins/ClientSideShorten/shorten.js b/plugins/ClientSideShorten/shorten.js
index 0db78eceaf82962f32edbdb3cc0ab93b5674f5b8..bdffb81e266da08c33b7c4a31966f191b79208f0 100644 (file)
--- a/plugins/ClientSideShorten/shorten.js
+++ b/plugins/ClientSideShorten/shorten.js
@@ -31,32 +31,45 @@
 
     })(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);
-        var original = $noticeDataText.val();
-        shortenAjax = $.ajax({
-            url: $('address .url')[0].href+'/plugins/ClientSideShorten/shorten',
-            data: { text: $noticeDataText.val() },
-            dataType: 'text',
-            success: function(data) {
-                if(original == $noticeDataText.val()) {
-                    $noticeDataText.val(data).keyup();
+        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',
+                data: { text: $noticeDataText.val() },
+                dataType: 'text',
+                success: function(data) {
+                    if(original == $noticeDataText.val()) {
+                        $noticeDataText.val(data).keyup();
+                    }
                 }
-            }
-        });
+            });
+        }
     }
 
     $(document).ready(function(){
         $noticeDataText = $('#'+SN.C.S.NoticeDataText);
         $noticeDataText.smartkeypress(function(e){
-            if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
+            //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
             if(e.charCode == '32') {
                 shorten();
             }
         });
         $noticeDataText.bind('paste', function() {
-            if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
+            //if(typeof(shortenAjax) !== 'undefined') shortenAjax.abort();
             setTimeout(shorten,1);
         });
     });