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
10,920 Commits 31 Branches 527 Tags 162 MiB
d3e4863f52
Commit Graph

57 Commits

Author SHA1 Message Date
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
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
Ingo Schommer
6460d09570 MINOR Fixed phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@103385 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2010-04-23 00:11:41 +00:00
Ingo Schommer
abb04b2ea4 BUGFIX Fixed newlines working properly across different platforms - Windows, for example, won't work properly with just \n so use PHP_EOL for a cross-platform solution 
MINOR Fixed appropriate failing tests to use PHP_EOL (from r92220)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@92460 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-11-21 01:43:54 +00:00
Andrew Short
4ece35937f FEATURE: Added the Shortcode API (ShortcodeParser) to allow you to replace simple BBCode-like tags in a string with the results of a callback. 
From: Andrew Short <andrewjshort@gmail.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88472 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 00:06:57 +00:00
Ingo Schommer
6c70b10173 MINOR Removed debug code 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73881 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-31 17:07:16 +00:00
Ingo Schommer
b12a00c391 MINOR phpdoc documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@73509 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-03-22 22:59:14 +00:00
Andrew O'Neil
60f75c5ca4 Merged changes from 2.3 branch 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@71172 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-02-01 23:49:53 +00:00
Ingo Schommer
0747fc6d52 MINOR merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69856 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-07 23:00:54 +00:00
Ingo Schommer
085346f0e0 MINOR Merged from branches/2.3 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@69704 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-01-05 06:19:48 +00:00
Sam Minnee
6915ac9bc7 Turned dos line endings into unix 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63113 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-26 02:22:51 +00:00
Ingo Schommer
c57ce5f1a4 FEATURE Formatting MySQL error messages with newlines through new SQLFormatter class (used in MySQLDatabase) 
ENHANCEMENT Using CliDebugView to report errors on ajax requests (with plaintext output)
ENHANCEMENT Removed "ERROR:" prefix hack for ajax error responses - clientside evaluation should inspect HTTP status codes instead

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@62467 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-09-16 18:12:07 +00:00
Andrew O'Neil
5da717ed1d Merged revisions 56631 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r56631 | sminnee | 2008-06-20 12:45:34 +1200 (Fri, 20 Jun 2008) | 1 line
  
  Improved BBCode parser
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56913 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 04:03:06 +00:00
Andrew O'Neil
9143050226 Merged revisions 55730 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r55730 | wrossiter | 2008-06-05 16:25:08 +1200 (Thu, 05 Jun 2008) | 1 line
  
  MINOR: removed debug statement
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56909 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 04:00:03 +00:00
Andrew O'Neil
b0c209a15d Merged revisions 54619 via svnmerge from 
svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.2.2

........
  r54619 | sminnee | 2008-05-15 15:00:15 +1200 (Thu, 15 May 2008) | 1 line
  
  Fixed php/code snippets in forum posts
........


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56907 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-25 03:59:11 +00:00
Ingo Schommer
60860cc1b9 MINOR Unified @package PHPdoc (added where missing, removed duplicates) 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@56212 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-06-15 13:33:53 +00:00
Matt Peel
7d13ba7fb8 Reverted geoffm's accidental commit to /open 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50107 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 02:10:37 +00:00
Geoff Munn
bf3c09bec6 First post 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@50105 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-02-25 01:06:39 +00:00
Ingo Schommer
9a36047021 converted TODO into @todo for better PHPDocumentor support 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47884 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-11 01:49:50 +00:00
Sam Minnee
fea4042c3c rbarreiros: #1918 Translate newsletter and other strings 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47832 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 03:28:13 +00:00
Sam Minnee
41a11b277e Improved API documentation 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47799 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-10 00:34:18 +00:00
Sam Minnee
b1d2e3906b API Documentation updates 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47766 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-09 04:18:36 +00:00
Sam Minnee
d27937f448 Updated API documentation package tags 
Fixed some whitespace

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@47725 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2008-01-08 06:37:50 +00:00
Andrew O'Neil
290097242d Change include path to work on more configurations 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@43117 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-04 21:59:51 +00:00
Jeremy Shipman
e0ddba6ab8 Merging 2.1 blog into trunk 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@42892 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2007-10-02 03:21:38 +00:00