Commit Graph

45 Commits

Author SHA1 Message Date
Damian Mooyman
0abacaead6 Merge remote-tracking branch 'origin/3.1' into 3
Conflicts:
	admin/code/LeftAndMain.php
	forms/EmailField.php
	forms/Form.php
	forms/HeaderField.php
	forms/LiteralField.php
	forms/PasswordField.php
	forms/TextareaField.php
	forms/TreeDropdownField.php
	model/DataObject.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Christopher Pitt
53cf2929d4 Clean up TextareaField 2015-04-30 11:52:37 +12:00
Damian Mooyman
eb069e605d Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
Ingo Schommer
c11b3918fc Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
	core/PaginatedList.php
	email/Mailer.php
2013-01-21 11:14:57 +01:00
Nicolaas
3fca288873 Update forms/TextareaField.php
small edit to description of the field (usage).  Removed reference to cols and rows parameters.
2012-12-26 22:29:36 +13:00
Ingo Schommer
559abecd56 API Copying instance props on FormField readonly/disabled transformations
Introduced new FormField->castedCopy() method
which tries to replicate the existing form field instance
as closely as possible.

Primarily, the fix was targeted at consistently passing
through FormField->description to all of its variations.
2012-12-14 01:58:04 +01:00
Sean Harvey
4c803a2049 Removed deprecated arguments of row, cols to TextareaField
Use setColumns() and setRows() instead
2012-11-15 14:43:21 +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
Sean Harvey
6ab04a6a55 Refer to setColumns in deprecation message instead of non-existent setCols 2012-09-18 09:39:08 +12:00
Normann Lou
3b3b515571 API CHANGE Read-only fields no longer include companion hidden fields (see pull request #399)
BUGFIX Remove legacy code and template which is never picked-up so that TextareaField becomes 'readonly' when it is transfered to readonly field. Change TextareaFieldTest test cases to address a 'readonly' textarea field displaying the special html characters correctly.
2012-05-03 14:24:03 +02:00
Simon Welsh
f8082e4814 MINOR Add newline to end of files without one 2012-04-15 10:50:19 +12:00
Will Rossiter
07d2d5273a ENHANCEMENT: populate FormField:: on the fly based on class name of field rather than requiring explict definition. 2012-04-14 17:36:19 +12:00
Ingo Schommer
7602d081a2 ENHANCEMENT Fluent interface in Form API by returning instance from all setters 2012-02-17 13:35:26 +01:00
Ingo Schommer
243d4d45aa MINOR Restored row/col defaults in TextareaField and HtmlEditorField (broken in 1a10e8bc) 2012-02-10 12:15:41 +01:00
Ingo Schommer
1a10e8bcf5 API CHANGE Removed $rows and $cols constructor arguments on TextareaField and HtmlEditorField, use setRows() and setCols() instead 2012-01-02 17:44:23 +01:00
Ingo Schommer
b5421d9598 ENHANCEMENT Allowing custom attributes in (most) FormField implementations, which allows for HTML5 data attributes 2012-01-02 16:48:14 +01:00
Ingo Schommer
475f3764c3 BUGFIX Using separate template for readonly version of Textarea (mainly to avoid SSViewer bugs, but also for more granular customisation) 2012-01-02 16:48:14 +01:00
Ingo Schommer
a6148c33da MERGE Using FormField->template in most fields 2012-01-02 16:48:14 +01:00
Sean Harvey
9e548f501e API CHANGE FormField::Field() and FormField::FieldHolder() now render into templates on each FormField instead of creating HTML from PHP 2012-01-02 16:48:13 +01:00
Ingo Schommer
ce8e72cf0e MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
Colby Klein
bb09555cdb Forgot to remove this line in my last commit. 2011-06-23 19:28:42 -07:00
Colby Klein
1460789817 Fix tabindex being present on read only form fields instead of regular ones. 2011-06-23 19:18:59 -07:00
Julian Seidenberg
dec5c0ae60 API CHANGE: TextareaField doesn't have hidden value on read-only transformation. Added hidden fields in a way that doesn't break unit tests too severely (fixes #5056, thanks jshipman) 2011-03-30 18:16:17 +13: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
2d2ca13e45 ENHANCEMENT: added setRows() and setColumns() to customize the size of the textarea field outside of the controller (from r106118)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@112518 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-15 02:56:36 +00:00
Sean Harvey
6c754d29e9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@79438 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-17 11:36:49 +00:00
Sean Harvey
75ba6a1ab9 Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@77764 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-25 06:59:21 +00:00
Sean Harvey
0a5f4de51c Merged from branches/2.3
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@76661 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-05-12 05:12:47 +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
d26f08b481 MINOR merged branches/2.3 into trunk
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@67465 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-12-04 22:38:32 +00:00
Sean Harvey
c013b02dc8 MINOR Code formatting in TextareaField->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64871 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-29 03:13:38 +00:00
Sean Harvey
a78b5a2efb BUGFIX Fixed extra class addition on various FormField->Field() methods
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64601 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-21 20:58:11 +00:00
Sean Harvey
bd023527e6 ENHANCEMENT Used _t() entity instead of hardcoded "not set" string in TextareaField->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64558 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:58:31 +00:00
Sean Harvey
fda6ab0afb MINOR Unnecessary check of trim() twice on TextareaField->Field()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64557 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:54:04 +00:00
Sean Harvey
719bc5dff4 MINOR whitespace removal
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64555 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:32:14 +00:00
Sean Harvey
f5a39b5c2c ENHANCEMENT Made use of FormField->createTag() functionality for creating a textarea field in TextareaField->Field()
MINOR Documentation tweaks in TextareaField

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@64551 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-10-20 10:05:05 +00:00
Sean Harvey
dc5607d8f0 ENHANCEMENT If title not passed into TextareaField constructor, it defaults to the name value
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@61147 467b73ca-7a2a-4603-9d3b-597d59a354a9
2008-08-20 04:36:45 +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
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
Romain Louis
70d41d5dc9 Readonly work
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44405 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-07 02:03:48 +00:00
Romain Louis
eda727dacc Readonly class added in performreadonly function
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44374 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-11-06 20:33:13 +00:00
Sam Minnee
f199dc6cd4 Added docblock headers and removed notice-level errors
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@40912 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-27 05:13:43 +00:00
Matt Peel
8a36ab4ed5 Added performDisabledTransformation() and performReadonlyTransformation() methods that set a TextareaField to be disabled (unselectable, not sent by browser when form is submitted) and readonly (selectable, sent by browser when form is submitted).
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39927 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-08-13 11:54:44 +00:00
Hayden Smith
4a5d9b03f8 Moved Sapphire module to open source path
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@39001 467b73ca-7a2a-4603-9d3b-597d59a354a9
2007-07-19 10:40:28 +00:00