aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorParker Moore <parkrmoore@gmail.com>2013-06-15 09:55:05 -0700
committerParker Moore <parkrmoore@gmail.com>2013-06-15 09:55:05 -0700
commit84ee8d0d8a38a16bda968a6ae3030a61f045c31c (patch)
tree82182558a9043b07799e33f9713c356915b9b28f /plugins
parent82e247320ececdcea0ba10114c2e10d836e652fc (diff)
parenta2ee7a0af13216e8c68882460350680d7048bb7e (diff)
downloadmy_new_personal_website-84ee8d0d8a38a16bda968a6ae3030a61f045c31c.tar.xz
my_new_personal_website-84ee8d0d8a38a16bda968a6ae3030a61f045c31c.zip
Merge pull request #1281 from elbowdonkey/master
Allow for JsFiddle versions.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/jsfiddle.rb2
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'