Switching to minimal version highlight.min.js for AMO review.

Now in version 1.2.
Qeole · Sep 17, 2014 · 363d8c6 · 363d8c6
1 parent 6399c98
commit 363d8c6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@ Enlight
 
 Firefox add-on providing syntax highlighting for raw code, based on the highlight.js project.
 
-Syntax highlighting relies on highlight.js project (see [project homepage][1]. Currently packaged with the add-on is the version 8.2 of highlight.js, which provides 49 color themes and syntax for 92 languages.
+Syntax highlighting relies on highlight.js project (see [project homepage][1]. Currently packaged with the add-on is the version 8.2 of highlight.js, which provides 49 color themes and syntax for 22 languages.
 
 ## Install
 

diff --git a/data/highlightjs/highlight.min.js b/data/highlightjs/highlight.min.js
diff --git a/data/highlightjs/highlight.pack.js b/data/highlightjs/highlight.pack.js
diff --git a/data/panel.html b/data/panel.html
@@ -7,27 +7,43 @@
     <div class="lang" id=""><b>Autodetect</b></div>
     <div class="lang" id="nohighlight">None</div>
     <br />
+    <div class="lang" id="apache">Apache</div>
+    <div class="lang" id="bash">Bash</div>
+    <div class="lang" id="cpp">C, C++</div>
+    <div class="lang" id="cs">C#</div>
+    <div class="lang" id="coffeescript">CoffeeScript</div>
+    <div class="lang" id="css">CSS</div>
+    <div class="lang" id="diff">Diff</div>
+    <div class="lang" id="xml">HTML, XML</div>
+    <div class="lang" id="http">HTTP</div>
+    <div class="lang" id="ini">Ini</div>
+    <div class="lang" id="json">JSON</div>
+    <div class="lang" id="java">Java</div>
+    <div class="lang" id="javascript">JavaScript</div>
+    <div class="lang" id="makefile">Makefile</div>
+    <div class="lang" id="markdown">Markdown</div>
+    <div class="lang" id="nginx">Nginx</div>
+    <div class="lang" id="objectivec">Objective C</div>
+    <div class="lang" id="php">PHP</div>
+    <div class="lang" id="perl">Perl</div>
+    <div class="lang" id="python">Python</div>
+    <div class="lang" id="ruby">Ruby</div>
+    <div class="lang" id="sql">SQL</div>
+    <!--
     <div class="lang" id="1c">1C</div>
     <div class="lang" id="actionscript">ActionScript</div>
-    <div class="lang" id="apache">Apache</div>
     <div class="lang" id="applescript">AppleScript</div>
     <div class="lang" id="asciidoc">AsciiDoc</div>
     <div class="lang" id="autohotkey">AutoHotkey</div>
     <div class="lang" id="avrasm">AVR Assembly</div>
     <div class="lang" id="axapta">Axapta</div>
-    <div class="lang" id="bash">Bash</div>
     <div class="lang" id="brainfuck">Brainfuck</div>
-    <div class="lang" id="cpp">C++</div>
-    <div class="lang" id="cs">C#</div>
     <div class="lang" id="capnproto">Cap'n Proto</div>
     <div class="lang" id="clojure">Clojure</div>
     <div class="lang" id="cmake">CMake</div>
-    <div class="lang" id="coffeescript">CoffeeScript</div>
-    <div class="lang" id="css">CSS</div>
     <div class="lang" id="d">D</div>
     <div class="lang" id="dart">Dart</div>
     <div class="lang" id="delphi">Delphi</div>
-    <div class="lang" id="diff">Diff</div>
     <div class="lang" id="django">Django</div>
     <div class="lang" id="dos">DOS</div>
     <div class="lang" id="dust">Dust</div>
@@ -46,49 +62,35 @@
     <div class="lang" id="handlebars">Handlebars</div>
     <div class="lang" id="haskell">Haskell</div>
     <div class="lang" id="haxe">Haxe</div>
-    <div class="lang" id="http">HTTP</div>
-    <div class="lang" id="ini">Ini</div>
     <div class="lang" id="x86asm">Intel x86 Assembly</div>
-    <div class="lang" id="java">Java</div>
-    <div class="lang" id="javascript">JavaScript</div>
-    <div class="lang" id="json">JSON</div>
     <div class="lang" id="lasso">Lasso</div>
     <div class="lang" id="lisp">Lisp</div>
     <div class="lang" id="livecodeserver">LiveCode</div>
     <div class="lang" id="lua">Lua</div>
-    <div class="lang" id="makefile">Makefile</div>
-    <div class="lang" id="markdown">Markdown</div>
     <div class="lang" id="mathematica">Mathematica</div>
     <div class="lang" id="matlab">Matlab</div>
     <div class="lang" id="mel">MEL</div>
     <div class="lang" id="mizar">Mizar</div>
     <div class="lang" id="monkey">Monkey</div>
-    <div class="lang" id="nginx">Nginx</div>
     <div class="lang" id="nimrod">Nimrod</div>
     <div class="lang" id="nix">Nix</div>
     <div class="lang" id="nsis">NSIS</div>
-    <div class="lang" id="objectivec">Objective C</div>
     <div class="lang" id="ocaml">OCaml</div>
     <div class="lang" id="ruleslanguage">Oracle Rules Language</div>
     <div class="lang" id="oxygene">Oxygene</div>
     <div class="lang" id="parser3">Parser3</div>
-    <div class="lang" id="perl">Perl</div>
-    <div class="lang" id="php">PHP</div>
     <div class="lang" id="protobuf">Protocol Buffers</div>
-    <div class="lang" id="python">Python</div>
     <div class="lang" id="profile">Python Profile</div>
     <div class="lang" id="q">Q</div>
     <div class="lang" id="r">R</div>
     <div class="lang" id="rib">RenderMan RIB</div>
     <div class="lang" id="rsl">RenderMan RSL</div>
-    <div class="lang" id="ruby">Ruby</div>
     <div class="lang" id="rust">Rust</div>
     <div class="lang" id="scala">Scala</div>
     <div class="lang" id="scheme">Scheme</div>
     <div class="lang" id="scilab">Scilab</div>
     <div class="lang" id="scss">SCSS</div>
     <div class="lang" id="smalltalk">Smalltalk</div>
-    <div class="lang" id="sql">SQL</div>
     <div class="lang" id="swift">Swift</div>
     <div class="lang" id="tex">TeX</div>
     <div class="lang" id="thrift">Thrift</div>
@@ -98,6 +100,6 @@
     <div class="lang" id="vbscript">VBScript</div>
     <div class="lang" id="vhdl">VHDL</div>
     <div class="lang" id="vim">Vim Script</div>
-    <div class="lang" id="xml">XML</div>
+    -->
   </body>
 </html>
diff --git a/enlight.xpi b/enlight.xpi
diff --git a/lib/main.js b/lib/main.js
@@ -9,7 +9,8 @@ var spref   = require('sdk/simple-prefs');
 /*
  * Directory for highlight.js code (under data/)
  */
-var gHJSPath = "highlightjs";
+var gHJSPath   = "highlightjs";
+var gHJSScript = "highlight.min.js"
 /*
  * Last language id chosen
  */
@@ -109,7 +110,7 @@ function doHighlight() {
       "language"   : gId
     },
     contentScriptFile: [
-      self.data.url(gHJSPath + "/highlight.pack.js"),
+      self.data.url(gHJSPath + "/" + gHJSScript),
       self.data.url("enlightscript.js")
     ]
   });

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "homepage": "https://github.com/Qeole/Enlight",
   "icon": "data/icon-64.png",
   "license": "MPL 2.0",
-  "version": "1.1",
+  "version": "1.2",
   "description": "Syntax highlight for raw source code.",
   "preferences": [
   {