Skip to content

Commit

Permalink
tplimpl: Remove speakerdeck shortcode
Browse files Browse the repository at this point in the history
Fixes #4830
  • Loading branch information
onedrawingperday authored and bep committed Jun 9, 2018
1 parent dc4226a commit 65deb72
Show file tree
Hide file tree
Showing 9 changed files with 1 addition and 81 deletions.
6 changes: 0 additions & 6 deletions config/privacy/privacyConfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ type Config struct {
Disqus Disqus
GoogleAnalytics GoogleAnalytics
Instagram Instagram
SpeakerDeck SpeakerDeck
Twitter Twitter
Vimeo Vimeo
YouTube YouTube
Expand Down Expand Up @@ -65,11 +64,6 @@ type Instagram struct {
Simple bool
}

// SpeakerDeck holds the privacy configuration settings related to the SpeakerDeck shortcode.
type SpeakerDeck struct {
Service `mapstructure:",squash"`
}

// Twitter holds the privacy configuration settingsrelated to the Twitter shortcode.
type Twitter struct {
Service `mapstructure:",squash"`
Expand Down
3 changes: 0 additions & 3 deletions config/privacy/privacyConfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ useSessionStorage = true
[privacy.instagram]
disable = true
simple = true
[privacy.speakerDeck]
disable = true
[privacy.twitter]
disable = true
enableDNT = true
Expand All @@ -67,7 +65,6 @@ simple = true
assert.True(pc.GoogleAnalytics.UseSessionStorage)
assert.True(pc.Instagram.Disable)
assert.True(pc.Instagram.Simple)
assert.True(pc.SpeakerDeck.Disable)
assert.True(pc.Twitter.Disable)
assert.True(pc.Twitter.EnableDNT)
assert.True(pc.Twitter.Simple)
Expand Down
4 changes: 0 additions & 4 deletions docs/content/en/about/hugo-and-gdpr.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ useSessionStorage = false
[privacy.instagram]
disable = false
simple = false
[privacy.speakerDeck]
disable = false
[privacy.twitter]
disable = false
enableDNT = false
Expand All @@ -71,8 +69,6 @@ disable = true
disable = true
[privacy.instagram]
disable = true
[privacy.speakerDeck]
disable = true
[privacy.twitter]
disable = true
[privacy.vimeo]
Expand Down
29 changes: 0 additions & 29 deletions docs/content/en/content-management/shortcodes.md
Original file line number Diff line number Diff line change
Expand Up @@ -268,34 +268,6 @@ Assuming that standard Hugo pretty URLs are turned on.
<a href="/about/#who:c28654c202e73453784cfd2c5ab356c0">Who</a>
```

### `speakerdeck`

To embed slides from [Speaker Deck][], click on "&lt;&#8239;/&gt;&nbsp;Embed" (under Share right next to the template on Speaker Deck) and copy the URL:

```
<script async class="speakerdeck-embed" data-id="4e8126e72d853c0060001f97" data-ratio="1.33333333333333" src="//speakerdeck.com/assets/embed.js"></script>
```

#### `speakerdeck` Example Input

Extract the value from the field `data-id` and pass it to the shortcode:

{{< code file="speakerdeck-example-input.md" >}}
{{</* speakerdeck 4e8126e72d853c0060001f97 */>}}
{{< /code >}}

#### `speakerdeck` Example Output

{{< output file="speakerdeck-example-input.md" >}}
{{< speakerdeck 4e8126e72d853c0060001f97 >}}
{{< /output >}}

#### `speakerdeck` Example Display

For the preceding `speakerdeck` example, the following simulates the displayed experience for visitors to your website. Naturally, the final display will be contingent on your stylesheets and surrounding markup.

{{< speakerdeck 4e8126e72d853c0060001f97 >}}

### `tweet`

You want to include a single tweet into your blog post? Everything you need is the URL of the tweet:
Expand Down Expand Up @@ -418,7 +390,6 @@ To learn more about creating custom shortcodes, see the [shortcode template docu
[sctemps]: /templates/shortcode-templates/
[scvars]: /variables/shortcodes/
[shortcode template documentation]: /templates/shortcode-templates/
[Speaker Deck]: https://speakerdeck.com/
[templatessection]: /templates/
[Vimeo]: https://vimeo.com/
[YouTube Videos]: https://www.youtube.com/
2 changes: 1 addition & 1 deletion docs/themes/gohugoioTheme/src/js/hljs.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ hljs.registerLanguage('xml', require('highlight.js/lib/languages/xml'));
hljs.registerLanguage('html', require('highlight.js/lib/languages/handlebars'));

hljs.registerLanguage("go", function(e) {
var t = { keyword: "code output note warning break default func interface select case map struct chan else goto package switch const fallthrough if range end type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune id autoplay Get", literal: "file download copy true false iota nil Pages with", built_in: "append cap close complex highlight copy imag len make new panic print println real recover delete Site Data tweet speakerdeck youtube ref relref vimeo instagram gist figure innershortcode" };
var t = { keyword: "code output note warning break default func interface select case map struct chan else goto package switch const fallthrough if range end type continue for import return var go defer bool byte complex64 complex128 float32 float64 int8 int16 int32 int64 string uint8 uint16 uint32 uint64 int uint uintptr rune id autoplay Get", literal: "file download copy true false iota nil Pages with", built_in: "append cap close complex highlight copy imag len make new panic print println real recover delete Site Data tweet youtube ref relref vimeo instagram gist figure innershortcode" };
return { aliases: ["golang","hugo"], k: t, i: "</", c: [e.CLCM, e.CBCM, { cN: "string", v: [e.QSM, { b: "'", e: "[^\\\\]'" }, { b: "`", e: "`" }] }, { cN: "number", v: [{ b: e.CNR + "[dflsi]", r: 1 }, e.CNM] }, { b: /:=/ }, { cN: "function", bK: "func", e: /\s*\{/, eE: !0, c: [e.TM, { cN: "params", b: /\(/, e: /\)/, k: t, i: /["']/ }] }] }
});

Expand Down
29 changes: 0 additions & 29 deletions hugolib/embedded_shortcodes_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -160,35 +160,6 @@ title: Shorty
}
}

func TestShortcodeSpeakerdeck(t *testing.T) {
t.Parallel()

for _, this := range []struct {
in, expected string
}{
{
`{{< speakerdeck 4e8126e72d853c0060001f97 >}}`,
"(?s)<script async class='speakerdeck-embed' data-id='4e8126e72d853c0060001f97'.*?>.*?</script>",
},
} {

var (
cfg, fs = newTestCfg()
th = testHelper{cfg, fs, t}
)

writeSource(t, fs, filepath.Join("content", "simple.md"), fmt.Sprintf(`---
title: Shorty
---
%s`, this.in))
writeSource(t, fs, filepath.Join("layouts", "_default", "single.html"), `{{ .Content }}`)

buildSingleSite(t, deps.DepsCfg{Fs: fs, Cfg: cfg}, BuildCfg{})

th.assertFileContentRegexp(filepath.Join("public", "simple", "index.html"), this.expected)
}
}

func TestShortcodeYoutube(t *testing.T) {
t.Parallel()

Expand Down
1 change: 0 additions & 1 deletion hugolib/testhelpers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ respectDoNotTrack = true
anonymizeIP = true
[privacy.instagram]
simple = true
[privacy.speakerDeck]
[privacy.twitter]
enableDNT = true
[privacy.vimeo]
Expand Down
4 changes: 0 additions & 4 deletions tpl/tplimpl/embedded/templates.autogen.go
Original file line number Diff line number Diff line change
Expand Up @@ -384,10 +384,6 @@ if (!doNotTrack) {
{{ end }}`},
{`shortcodes/ref.html`, `{{ if len .Params | eq 2 }}{{ ref .Page (.Get 0) (.Get 1) }}{{ else }}{{ ref .Page (.Get 0) }}{{ end }}`},
{`shortcodes/relref.html`, `{{ if len .Params | eq 2 }}{{ relref .Page (.Get 0) (.Get 1) }}{{ else }}{{ relref .Page (.Get 0) }}{{ end }}`},
{`shortcodes/speakerdeck.html`, `{{- $pc := .Page.Site.Config.Privacy.SpeakerDeck -}}
{{- if not $pc.Disable -}}
<script async class='speakerdeck-embed' data-id='{{ index .Params 0 }}' data-ratio='1.33333333333333' src='//speakerdeck.com/assets/embed.js'></script>
{{- end -}}`},
{`shortcodes/twitter.html`, `{{- $pc := .Page.Site.Config.Privacy.Twitter -}}
{{- if not $pc.Disable -}}
{{- if $pc.Simple -}}
Expand Down
4 changes: 0 additions & 4 deletions tpl/tplimpl/embedded/templates/shortcodes/speakerdeck.html

This file was deleted.

0 comments on commit 65deb72

Please sign in to comment.