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

plugins/DirectionDetector/DirectionDetectorPlugin.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * DirectionDetector plugin, detects notices with RTL content & sets RTL
  * style for them.
@@ -28,7 +29,7 @@ if (!defined('STATUSNET')) {
     exit(1);
 }
 
-define('DIRECTIONDETECTORPLUGIN_VERSION', '0.1.2');
+define('DIRECTIONDETECTORPLUGIN_VERSION', '0.2.0');
 
 class DirectionDetectorPlugin extends Plugin {
     /**
@@ -36,7 +37,7 @@ class DirectionDetectorPlugin extends Plugin {
      *
      * @param object $notice notice is going to be saved
      */
-	public function onStartNoticeSave(&$notice){
+    public function onStartNoticeSave($notice){
         if(!preg_match('/<span class="rtl">/', $notice->rendered) && self::isRTL($notice->content))
             $notice->rendered = '<span class="rtl">'.$notice->rendered.'</span>';
         return true;
@@ -45,31 +46,55 @@ class DirectionDetectorPlugin extends Plugin {
     /**
      * SN plugin API, here we will add css needed for modifiyed rendered
      *
-	 * @param
+     * @param Action $xml
      */
     public function onEndShowStatusNetStyles($xml){
-		$xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;width:490px;} .notice .author {float:left}');
+        $xml->element('style', array('type' => 'text/css'), 'span.rtl {display:block;direction:rtl;text-align:right;float:right;} .notice .author {float:left}');
     }
+
     /**
-	 * checks that passed string is a RTL language or not
+     * is passed string a rtl content or not
      *
-	 * @param string $str String to be checked
+     * @param string $content
+     * @return boolean
      */
-	public static function isRTL($str){
+    public static function isRTL($content){
-		self::getClearText($str);
+        $content = self::getClearText($content);
+        $words = explode(' ', $content);
+        $rtl = 0;
+        foreach($words as $str)
+            if(self::startsWithRTLCharacter($str))
+                $rtl++;
+            else
+                $rtl--;
+        if($rtl>0)// if number of rtl words is more than ltr words so it's a rtl content
+            return true;
+        elseif($rtl==0)
+            // check first word again
+            return self::startsWithRTLCharacter($words[0]);
+        return false;
+    }
+
+    /**
+     * checks that passed string starts with a RTL language or not
+     *
+     * @param string $str
+     * @return boolean
+     */
+    public static function startsWithRTLCharacter($str){
         if( is_array($cc = self::utf8ToUnicode(mb_substr($str, 0, 1, 'utf-8'))) )
             $cc = $cc[0];
         else
             return false;
-		if($cc>=1536 && $cc<=1791) // Arabic, Persian, Urdu, Kurdish, ...
+        if($cc>=1536 && $cc<=1791) // arabic, persian, urdu, kurdish, ...
             return true;
-		if($cc>=65136 && $cc<=65279) // Arabic peresent 2
+        if($cc>=65136 && $cc<=65279) // arabic peresent 2
             return true;
-		if($cc>=64336 && $cc<=65023) // Arabic peresent 1
+        if($cc>=64336 && $cc<=65023) // arabic peresent 1
             return true;
-		if($cc>=1424 && $cc<=1535) // Hebrew
+        if($cc>=1424 && $cc<=1535) // hebrew
             return true;
-		if($cc>=64256 && $cc<=64335) // Hebrew peresent
+        if($cc>=64256 && $cc<=64335) // hebrew peresent
             return true;
         if($cc>=1792 && $cc<=1871) // Syriac
             return true;
@@ -83,23 +108,37 @@ class DirectionDetectorPlugin extends Plugin {
     }
 
     /**
-	 * clears text from replies, tags, groups, repeats & whitespaces
+     * clears text from replys, tags, groups, reteets & whitespaces
      *
-	 * @param string &$str string to be cleared
+     * @param string $str
+     * @return string
      */
-	private static function getClearText(&$str){
+    private static function getClearText($str){
         $str = preg_replace('/@[^ ]+|![^ ]+|#[^ ]+/u', '', $str); // reply, tag, group
         $str = preg_replace('/^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]/u', '', $str); // redent, retweet
         $str = preg_replace("/[ \r\t\n]+/", ' ', trim($str)); // remove spaces
+        return $str;
     }
 
     /**
-	 * Takes a UTF-8 string and returns an array of ints representing the
+     * adds javascript to do same thing on input textarea
-	 * Unicode characters. Astral planes are supported i.e. the ints in the
-	 * output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
-	 * are not allowed. ### modified ### returns first character code
      *
-	 * Returns false if the input string isn't a valid UTF-8 octet sequence.
+     * @param Action $action
+     */
+    function onEndShowScripts($action){
+        if (common_logged_in()) {
+            $action->script('plugins/DirectionDetector/jquery.DirectionDetector.js');
+        }
+    }
+
+    /**
+     * Takes an UTF-8 string and returns an array of ints representing the
+     * Unicode characters. Astral planes are supported ie. the ints in the
+     * output can be > 0xFFFF. O$ccurrances of the BOM are ignored. Surrogates
+     * are not allowed.
+     *
+     * @param string $str
+     * @return mixed array of ints, or false on invalid input
      */
     private static function utf8ToUnicode($str){
         $mState = 0;	   // cached expected number of octets after the current octet
@@ -217,7 +256,6 @@ class DirectionDetectorPlugin extends Plugin {
             'name' => 'Direction detector',
             'version' => DIRECTIONDETECTORPLUGIN_VERSION,
             'author' => 'Behrooz Shabani',
-                        // TRANS: Direction detector plugin description.
             'rawdescription' => _m('Shows notices with right-to-left content in correct direction.')
         );
         return true;

plugins/DirectionDetector/jquery.DirectionDetector.js

@@ -0,0 +1,61 @@
+
+/**
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.	If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category     Plugin
+ * @package      StatusNet
+ * @author		 Behrooz shabani (everplays) - <behrooz@rock.com>
+ * @copyright    2009-2010 Behrooz shabani
+ * @license      http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ *
+ */
+
+(function($){
+	$.fn.isRTL = function(str){
+		if(typeof str != typeof "" || str.length<1)
+			return false;
+		var cc = str.charCodeAt(0);
+		if(cc>=1536 && cc<=1791) // arabic, persian, ...
+			return true;
+		if(cc>=65136 && cc<=65279) // arabic peresent 2
+			return true;
+		if(cc>=64336 && cc<=65023) // arabic peresent 1
+			return true;
+		if(cc>=1424 && cc<=1535) // hebrew
+			return true;
+		if(cc>=64256 && cc<=64335) // hebrew peresent
+			return true;
+		if(cc>=1792 && cc<=1871) // Syriac
+			return true;
+		if(cc>=1920 && cc<=1983) // Thaana
+			return true;
+		if(cc>=1984 && cc<=2047) // NKo
+			return true;
+		if(cc>=11568 && cc<=11647) // Tifinagh
+			return true;
+		return false;
+	};
+	$(document).ready(function(){
+		var tArea = $("#notice_data-text");
+		var tCleaner = new RegExp('@[^ ]+|![^ ]+|#[^ ]+|^RT[: ]{1}| RT | RT: |^RD[: ]{1}| RD | RD: |[♺♻:]+', 'g')
+		tArea.keyup(function(){
+			var cleaned = tArea.val().replace(tCleaner, '').replace(/^[ ]+/, '');
+			if($().isRTL(cleaned))
+				tArea.css('direction', 'rtl');
+			else
+				tArea.css('direction', 'ltr');
+		});
+	});
+})(jQuery);