mirrors/h5ai
1
0
Fork 0
mirror of https://github.com/lrsjng/h5ai.git synced 2025-05-25 04:24:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace appHref with publicHref.

Browse source
This commit is contained in:
Lars Jung 2015-05-14 00:13:22 +02:00
parent 05547c2685
commit 4db158e8d9
7 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/_h5ai/backend/php/core/class-setup.php
View file

@ -146,7 +146,7 @@ class Setup {
public function to_jsono($as_admin = false) { public function to_jsono($as_admin = false) {
$keys = [ $keys = [
'APP_HREF', 'PUBLIC_HREF',
'ROOT_HREF', 'ROOT_HREF',
'VERSION' 'VERSION'
]; ];

2
src/_h5ai/public/js/inc/core/resource.js
View file

@ -1,6 +1,6 @@
modulejs.define('core/resource', ['_', 'config', 'core/settings'], function (_, config, settings) { modulejs.define('core/resource', ['_', 'config', 'core/settings'], function (_, config, settings) {
var imagesHref = settings.appHref + 'public/images/'; var imagesHref = settings.publicHref + 'images/';
var uiHref = imagesHref + 'ui/'; var uiHref = imagesHref + 'ui/';
var themesHref = imagesHref + 'themes/'; var themesHref = imagesHref + 'themes/';
var defaultThemeHref = themesHref + 'default/'; var defaultThemeHref = themesHref + 'default/';

2
src/_h5ai/public/js/inc/core/settings.js
View file

@ -1,7 +1,7 @@
modulejs.define('core/settings', ['_', 'config'], function (_, config) { modulejs.define('core/settings', ['_', 'config'], function (_, config) {
return _.extend({}, config.options, { return _.extend({}, config.options, {
appHref: config.setup.APP_HREF, publicHref: config.setup.PUBLIC_HREF,
rootHref: config.setup.ROOT_HREF, rootHref: config.setup.ROOT_HREF,
version: config.setup.VERSION version: config.setup.VERSION
}); });

5
src/_h5ai/public/js/inc/model/item.js
View file

@ -179,11 +179,6 @@ modulejs.define('model/item', ['_', 'core/event', 'core/location', 'core/server'
return this.absHref === settings.rootHref; return this.absHref === settings.rootHref;
}, },
isH5ai: function () {
return this.absHref === settings.appHref;
},
isEmpty: function () { isEmpty: function () {
return _.keys(this.content).length === 0; return _.keys(this.content).length === 0;

6
test/tests/unit/core/resource.js
View file

@ -16,7 +16,7 @@ describe('module \'' + ID + '\'', function () {
b: 'myTheme/b.jpg' b: 'myTheme/b.jpg'
} }
}; };
this.xSettings = {appHref: util.uniqPath('/appHref/')}; this.xSettings = {publicHref: util.uniqPath('/publicHref/')};
this.applyFn = function () { this.applyFn = function () {
return this.definition.fn(_, this.xConfig, this.xSettings); return this.definition.fn(_, this.xConfig, this.xSettings);
@ -77,7 +77,7 @@ describe('module \'' + ID + '\'', function () {
it('works', function () { it('works', function () {
var instance = this.applyFn(); var instance = this.applyFn();
var ui = this.xSettings.appHref + 'public/images/ui/'; var ui = this.xSettings.publicHref + 'images/ui/';
assert.strictEqual(instance.image(), ui + 'undefined.svg'); assert.strictEqual(instance.image(), ui + 'undefined.svg');
assert.strictEqual(instance.image(1), ui + '1.svg'); assert.strictEqual(instance.image(1), ui + '1.svg');
@ -97,7 +97,7 @@ describe('module \'' + ID + '\'', function () {
it('works', function () { it('works', function () {
var instance = this.applyFn(); var instance = this.applyFn();
var themes = this.xSettings.appHref + 'public/images/themes/'; var themes = this.xSettings.publicHref + 'images/themes/';
assert.strictEqual(instance.icon(''), themes + 'default/file.svg'); assert.strictEqual(instance.icon(''), themes + 'default/file.svg');
assert.strictEqual(instance.icon('a'), themes + 'myTheme/a.svg'); assert.strictEqual(instance.icon('a'), themes + 'myTheme/a.svg');

6
test/tests/unit/core/settings.js
View file

@ -17,7 +17,7 @@ describe('module \'' + ID + '\'', function () {
more: util.uniqObj() more: util.uniqObj()
}, },
setup: { setup: {
APP_HREF: util.uniqId(), PUBLIC_HREF: util.uniqId(),
ROOT_HREF: util.uniqId(), ROOT_HREF: util.uniqId(),
VERSION: util.uniqId() VERSION: util.uniqId()
} }
@ -83,12 +83,12 @@ describe('module \'' + ID + '\'', function () {
}); });
}); });
describe('.appHref', function () { describe('.publicHref', function () {
it('set correct', function () { it('set correct', function () {
var instance = this.applyFn(); var instance = this.applyFn();
assert.strictEqual(instance.appHref, this.xConfig.setup.APP_HREF); assert.strictEqual(instance.publicHref, this.xConfig.setup.PUBLIC_HREF);
}); });
}); });

15
test/tests/unit/model/item.js
View file

@ -183,11 +183,6 @@ describe('module \'' + ID + '\'', function () {
assert.isTrue(this.item.isRoot()); assert.isTrue(this.item.isRoot());
}); });
it('.isH5ai() returns false', function () {
assert.isFalse(this.item.isH5ai());
});
it('.isEmpty() returns true', function () { it('.isEmpty() returns true', function () {
assert.isTrue(this.item.isEmpty()); assert.isTrue(this.item.isEmpty());
@ -283,11 +278,6 @@ describe('module \'' + ID + '\'', function () {
assert.isFalse(this.item.isRoot()); assert.isFalse(this.item.isRoot());
}); });
it('.isH5ai() returns false', function () {
assert.isFalse(this.item.isH5ai());
});
it('.isEmpty() returns true', function () { it('.isEmpty() returns true', function () {
assert.isTrue(this.item.isEmpty()); assert.isTrue(this.item.isEmpty());
@ -383,11 +373,6 @@ describe('module \'' + ID + '\'', function () {
assert.isFalse(this.item.isRoot()); assert.isFalse(this.item.isRoot());
}); });
it('.isH5ai() returns false', function () {
assert.isFalse(this.item.isH5ai());
});
it('.isEmpty() returns true', function () { it('.isEmpty() returns true', function () {
assert.isTrue(this.item.isEmpty()); assert.isTrue(this.item.isEmpty());