From 760e1b82c35598d7064ce8dee5421adcf2053ff7 Mon Sep 17 00:00:00 2001
From: Marcel Klehr <mklehr@gmx.net>
Date: Tue, 5 Mar 2013 23:12:00 +0100
Subject: [PATCH] Add a setting for RTL text direction (integrating the url
 paramter)

Fixes #1191
---
 doc/api/embed_parameters.md |  6 ++++++
 src/locales/en.json         |  1 +
 src/static/js/pad.js        |  2 +-
 src/static/js/pad_editor.js | 22 ++++++++++++++++++++--
 src/templates/pad.html      |  4 ++++
 5 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/doc/api/embed_parameters.md b/doc/api/embed_parameters.md
index 3100fff9d..dcbe3e5b3 100644
--- a/doc/api/embed_parameters.md
+++ b/doc/api/embed_parameters.md
@@ -60,3 +60,9 @@ Default: en
 
 Example: `lang=ar` (translates the interface into Arabic)
 
+## rtl
+ * Boolean
+ 
+Default: true
+Displays pad text from right to left.
+
diff --git a/src/locales/en.json b/src/locales/en.json
index bef6dfd05..920a2b003 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -29,6 +29,7 @@
   "pad.settings.stickychat": "Chat always on screen",
   "pad.settings.colorcheck": "Authorship colors",
   "pad.settings.linenocheck": "Line numbers",
+  "pad.settings.rtlcheck": "Read content from right to left?",
   "pad.settings.fontType": "Font type:",
   "pad.settings.fontType.normal": "Normal",
   "pad.settings.fontType.monospaced": "Monospace",
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 6e8b2ae01..4b0526208 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -313,7 +313,7 @@ function handshake()
       
       if (settings.rtlIsTrue == true)
       {
-        pad.changeViewOption('rtl', true);
+        pad.changeViewOption('rtlIsTrue', true);
       }
 
       // If the Monospacefont value is set to true then change it to monospace.
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index dd0cbbbb7..b73409ff3 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -62,20 +62,36 @@ var padeditor = (function()
     },
     initViewOptions: function()
     {
+      // Line numbers
       padutils.bindCheckboxChange($("#options-linenoscheck"), function()
       {
         pad.changeViewOption('showLineNumbers', padutils.getCheckbox($("#options-linenoscheck")));
       });
+
+      // Author colors
       padutils.bindCheckboxChange($("#options-colorscheck"), function()
       {
         padcookie.setPref('showAuthorshipColors', padutils.getCheckbox("#options-colorscheck"));
         pad.changeViewOption('showAuthorColors', padutils.getCheckbox("#options-colorscheck"));
       });
+
+      // Right to left
+      padutils.bindCheckboxChange($("#options-rtlcheck"), function()
+      {
+        pad.changeViewOption('rtlIsTrue', padutils.getCheckbox($("#options-rtlcheck")))
+      });
+      html10n.bind('localized', function() {
+        pad.changeViewOption('rtlIsTrue', ('rtl' == html10n.getDirection()));
+        padutils.setCheckbox($("#options-rtlcheck"), ('rtl' == html10n.getDirection()));
+      })
+
+      // font face
       $("#viewfontmenu").change(function()
       {
         pad.changeViewOption('useMonospaceFont', $("#viewfontmenu").val() == 'monospace');
       });
       
+      // Language
       html10n.bind('localized', function() {
         $("#languagemenu").val(html10n.getLanguage());
         // translate the value of 'unnamed' and 'Enter your name' textboxes in the userlist
@@ -104,12 +120,14 @@ var padeditor = (function()
         if (value == "false") return false;
         return defaultValue;
       }
-      self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue);
 
       var v;
 
-      v = getOption('rtlIsTrue', false);
+      v = getOption('rtlIsTrue', ('rtl' == html10n.getDirection()));
+      // Override from parameters if true
+      if(settings.rtlIsTrue === true) v = true;
       self.ace.setProperty("rtlIsTrue", v);
+      padutils.setCheckbox($("#options-rtlcheck"), v);
 
       v = getOption('showLineNumbers', true);
       self.ace.setProperty("showslinenumbers", v);
diff --git a/src/templates/pad.html b/src/templates/pad.html
index 76df5133c..1d8c069a5 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -217,6 +217,10 @@
                     <input type="checkbox" id="options-linenoscheck" checked>
                     <label for="options-linenoscheck" data-l10n-id="pad.settings.linenocheck"></label>
                 </p>
+                <p>
+                    <input type="checkbox" id="options-rtlcheck">
+                    <label for="options-rtlcheck" data-l10n-id="pad.settings.rtlcheck"></label>
+                </p>
                 <% e.end_block(); %>
                 <table>
                     <% e.begin_block("mySettings.dropdowns"); %>