diff --git a/main/webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar b/main/webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar index fa9cb3c43..9403aca25 100644 Binary files a/main/webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar and b/main/webapp/WEB-INF/lib-src/butterfly-1.0.1-sources.jar differ diff --git a/main/webapp/WEB-INF/lib/butterfly-1.0.1.jar b/main/webapp/WEB-INF/lib/butterfly-1.0.1.jar index fe20913fc..a59b5467f 100644 Binary files a/main/webapp/WEB-INF/lib/butterfly-1.0.1.jar and b/main/webapp/WEB-INF/lib/butterfly-1.0.1.jar differ diff --git a/main/webapp/modules/core/scripts/index.js b/main/webapp/modules/core/scripts/index.js index 0d0ba31d4..69880d0d9 100644 --- a/main/webapp/modules/core/scripts/index.js +++ b/main/webapp/modules/core/scripts/index.js @@ -70,7 +70,9 @@ Refine.selectActionArea = function(id) { $(function() { var isThereNewRelease = function() { + // TODO: This eeds to be modified to do checking based solely on version, not revision var thisRevision = OpenRefineVersion.revision; + var thisVersion = OpenRefineVersion.version; var revision_pattern = /r([0-9]+)/; @@ -79,10 +81,15 @@ $(function() { } var latestRevision = OpenRefineReleases.releases[0].revision; + var latestVersion = OpenRefineReleases.releases[0].version; var thisRev = parseInt(revision_pattern.exec(thisRevision)[1],10); var latestRev = parseInt(revision_pattern.exec(OpenRefineReleases.releases[0].revision)[1],10); + // Parser version into main version and suffix which follows dash + // Parse version from dot separated string into array of integers + + // compare left to right, including suffix return latestRev > thisRev; }; @@ -95,6 +102,22 @@ $(function() { $("#openrefine-version").text($.i18n._('core-index')["version"]+" " + OpenRefineVersion.full_version); + // Format of releases.js fetched from server +// var releases = { +// "homepage" : "http://code.google.com/p/google-refine/wiki/Downloads", +// "releases" : [ +// { +// "description": "OpenRefine 2.6", +// "version": "2.6-alpha1", +// }, +// { +// "description": "Google Refine 2.5", +// "version": "2.5", +// "revision": "r2407" +// }, +// ] +// } + var script = $('') .attr("src", "http://google-refine.googlecode.com/svn/support/releases.js") .attr("type", "text/javascript");