diff --git a/src/_h5ai/client/js/inc/core/settings.js b/src/_h5ai/client/js/inc/core/settings.js
index bf50eeb4..b529dbee 100644
--- a/src/_h5ai/client/js/inc/core/settings.js
+++ b/src/_h5ai/client/js/inc/core/settings.js
@@ -3,6 +3,6 @@ modulejs.define('core/settings', ['_', 'config'], function (_, config) {
return _.extend({}, config.options, {
appHref: config.setup.APP_HREF,
rootHref: config.setup.ROOT_HREF,
- currentHref: config.setup.CURRENT_HREF
+ version: config.setup.VERSION
});
});
diff --git a/src/_h5ai/client/js/inc/view/topbar.js b/src/_h5ai/client/js/inc/view/topbar.js
index eba49de8..0c88c37e 100644
--- a/src/_h5ai/client/js/inc/view/topbar.js
+++ b/src/_h5ai/client/js/inc/view/topbar.js
@@ -1,10 +1,10 @@
-modulejs.define('view/topbar', ['$', 'config', 'view/root'], function ($, config, root) {
+modulejs.define('view/topbar', ['$', 'core/settings', 'view/root'], function ($, settings, root) {
var template =
'
' +
'
' +
'
' +
- '
' +
+ '' +
'powered
' +
'by h5ai
' +
'' +
diff --git a/test/tests/unit/core/settings.js b/test/tests/unit/core/settings.js
index 7f3736bc..a14a6261 100644
--- a/test/tests/unit/core/settings.js
+++ b/test/tests/unit/core/settings.js
@@ -19,7 +19,7 @@ describe('module \'' + ID + '\'', function () {
setup: {
APP_HREF: util.uniqId(),
ROOT_HREF: util.uniqId(),
- CURRENT_HREF: util.uniqId()
+ VERSION: util.uniqId()
}
};
this.applyFn = function () {
@@ -101,12 +101,12 @@ describe('module \'' + ID + '\'', function () {
});
});
- describe('.currentHref', function () {
+ describe('.version', function () {
it('set correct', function () {
var instance = this.applyFn();
- assert.strictEqual(instance.currentHref, this.xConfig.setup.CURRENT_HREF);
+ assert.strictEqual(instance.version, this.xConfig.setup.VERSION);
});
});
});
diff --git a/test/tests/unit/view/topbar.js b/test/tests/unit/view/topbar.js
index f8d27d68..a673b743 100644
--- a/test/tests/unit/view/topbar.js
+++ b/test/tests/unit/view/topbar.js
@@ -2,7 +2,7 @@
'use strict';
var ID = 'view/topbar';
-var DEPS = ['$', 'config', 'view/root'];
+var DEPS = ['$', 'core/settings', 'view/root'];
describe('module \'' + ID + '\'', function () {
@@ -10,11 +10,11 @@ describe('module \'' + ID + '\'', function () {
this.definition = modulejs._private.definitions[ID];
- this.xConfig = {setup: {VERSION: util.uniqId()}};
+ this.xSettings = {version: util.uniqId()};
this.xRoot = {$el: null};
this.applyFn = function () {
- return this.definition.fn($, this.xConfig, this.xRoot);
+ return this.definition.fn($, this.xSettings, this.xRoot);
};
});
@@ -104,7 +104,7 @@ describe('module \'' + ID + '\'', function () {
it('#backlink has correct title', function () {
this.applyFn();
- assert.strictEqual($('#backlink').attr('title'), 'powered by h5ai ' + this.xConfig.setup.VERSION);
+ assert.strictEqual($('#backlink').attr('title'), 'powered by h5ai ' + this.xSettings.version);
});
it('#backlink has correct text', function () {