Simplify version checker - requires cookies

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

diff --git a/adminer/editing.js b/adminer/editing.js
index 6da99a99e01243e5aad1c0272bdb0f0bc632183a..802b4abca8d5fc7ee53f35257866608455268954 100644 (file)
--- a/adminer/editing.js
+++ b/adminer/editing.js
@@ -2,11 +2,19 @@
 
 function body_load() {
        var jush_root = '../externals/jush/';
-       load_script(jush_root + 'jush.js', function () {
+       var script = document.createElement('script');
+       script.src = jush_root + 'jush.js';
+       script.onload = function () {
                jush.style(jush_root + '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);
 }
 
 

diff --git a/adminer/functions.js b/adminer/functions.js
index fa80a9efca8938729402880f5719b61de4d4d6e3..bbc89b637e264c3b7c518dcfc2660a44a76d14e0 100644 (file)
--- a/adminer/functions.js
+++ b/adminer/functions.js
@@ -6,33 +6,11 @@ function toggle(id) {
        return true;
 }
 
-function load_script(src, onload) {
-       var script = document.createElement('script');
-       script.src = src;
-       script.onload = onload;
-       script.onreadystatechange = function () {
-               if (script.readyState == 'loaded' || script.readyState == 'complete') {
-                       onload();
-               }
-       }
-       document.body.appendChild(script);
-}
-
 function verify_version(version) {
        document.cookie = 'adminer_version=0';
-       load_script('https://adminer.svn.sourceforge.net/svnroot/adminer/released.js', function () {
-               document.cookie = 'adminer_version=' + released;
-               var re = /^([0-9]+)\.([0-9]+)\.([0-9]+)(.*)/;
-               var v1 = re.exec(version);
-               var v2 = re.exec(released);
-               if (v1 && v2 && (+v1[1] < +v2[1]
-                       || (v1[1] == v2[1] && (+v1[2] < +v2[2]
-                       || (v1[2] == v2[2] && (+v1[3] < +v2[3]
-                       || (v1[3] == v2[3] && v1[4]
-               ))))))) {
-                       document.getElementById('version').innerHTML = released;
-               }
-       });
+       var script = document.createElement('script');
+       script.src = 'https://adminer.svn.sourceforge.net/svnroot/adminer/trunk/released.js';
+       document.body.appendChild(script);
 }
 
 function form_check(el, name) {

diff --git a/released.js b/released.js
index ed09e0d325bafdf5c5a61f38d7e52783283836fe..6e90eca8b8073ff9a42bdb0950c9abb45640a256 100644 (file)
--- a/released.js
+++ b/released.js
@@ -1 +1 @@
-var released = '1.11.1';
+document.cookie = 'adminer_version=1.11.1';