From 644019465819b8e7ced4c49afecfb536ac40656a Mon Sep 17 00:00:00 2001 From: Tom Morris Date: Sun, 18 Aug 2013 12:37:26 -0400 Subject: [PATCH] Update broken Butterfly build --- .../lib-src/butterfly-1.0.1-sources.jar | Bin 35097 -> 37274 bytes main/webapp/WEB-INF/lib/butterfly-1.0.1.jar | Bin 63796 -> 66064 bytes main/webapp/modules/core/scripts/index.js | 23 ++++++++++++++++++ 3 files changed, 23 insertions(+) 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 fa9cb3c4324d06d985d9222d3d101f05c991de70..9403aca25e18d77bd860b5b6edae82ec6e25b823 100644 GIT binary patch delta 104 zcmbO^iD}kiCY}IqW)?065V)H>kw=y3PVz=${YEBcmdSA~Qk#>tggAH@nM9ajN+#zu ungZ2qUfP(zKKXbn-{g!IDW-(R$%$I(VgcT)Y#@Uqf$$qU14CaYhz9_o=Nd); delta 75 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 V9M3uE8-pNi^uthwAjvSW{sD3&|6>3E 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");