tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1804 from chillu/pulls/shortcode-quoting

Browse Source 
FIX Unquoted shortcodes weren't parsed (fixes #680)
This commit is contained in:
Ingo Schommer 2013-04-25 16:33:56 -07:00
commit 9b99eb9339
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parsers/ShortcodeParser.php
View File

@ -151,7 +151,7 @@ class ShortcodeParser {
(?:
(?:\'([^\']+)\') | # Value surrounded by \'
(?:"([^"]+)") | # Value surrounded by "
(\w+) # Bare value
([^\s,\]]+) # Bare value
)
';

8
tests/parsers/ShortcodeParserTest.php
View File

@ -150,13 +150,13 @@ class ShortcodeParserTest extends SapphireTest {
}
public function testUnquotedArguments() {
$this->assertEquals('', $this->parser->parse('[test_shortcode,foo=bar,baz = buz]'));
$this->assertEquals(array('foo' => 'bar', 'baz' => 'buz'), $this->arguments);
$this->assertEquals('', $this->parser->parse('[test_shortcode,foo=bar!,baz = buz123]'));
$this->assertEquals(array('foo' => 'bar!', 'baz' => 'buz123'), $this->arguments);
}
public function testSpacesForDelimiter() {
$this->assertEquals('', $this->parser->parse('[test_shortcode foo=bar baz = buz]'));
$this->assertEquals(array('foo' => 'bar', 'baz' => 'buz'), $this->arguments);
$this->assertEquals('', $this->parser->parse('[test_shortcode foo=bar! baz = buz123]'));
$this->assertEquals(array('foo' => 'bar!', 'baz' => 'buz123'), $this->arguments);
}
public function testSelfClosingTag() {

8
thirdparty/tinymce_ssbuttons/editor_plugin_src.js vendored
View File

@ -62,10 +62,10 @@
var content = jQuery(o.content);
content.find('.ss-htmleditorfield-file.embed').each(function() {
var el = jQuery(this);
var shortCode = '[embed width=' + el.data('width')
+ ' height=' + el.data('height')
+ ' class=' + el.data('cssclass')
+ ' thumbnail=' + el.data('thumbnail')
var shortCode = '[embed width="' + el.data('width') + '"'
+ ' height="' + el.data('height') + '"'
+ ' class="' + el.data('cssclass') + '"'
+ ' thumbnail="' + el.data('thumbnail') + '"'
+ ']' + el.data('url')
+ '[/embed]';
el.replaceWith(shortCode);