summaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorAlex <[email protected]>2018-05-30 23:42:32 +0300
committerBjørn Erik Pedersen <[email protected]>2018-05-31 18:05:38 +0200
commit07b96d16e8679c40e289c9076ef4414ed6eb7f81 (patch)
treea48b1b963450746af1657081ccedfab8c995b2b6 /config
parentceaff7cafc5357274e546984ae02a4cbdf305f81 (diff)
downloadhugo-07b96d16e8679c40e289c9076ef4414ed6eb7f81.tar.gz
hugo-07b96d16e8679c40e289c9076ef4414ed6eb7f81.zip
Fixes #4798
Diffstat (limited to 'config')
-rw-r--r--config/privacy/privacyConfig.go3
-rw-r--r--config/privacy/privacyConfig_test.go2
-rw-r--r--config/services/servicesConfig.go9
-rw-r--r--config/services/servicesConfig_test.go2
4 files changed, 16 insertions, 0 deletions
diff --git a/config/privacy/privacyConfig.go b/config/privacy/privacyConfig.go
index d4820396d..a058c3593 100644
--- a/config/privacy/privacyConfig.go
+++ b/config/privacy/privacyConfig.go
@@ -77,6 +77,9 @@ type Twitter struct {
// When set to true, the Tweet and its embedded page on your site are not used
// for purposes that include personalized suggestions and personalized ads.
EnableDNT bool
+
+ // If simple mode is enabled, a static and no-JS version of the Tweet will be built.
+ Simple bool
}
// Vimeo holds the privacy configuration settingsrelated to the Vimeo shortcode.
diff --git a/config/privacy/privacyConfig_test.go b/config/privacy/privacyConfig_test.go
index 5593872de..8d9c9f14f 100644
--- a/config/privacy/privacyConfig_test.go
+++ b/config/privacy/privacyConfig_test.go
@@ -44,6 +44,7 @@ disable = true
[privacy.twitter]
disable = true
enableDNT = true
+simple = true
[privacy.vimeo]
disable = true
simple = true
@@ -69,6 +70,7 @@ simple = true
assert.True(pc.SpeakerDeck.Disable)
assert.True(pc.Twitter.Disable)
assert.True(pc.Twitter.EnableDNT)
+ assert.True(pc.Twitter.Simple)
assert.True(pc.Vimeo.Disable)
assert.True(pc.Vimeo.Simple)
assert.True(pc.YouTube.PrivacyEnhanced)
diff --git a/config/services/servicesConfig.go b/config/services/servicesConfig.go
index d78b80948..bc321141a 100644
--- a/config/services/servicesConfig.go
+++ b/config/services/servicesConfig.go
@@ -30,6 +30,7 @@ type Config struct {
Disqus Disqus
GoogleAnalytics GoogleAnalytics
Instagram Instagram
+ Twitter Twitter
}
// Disqus holds the functional configuration settings related to the Disqus template.
@@ -52,6 +53,14 @@ type Instagram struct {
DisableInlineCSS bool
}
+// Twitter holds the functional configuration settings related to the Twitter shortcodes.
+type Twitter struct {
+ // The Simple variant of Twitter is decorated with a basic set of inline styles.
+ // This means that if you want to provide your own CSS, you want
+ // to disable the inline CSS provided by Hugo.
+ DisableInlineCSS bool
+}
+
func DecodeConfig(cfg config.Provider) (c Config, err error) {
m := cfg.GetStringMap(servicesConfigKey)
diff --git a/config/services/servicesConfig_test.go b/config/services/servicesConfig_test.go
index 69dec0350..367b40153 100644
--- a/config/services/servicesConfig_test.go
+++ b/config/services/servicesConfig_test.go
@@ -35,6 +35,8 @@ shortname = "DS"
id = "ga_id"
[services.instagram]
disableInlineCSS = true
+[services.twitter]
+disableInlineCSS = true
`
cfg, err := config.FromConfigString(tomlConfig, "toml")
assert.NoError(err)