mirror of
https://github.com/greenshot/greenshot.git
synced 2025-03-12 05:25:25 -07:00
Fixing the version check to work more trustworthy, the script should run after the page is loaded to solve side effects.
This commit is contained in:
parent
0f660b8e05
commit
5d956fc94e
@ -3,13 +3,9 @@
|
||||
<script language="JavaScript">
|
||||
var release_blog_posts = new Array();
|
||||
{% if latest_release.tag_name %}
|
||||
{% for post in site.posts %}
|
||||
{% if post.release_version %}
|
||||
release_blog_posts["{{post.release_version}}"] = "{{post.url}}";
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
{% else %}
|
||||
release_blog_posts["1.2.9.129"] = "/2017/01/28/129-bug-bash/";
|
||||
{% for post in site.posts %}{% if post.release_version %}release_blog_posts["{{post.release_version}}"] = "{{post.url}}";
|
||||
{% endif %}{% endfor %}
|
||||
{% else %}release_blog_posts["1.2.9.129"] = "/2017/01/28/129-bug-bash/";
|
||||
{% endif %}
|
||||
|
||||
</script>
|
||||
@ -35,10 +31,10 @@ function compareVersion(a, b) {
|
||||
if (a === b) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (!a || !b) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (!a || !b) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
var a_components = a.split(".");
|
||||
var b_components = b.split(".");
|
||||
@ -70,24 +66,29 @@ function compareVersion(a, b) {
|
||||
// Otherwise they are the same.
|
||||
return 0;
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
var versionMatch = /version=([^&]+)/.exec(location);
|
||||
if (versionMatch) {
|
||||
var installedVersion = versionMatch[1];
|
||||
var greenshotTag = {% if latest_release.tag_name %}"{{ latest_release.tag_name }}"{% else %}"Greenshot-Test-1.2.9.129"{% endif %};
|
||||
var releaseVersion = /.*(\d+\.\d+\.\d+\.\d+)/.exec(greenshotTag)[1];
|
||||
var compare=compareVersion(releaseVersion, installedVersion);
|
||||
var matchingBlogPost = release_blog_posts[installedVersion];
|
||||
if (matchingBlogPost) {
|
||||
jQuery('#blog1').prop("href", matchingBlogPost);
|
||||
jQuery('#blogPost1').slideToggle();
|
||||
jQuery('#blog2').prop("href", matchingBlogPost);
|
||||
jQuery('#blogPost2').slideToggle();
|
||||
}
|
||||
if (compare >= 1) {
|
||||
jQuery('#oldVersion').slideToggle();
|
||||
} else if (compare == 0) {
|
||||
jQuery('#currentVersion').slideToggle();
|
||||
}
|
||||
var installedVersion = versionMatch[1];
|
||||
var greenshotTag = {% if latest_release.tag_name %}"{{ latest_release.tag_name }}"{% else %}"Greenshot-Test-1.2.9.129"{% endif %};
|
||||
var releaseVersion = /.*(\d+\.\d+\.\d+\.\d+)/.exec(greenshotTag)[1];
|
||||
var compare=compareVersion(releaseVersion, installedVersion);
|
||||
var matchingBlogPost = release_blog_posts[installedVersion];
|
||||
if (matchingBlogPost) {
|
||||
jQuery('#blog1').prop("href", matchingBlogPost);
|
||||
jQuery('#blogPost1').slideToggle();
|
||||
jQuery('#blog2').prop("href", matchingBlogPost);
|
||||
jQuery('#blogPost2').slideToggle();
|
||||
}
|
||||
if (compare >= 1) {
|
||||
jQuery('#oldVersion').slideDown();
|
||||
jQuery('#currentVersion').slideUp();
|
||||
} else if (compare == 0) {
|
||||
jQuery('#oldVersion').slideUp();
|
||||
jQuery('#currentVersion').slideDown();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
</script>
|
Loading…
x
Reference in New Issue
Block a user