[Pkg-mozext-commits] [firebug] 41/59: Remove out enableSyntaxHighlighting.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firebug.

commit e57e0d34fe2fa601cf2ec9c37017d36e46a83b7b
Author: Farshid Beheshti <farshid.beheshti at gmail.com>
Date:   Sat Aug 9 13:33:37 2014 +0430

    Remove out enableSyntaxHighlighting.
---
 extension/content/firebug/editor/sourceEditor.js | 43 +++++++++---------------
 extension/defaults/preferences/firebug.js        |  1 -
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/extension/content/firebug/editor/sourceEditor.js b/extension/content/firebug/editor/sourceEditor.js
index e03a31d..0efcc58 100644
--- a/extension/content/firebug/editor/sourceEditor.js
+++ b/extension/content/firebug/editor/sourceEditor.js
@@ -186,10 +186,6 @@ SourceEditor.prototype =
         for (var prop in config)
             newConfig[prop] = Wrapper.cloneIntoContentScope(this.win, config[prop]);
 
-        // Is the user interested to disabel syntax highlighting? See Issue 7560.
-        if(!Options.get("enableSyntaxHighlighting"))
-            newConfig["maxHighlightLength"] = 0;
-
         Cu.makeObjectPropsNormal(newConfig);
 
         var self = this;
@@ -422,32 +418,23 @@ SourceEditor.prototype =
 
         Trace.sysout("sourceEditor.setText: " + type + " " + text, text);
 
-        if(Options.get("enableSyntaxHighlighting"))
-        {
-            // xxxHonza: the default 'mixedmode' mode should be set only if the text
-            // is actually a markup (first letter == '<'?). Note that applying mixed mode
-            // on plain JS doesn't work (no color syntax at all).
-            var mode = "htmlmixed";
-            switch (type)
-            {
-                case "js":
-                    mode = "javascript";
-                    break;
-                case "css":
-                    mode = "css";
-                    break;
-                case "xml":
-                    mode = "xml";
-                    break;
-            }
-            this.editorObject.setOption("mode", mode);
-        }
-        else
+        // xxxHonza: the default 'mixedmode' mode should be set only if the text
+        // is actually a markup (first letter == '<'?). Note that applying mixed mode
+        // on plain JS doesn't work (no color syntax at all).
+        var mode = "htmlmixed";
+        switch (type)
         {
-            // No need to set the mode for the source when the user
-            // doesn't want to see syntax highlighting.
-            this.editorObject.setOption("mode", "plain/text");
+            case "js":
+                mode = "javascript";
+                break;
+            case "css":
+                mode = "css";
+                break;
+            case "xml":
+                mode = "xml";
+                break;
         }
+        this.editorObject.setOption("mode", mode);
 
         text = text || "";
         this.editorObject.setValue(text);
diff --git a/extension/defaults/preferences/firebug.js b/extension/defaults/preferences/firebug.js
index 3ba0654..63c1197 100644
--- a/extension/defaults/preferences/firebug.js
+++ b/extension/defaults/preferences/firebug.js
@@ -27,7 +27,6 @@ pref("extensions.firebug.stringCropLength", 50);
 pref("extensions.firebug.hideDefaultInspector", false);
 pref("extensions.firebug.delayLoad", true);
 pref("extensions.firebug.clearAnnotationsConfirmation", true);
-pref("extensions.firebug.enableSyntaxHighlighting", true);
 
 // Remoting
 pref("extensions.firebug.serverHost", "localhost");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git