Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

🐷 Rename 'favicon' to 'icon' (#7888)

Browse source 
refs TryGhost/Ghost#7688

Just renames `favicon` to `icon` as our usage for it will not be for favicon purposes only.
This commit is contained in:
Aileen Nowak 2017-01-25 17:02:02 +07:00 • committed by Katharina Irrgang
parent cce3194983
commit ca521e234f
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/server/api/settings.js
View file

@ -67,9 +67,9 @@ updateConfigCache = function () {
config.set('theme:timezone', (settingsCache.activeTimezone && settingsCache.activeTimezone.value) || config.get('theme').timezone);
config.set('theme:url', globalUtils.url.urlFor('home', true));
config.set('theme:amp', (settingsCache.amp && settingsCache.amp.value === 'true'));
config.set('theme:favicon', (settingsCache.favicon && settingsCache.favicon.value) ?
{type: 'upload', url: (settingsCache.favicon && settingsCache.favicon.value)} :
{type: 'default', url: config.get('theme:favicon')});
config.set('theme:icon', (settingsCache.icon && settingsCache.icon.value) ?
{type: 'upload', url: (settingsCache.icon && settingsCache.icon.value)} :
{type: 'default', url: config.get('theme:icon')});
_.each(labsValue, function (value, key) {
config.set('labs:' + key, value);

2
core/server/config/overrides.json
View file

@ -61,7 +61,7 @@
},
"theme": {
"timezone": "Etc/UTC",
"favicon": {
"icon": {
"type": "default",
"url": "core/shared/favicon.ico"
}

2
core/server/data/schema/default-settings.json
View file

@ -29,7 +29,7 @@
"cover": {
"defaultValue": ""
},
"favicon": {
"icon": {
"defaultValue": ""
},
"defaultLang": {

16
core/test/unit/config/index_spec.js
View file

@ -37,7 +37,7 @@ describe('Config', function () {
logo: 'casper',
cover: 'casper',
timezone: 'Etc/UTC',
favicon: {
icon: {
type: 'default',
url: 'core/shared/favicon.ico'
}
@ -49,7 +49,7 @@ describe('Config', function () {
var themeConfig = config.get('theme');
// This will fail if there are any extra keys
themeConfig.should.have.keys('title', 'description', 'logo', 'cover', 'timezone', 'favicon');
themeConfig.should.have.keys('title', 'description', 'logo', 'cover', 'timezone', 'icon');
});
it('should have the correct values for each key', function () {
@ -61,7 +61,7 @@ describe('Config', function () {
themeConfig.should.have.property('logo', 'casper');
themeConfig.should.have.property('cover', 'casper');
themeConfig.should.have.property('timezone', 'Etc/UTC');
themeConfig.should.have.property('favicon', {
themeConfig.should.have.property('icon', {
type: 'default',
url: 'core/shared/favicon.ico'
});
@ -94,25 +94,25 @@ describe('Config', function () {
});
describe('Favicon default', function () {
it('should use uploaded favicon', function () {
it('should use uploaded blog icon', function () {
var themeConfig = config.get('theme');
// Check values are as we expect
themeConfig.should.have.property('favicon', {
themeConfig.should.have.property('icon', {
type: 'default',
url: 'core/shared/favicon.ico'
});
configUtils.set({
theme: {
favicon: {
icon: {
type: 'upload',
url: 'content/images/favicon.ico'
}
}
});
config.get('theme').should.have.property('favicon', {
config.get('theme').should.have.property('icon', {
type: 'upload',
url: 'content/images/favicon.ico'
});
@ -123,7 +123,7 @@ describe('Config', function () {
// Check values are as we expect
themeConfig.should.have.property('theme');
themeConfig.theme.should.have.property('favicon', {
themeConfig.theme.should.have.property('icon', {
type: 'default',
url: 'core/shared/favicon.ico'
});