Always try to enable syntax highlighting

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@629 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/functions.js b/functions.js
index 684fdcf94c5e661bc8c12338b6cf56746cc38474..092674c30ad112ae66c4b1c5898fd191392d946a 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -13,6 +13,22 @@ function check_version(version) {
        document.body.appendChild(script);
 }
 
+function load_jush() {
+       var script = document.createElement('script');
+       script.src = 'externals/jush/jush.js';
+       script.onload = function () {
+               jush.style('externals/jush/jush.css');
+               jush.highlight_tag('pre');
+               jush.highlight_tag('code');
+       }
+       script.onreadystatechange = function () {
+               if (script.readyState == 'loaded' || script.readyState == 'complete') {
+                       script.onload();
+               }
+       }
+       document.body.appendChild(script);
+}
+
 function tables_check(el) {
        var elems = el.form.elements;
        for (var i=0; i < elems.length; i++) {

diff --git a/include/design.inc.php b/include/design.inc.php
index 0e208d6e38c22442089da9409467bdb5c09e4d69..22c792e8e1df8fdbe8c9dfe392f98a8bcc81331c 100644 (file)
--- a/include/design.inc.php
+++ b/include/design.inc.php
@@ -106,15 +106,8 @@ function page_footer($missing = false) {
        ?>
 </div>
 
-<?php if ($_COOKIE["highlight"] == "jush") { ?>
-<script type="text/javascript" src="externals/jush/jush.js"></script>
-<script type="text/javascript">
-if (typeof jush != 'undefined') {
-       jush.style('externals/jush/jush.css');
-       jush.highlight_tag('pre');
-       jush.highlight_tag('code');
-}
-</script>
+<?php if (!$missing) { ?>
+<script type="text/javascript">onload = load_jush;</script>
 <?php } ?>
 
 </body>

diff --git a/sql.inc.php b/sql.inc.php
index e0164484b8b285473eaa15935431008e3bd3391f..920eeefd81198ae7c417c1b89adac0ec7d5bcf4b 100644 (file)
--- a/sql.inc.php
+++ b/sql.inc.php
@@ -67,9 +67,6 @@ if (!$error && $_POST) {
 <p>
 <input type="hidden" name="token" value="<?php echo $token; ?>" />
 <input type="submit" value="<?php echo lang('Execute'); ?>" />
-<script type="text/javascript">// <![CDATA[
-document.write('<label><input type="checkbox" name="highlight" value="jush"<?php echo ($_COOKIE["highlight"] == "jush" ? ' checked="checked"' : ''); ?> /><?php echo addcslashes(lang('Syntax highlighting'), "\r\n'\\"); ?></label>');
-// ]]></script>
 <label><input type="checkbox" name="error_stops" value="1"<?php echo ($_POST["error_stops"] ? " checked='checked'" : ""); ?> /><?php echo lang('Stop on error'); ?></label>
 </p>
 </form>