From 00c607ef9000811b027330152e09b4da8c46ad02 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 25 Mar 2013 00:01:34 +0100 Subject: [PATCH] querycode to use syntaxhighlighter again --- plugins/querycode/querycode.js | 12 ++++-------- plugins/querycode/querycode.py | 23 +++++++++-------------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/plugins/querycode/querycode.js b/plugins/querycode/querycode.js index 65c6d0dc..0898e4a6 100644 --- a/plugins/querycode/querycode.js +++ b/plugins/querycode/querycode.js @@ -7,9 +7,6 @@ * License: GPLv3 */ -// xxx TODO -// . turn back on syntax highlighting - (function($) { var debug=false; @@ -28,8 +25,8 @@ var methods = { init : function (options) { - if (debug) console.log("temporarily turned off SyntaxHighlighter ..."); -// SyntaxHighlighter.all(); + if (debug) console.log("SyntaxHighlighter.all ..."); + SyntaxHighlighter.all(); return this.each(function() { var $this=$(this); var data=$this.data('QueryCode'); @@ -86,9 +83,8 @@ } html_code=fun(query); dom.html(html_code); - if (debug) console.log("turned off SyntaxHighlighter.highlight"); -// SyntaxHighlighter.highlight() - + if (debug) console.log("SyntaxHighlighter.highlight"); + SyntaxHighlighter.highlight() } diff --git a/plugins/querycode/querycode.py b/plugins/querycode/querycode.py index 6c3cb21d..b29917d2 100644 --- a/plugins/querycode/querycode.py +++ b/plugins/querycode/querycode.py @@ -13,21 +13,16 @@ class QueryCode (Plugin): def requirements (self): return { - 'js_files' : [ "js/querycode.js", - "js/manifold.js", "js/manifold-query.js", - "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", - -# Plugins::add_js('/QueryCode/beautyofcode/scripts/shCore.js'); -# Plugins::add_js('/QueryCode/beautyofcode/scripts/shBrushPython.js'); -# Plugins::add_js('/QueryCode/beautyofcode/scripts/shBrushRuby.js'); -# Plugins::add_js('/QueryCode/beautyofcode/scripts/shAutoloader.js'); - ] , + 'js_files' : [ + "js/querycode.js", + "js/manifold.js", "js/manifold-query.js", + "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", + "js/shAutoloader.js","js/shCore.js","js/shBrushPython.js","js/shBrushRuby.js", + ] , # thierry: see this file for details of why we turn this off for now - 'css_files': [ -### "css/querycode.css" , -# Plugins::add_css('/QueryCode/beautyofcode/styles/shCore.css'); -# Plugins::add_css('/QueryCode/beautyofcode/styles/shCoreDefault.css'); -# Plugins::add_css('/QueryCode/beautyofcode/styles/shThemeDefault.css'); + 'css_files': [ + "css/querycode.css" , + "css/shCore.css","css/shCoreDefault.css","css/shThemeDefault.css", ], } -- 2.43.0