From 5c713d5c11470c4a8a8b61aab8af6f93f53aa663 Mon Sep 17 00:00:00 2001 From: jakubvrana Date: Wed, 29 Jul 2009 15:07:57 +0000 Subject: [PATCH] Simplify version checker - requires cookies git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@941 7c3ca157-0c34-0410-bff1-cbf682f78f5c --- adminer/editing.js | 12 ++++++++++-- adminer/functions.js | 28 +++------------------------- released.js | 2 +- 3 files changed, 14 insertions(+), 28 deletions(-) diff --git a/adminer/editing.js b/adminer/editing.js index 6da99a99..802b4abc 100644 --- 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 fa80a9ef..bbc89b63 100644 --- 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 ed09e0d3..6e90eca8 100644 --- a/released.js +++ b/released.js @@ -1 +1 @@ -var released = '1.11.1'; +document.cookie = 'adminer_version=1.11.1';