diff options
| author | Alexandre Perrin <alexandre.perrin@netoxygen.ch> | 2013-09-27 10:53:43 +0200 |
|---|---|---|
| committer | Alexandre Perrin <alexandre.perrin@netoxygen.ch> | 2013-09-27 10:53:43 +0200 |
| commit | 8bfd5ef3237f07125adde7043c19a3159879044a (patch) | |
| tree | 6ac9b05d53cde0c5a6c837e8316683f652f3d5cf /plugins/jsfiddle.rb | |
| parent | fe28c0b518e47f7929772eaaab7b0118ddcfbaad (diff) | |
| parent | f0674c69366b9172e6811036bbc5b0a29dbf6025 (diff) | |
| download | my_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.tar.xz my_new_personal_website-8bfd5ef3237f07125adde7043c19a3159879044a.zip | |
Merge branch 'master' of https://github.com/imathis/octopress
Diffstat (limited to 'plugins/jsfiddle.rb')
| -rw-r--r-- | plugins/jsfiddle.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb index a80becb3..0046f9b5 100644 --- a/plugins/jsfiddle.rb +++ b/plugins/jsfiddle.rb @@ -18,7 +18,7 @@ module Jekyll class JsFiddle < Liquid::Tag def initialize(tag_name, markup, tokens) - if /(?<fiddle>\w+)(?:\s+(?<sequence>[\w,]+))?(?:\s+(?<skin>\w+))?(?:\s+(?<height>\w+))?(?:\s+(?<width>\w+))?/ =~ markup + if /(?<fiddle>\w+\/?\d?)(?:\s+(?<sequence>[\w,]+))?(?:\s+(?<skin>\w+))?(?:\s+(?<height>\w+))?(?:\s+(?<width>\w+))?/ =~ markup @fiddle = fiddle @sequence = (sequence unless sequence == 'default') || 'js,resources,html,css,result' @skin = (skin unless skin == 'default') || 'light' |