From 46be4c8fc4948f3050a20de59376d46276f9673e Mon Sep 17 00:00:00 2001
From: Michael Buffington <michael.buffington@gmail.com>
Date: Tue, 11 Jun 2013 15:37:15 -0700
Subject: Adjusted JsFiddle plugin to detect jsFiddle versions.

Prior to this change, {% jsFiddle ccWP7/5 result,js,html %} wouldn't
render the desired tab order properly since the regex pattern was
being capturing the /5 as part of the first of the tabs.
---
 plugins/jsfiddle.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb
index a80becb3..9dcf57e8 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+)(?:\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'
-- 
cgit v1.2.1


From a2ee7a0af13216e8c68882460350680d7048bb7e Mon Sep 17 00:00:00 2001
From: Michael Buffington <michael.buffington@gmail.com>
Date: Tue, 11 Jun 2013 16:00:14 -0700
Subject: Revised the regex for JsFiddle plugin after further testing.

---
 plugins/jsfiddle.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/jsfiddle.rb b/plugins/jsfiddle.rb
index 9dcf57e8..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'
-- 
cgit v1.2.1