Daniel Hensby
214c3d2582
Merge branch '3.1' into 3.2
2016-11-28 13:16:27 +00:00
UndefinedOffset
a4760b8ee4
BUGFIX: Fixed issue where a shortcode's location would not get set to split when using the class leftAlone
2016-11-24 17:28:15 -04:00
Daniel Hensby
39238d908e
FIX falsey attribute values in shortcodes now work
2016-07-04 15:17:24 +01:00
Daniel Hensby
765f45eaf1
Check for shortcode tag before trying to parse shortcodes
2016-07-04 15:10:42 +01:00
Daniel Hensby
ca8d0f2818
Merge branch '3.1' into 3.2
...
Conflicts:
dev/Debug.php
docs/en/05_Contributing/01_Code.md
forms/FormField.php
i18n/i18nTextCollector.php
model/DataQuery.php
2015-07-20 10:48:01 +01:00
Sam Minnee
d7241958ff
Performance/reliability improvement for leaving unrecognised tags.
...
error_behaviour = self::LEAVE is the default behaviour. In this case,
we don’t even need to bother recognising such tags. Rather than
replacing with marker images and re-inserting the original text after
we’re done, we can leave them alone.
This should make the code faster and more reliable.
2015-06-22 11:31:12 +01:00
Sam Minnee
6d05c57881
Ensure that shortcodes inside script tags are parsed. Fixes #4332 .
...
The problem is that the marker images aren’t picked up by DOMDocument
if they are inserted into a <script> tag, due to the semantics of HTML.
This fix does an additional replacement after the marker images are
replaced in this way to pick up any leftover tags.
2015-06-22 11:29:12 +01:00
Damian Mooyman
e14f743bf0
Set deprecation level for all changes in 3.x to 4.0
2015-06-19 13:07:41 +12:00
Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Patrick Nelson
5ae0ca1407
FIX #4100 Setup the ability to overload the ShortcodeParser class and ensuring its methods/properties are extensible via the "static" keyword.
2015-04-26 18:47:02 -04:00
Damian Mooyman
eb069e605d
Remove all redundant whitespace
2014-08-19 09:17:15 +12:00
Damian Mooyman
0cbad41d3b
Rewrote usages of error suppression operator
2014-03-05 15:48:55 +13:00
Kirk Mayo
3a9bd54280
NEW: Fixed broken documentation link for Shortcodes
2014-01-31 15:35:18 +13:00
Andrew Short
a339687493
API: Pass extra context information to shortcode handlers.
...
This allows shortcodes to perform more complex actions on the element
which contains them. For example, the element reference can be used
to add extra classes or attributes to links which provide additional
metadata.
2013-10-09 15:05:17 +11:00
Simon Welsh
151baeede1
Correct line length and indentation
2013-08-21 18:54:05 +12:00
Ingo Schommer
4c7c40e8b9
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
parsers/ShortcodeParser.php
2013-05-17 13:51:54 +02:00
Ingo Schommer
146b5a81cb
Improved shortcode docs
2013-05-17 13:49:46 +02:00
Josua2012
e3b6feba2a
Sometimes $parent->parentNode is null and fails.
2013-05-08 09:39:35 +02:00
Ingo Schommer
caaf5a2d78
Fixed BBCodeParser config API usage
2013-04-29 23:31:23 +02:00
Ingo Schommer
0e5b099287
FIX Unquoted shortcodes weren't parsed ( fixes #680 )
...
Since that used to be the default shortcode notation
for our core "insert media" functionality, its important
to have this fixed and keep supporting "legacy" content
created with 3.0.
2013-04-26 01:00:13 +02:00
Ingo Schommer
04c3b5ee94
Fixed static config in BBCodeParser ( fixes #8340 )
2013-03-26 10:15:17 +01:00
Ingo Schommer
3334eafcb1
API Marked statics private, use Config API instead ( #8317 )
...
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Hamish Friedlander
53128c5d2f
Make ShortcodeParser use HTMLValue for HTML parsing
2013-03-14 12:49:03 +13:00
Hamish Friedlander
7afcd64418
FIX Make ShortcodeParser obey error_behavior in attribute scope
2013-02-22 11:34:15 +13:00
Hamish Friedlander
1ee01c39d4
FIX ShortcodeParser producing bad output after escaped tag
...
Also tightens up matching of shortcodes so we dont match on invalid shortcodes
2013-02-22 10:30:51 +13:00
Hamish Friedlander
76fdb2a2d6
FIX ShortcodeParser#parse in < PHP 5.3.6 where saveHTML doesnt take arg
2013-02-20 10:57:06 +13:00
Hamish Friedlander
cbef44b8d6
FIX Make ShortcodeParser#parse passthrough not error on invalid HTML
2013-02-20 10:57:06 +13:00
Hamish Friedlander
1f4c8174e6
FIX new ShortcodeParser handling of empty strings and escapes
2013-02-18 17:00:42 +13:00
Hamish Friedlander
2335c074b3
NEW Make shortcode parser more clever about placement
...
Shortcodes have traditionally had a problem that they are inside <p> tags,
but generate block level elements. This breaks HTML compliance.
This makes the shortcode parser now mutate the DOM based on the "class" attribute on
the shortcode to insert the generated block level element at the right place in the DOM
- for "left" and "right" elements it puts them just before the block level
element they are inside
- for "leftAlone" and "center" elements it splits the DOM around the shortcode.
The trade off is that shortcodes are no longer "text level" features. They need
knowledge of the HTML they are in to perform this transformation, so they can
only be used in (valid) HTML
2013-02-18 10:49:52 +13:00
Mateusz Uzdowski
d741aa9b95
Move the shortcode docs to documentation, add examples.
2013-02-05 09:27:22 +13:00
Simon Welsh
b0121b541c
Add codesniffer that ensures indentation is with tabs.
2012-12-12 17:33:31 +13:00
Simon Welsh
fc5dd2994c
Add codesniffer that ensures indentation is with tabs.
2012-12-12 00:12:11 +13:00
Sam Minnee
1f7fc1f76a
FIX Remove instances of lines longer than 120c
...
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit. This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Ingo Schommer
e2f073f38a
Method visibility according to coding conventions
2012-09-20 10:46:59 +02:00
Hamish Friedlander
c7eb4f3138
BUG BBCodeParser wasnt working due to php4 lack of statics
2012-07-31 15:43:01 +12:00
Kirk Mayo
9e1f7421f5
BUG: open ticket 7678 fixing usable_tags to send an array to ArrayList
2012-07-18 17:02:31 +12:00
Mateusz Uzdowski
7c41ff22ab
BUG Change all shortcodes into the new, comma separated, format.
...
Space delimiter is often confused by browsers, and encoded as %20 which
breaks the shortcode system. Change to comma delimitation has already
been implemented, this is a followup cleanup.
Ref http://open.silverstripe.org/ticket/7337
2012-07-12 16:44:21 +12:00
Simon Welsh
a172a2e731
BUGFIX: Handle consecutive shortcodes.
2012-05-23 18:18:06 +12:00
Mateusz Uzdowski
59663f9289
BUGFIX: fix up some E_STRICT errors
2012-04-17 11:51:55 +12:00
Simon Welsh
f07258f3cf
MINOR Update @package values to match renaming sapphire
2012-04-15 10:50:19 +12:00
Simon Welsh
3a6341a251
API-CHANGE sapphire folder can now be renamed.
2012-04-15 10:50:19 +12:00
Simon Welsh
f8082e4814
MINOR Add newline to end of files without one
2012-04-15 10:50:19 +12:00
Sean Harvey
49267dbbc4
ENHANCEMENT Shortcodes now support commas as delimiter for attributes (thanks aoneil for help with the regex!) (trac #6868 )
...
BUGFIX HtmlEditorField not inserting shortcodes correctly (trac #6868 )
2012-03-09 14:25:42 +13:00
Fred Condo
d370423825
Clean up trailing ?> per coding standard
...
All sapphire but the lang directory
2012-02-12 12:40:16 -08:00
Stig Lindqvist
e38dd08ea5
MINOR: Fix docblocks to reference SS_List instead of (now deprecated) DataObjectSet where appropriate
2011-10-28 15:58:55 +13:00
Will Rossiter
1732a17114
Merged new-orm into datagrid
2011-09-26 16:47:54 +13:00
Ingo Schommer
ce8e72cf0e
MINOR Removing executable flag from all files (thanks miiihi)
2011-09-18 22:04:02 +02:00
ajshort
3f132a105b
API CHANGE: Replaced DataObjectSet instances with ArrayList.
2011-05-05 20:40:24 +10:00
Sam Minnee
f20e83eeaf
MINOR: Fix links etc, and remove www. from SS urls (from r109105)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112783 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-19 00:56:25 +00:00
Ingo Schommer
a0dd4ff8f0
MINOR Moved class-specific documentation from doc.silverstripe.org back into class-level PHPDoc (from r107725)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112608 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 03:55:22 +00:00