From 0266ea3066fb043653d95feb755973cf1892a256 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Tue, 29 Jan 2013 21:45:24 +0100
Subject: [PATCH] Added a checkbox to ignore global settings

---
 src/locales/en.json            | 1 +
 src/static/js/collab_client.js | 3 ++-
 src/static/js/pad_editor.js    | 4 ++++
 src/templates/pad.html         | 4 ++++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/locales/en.json b/src/locales/en.json
index 8d6f67491..fb33ad240 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -35,6 +35,7 @@
   "pad.settings.globalView": "Global View",
   "pad.settings.globalView.warning": "Warning: This will affect everyone's view of this pad.",
   "pad.settings.language": "Language:",
+  "pad.settings.ignoreglobal": "Ignore global settings",
   "pad.importExport.import_export": "Import/Export",
   "pad.importExport.import": "Upload any text file or document",
   "pad.importExport.importSuccessful": "Successful!",
diff --git a/src/static/js/collab_client.js b/src/static/js/collab_client.js
index 5bc0383dd..393c9d768 100644
--- a/src/static/js/collab_client.js
+++ b/src/static/js/collab_client.js
@@ -426,7 +426,8 @@ function getCollabClient(ace2editor, serverVars, initialUserInfo, options, _pad)
     }
     else if (msg.type == "GLOBAL_SETTING_CHANGED")
     {
-      pad.changeViewOption(msg.setting, msg.value, true);
+      if(!pad.padOptions.ignoreGlobalSettings)
+        pad.changeViewOption(msg.setting, msg.value, true);
     }
     else if (msg.type == "SERVER_MESSAGE")
     {
diff --git a/src/static/js/pad_editor.js b/src/static/js/pad_editor.js
index aa152c4b2..1b55bb71b 100644
--- a/src/static/js/pad_editor.js
+++ b/src/static/js/pad_editor.js
@@ -86,6 +86,10 @@ var padeditor = (function()
       {
         pad.collabClient.changeGlobalSetting("showAuthorColors", $("#options-global-colorscheck").prop('checked'));
       });
+      padutils.bindCheckboxChange($("#options-ignore-global"), function()
+      {
+        pad.padOptions.ignoreGlobalSettings = $("#options-ignore-global").prop('checked');
+      });
       $("#global-viewfontmenu").change(function()
       {
         pad.collabClient.changeGlobalSetting("useMonospaceFont", $("#global-viewfontmenu").val() == 'monospace');
diff --git a/src/templates/pad.html b/src/templates/pad.html
index e966ac88d..cd6e950a6 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-ignore-global">
+                    <label for="options-ignore-global" data-l10n-id="pad.settings.ignoreglobal"></label>
+                </p>
                 <% e.end_block(); %>
                 <table>
                     <% e.begin_block("mySettings.dropdowns"); %>