Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel

This commit is contained in:
Michael Hackstein 2014-06-18 17:16:48 +02:00
parent 791c3bb67e 3640ebe1ea
commit b0f176c37a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/apps/system/aardvark/frontend/js/routers/versionCheck.js
View File

@ -9,6 +9,7 @@
url: "/_admin/aardvark/disableVersionCheck" url: "/_admin/aardvark/disableVersionCheck"
}); });
}; };
var isVersionCheckEnabled = function(cb) { var isVersionCheckEnabled = function(cb) {
$.ajax({ $.ajax({
type: "GET", type: "GET",
@ -62,8 +63,10 @@
window.versionHelper.fromString(data.version); window.versionHelper.fromString(data.version);
window.parseVersions = function (json) { window.parseVersions = function (json) {
if (_.isEmpty(json)) { if (_.isEmpty(json)) {
//No new version. return; // no new version.
return; }
if (/-devel$/.test(data.version)) {
return; // ignore version in devel
} }
isVersionCheckEnabled(showInterface.bind(window, currentVersion, json)); isVersionCheckEnabled(showInterface.bind(window, currentVersion, json));
}; };