diff --git a/package.json b/package.json index b1ca6d7c..f49aaa72 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "scripts": { "build": "mkr release", - "test": "mocha --recursive test" + "build-test": "mkr build-test" }, "devDependencies": { "fquery": "~0.16.3", diff --git a/src/_h5ai/client/js/inc/main/index.js b/src/_h5ai/client/js/inc/main/index.js index 95570dd2..b8008a80 100644 --- a/src/_h5ai/client/js/inc/main/index.js +++ b/src/_h5ai/client/js/inc/main/index.js @@ -1,7 +1,7 @@ modulejs.define('main/index', ['_', 'core/event'], function (_, event) { - modulejs.require('view/ensure'); - modulejs.require('view/items'); + modulejs.require('view/base'); + modulejs.require('view/content'); modulejs.require('view/sidebar'); modulejs.require('view/viewmode'); diff --git a/src/_h5ai/client/js/inc/view/ensure.js b/src/_h5ai/client/js/inc/view/base.js similarity index 91% rename from src/_h5ai/client/js/inc/view/ensure.js rename to src/_h5ai/client/js/inc/view/base.js index ead85c45..9312d7b5 100644 --- a/src/_h5ai/client/js/inc/view/ensure.js +++ b/src/_h5ai/client/js/inc/view/base.js @@ -1,4 +1,4 @@ -modulejs.define('view/ensure', ['$', 'config'], function ($, config) { +modulejs.define('view/base', ['$', 'config'], function ($, config) { var templateTopbar = '
' + diff --git a/src/_h5ai/client/js/inc/view/items.js b/src/_h5ai/client/js/inc/view/content.js similarity index 96% rename from src/_h5ai/client/js/inc/view/items.js rename to src/_h5ai/client/js/inc/view/content.js index b7235d71..bfb03a7d 100644 --- a/src/_h5ai/client/js/inc/view/items.js +++ b/src/_h5ai/client/js/inc/view/content.js @@ -1,4 +1,4 @@ -modulejs.define('view/items', ['_', '$', 'core/settings', 'core/resource', 'core/format', 'core/event', 'core/location'], function (_, $, allsettings, resource, format, event, location) { +modulejs.define('view/content', ['_', '$', 'core/settings', 'core/resource', 'core/format', 'core/event', 'core/location'], function (_, $, allsettings, resource, format, event, location) { var settings = _.extend({ binaryPrefix: false,