Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
jonom
ffc764dc3c
NEW: Allow configuration of initial insertion width for images and media
...
Moved default insertion dimensions logic from JS to PHP to allow setting through config API
2013-06-24 14:25:16 -06:00
Ingo Schommer
18299322bc
"Insert Media" dialog: Fixed event names
...
Fixes https://github.com/silverstripe/silverstripe-cms/issues/781
Regression from 9f600ada
which uses jQuery UI widget "subclass"
that also affects event names.
2013-06-24 18:58:46 +02:00
Damian Mooyman
f47383f52e
BUG Fixed issue where file upload via the HTML Editor media dialogue would not prompt users to overwrite existing files
2013-06-20 15:21:18 +12:00
Ingo Schommer
2160fb8000
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
admin/javascript/LeftAndMain.js
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
tests/control/ControllerTest.php
2013-06-19 14:03:43 +02:00
Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Sam Minnée
34287895ef
Merge pull request #2099 from chillu/pulls/insert-media-tweaks
...
Various "Insert Media" dialog tweaks
2013-06-18 21:32:00 -07:00
Sam Minnée
8bf4d417c6
Merge pull request #2094 from chillu/pulls/dialog-sizing
...
Min/max constraints for CMS dialog
2013-06-18 14:56:41 -07:00
Ingo Schommer
8865bae8e3
Hide titlebar in "Insert Media" when updating images
...
It doesn't make sense to show it there, since the "delete"
action has no effect, the "edit" button only collapses (useless),
and the thumbnail duplicates.
2013-06-15 10:13:44 +02:00
Ingo Schommer
ec684a2e5c
Show edit form in "Update Media" by default
...
Was showing collapsed UploadField row before which doesn't make a whole lot of sense.
2013-06-15 10:13:44 +02:00
Ingo Schommer
23c0084193
Add new files in "Insert Media" at start of the list
...
Makes the change more obvious without requiring to scroll
to action origin (upload button) out of view
2013-06-15 10:13:44 +02:00
Ingo Schommer
a9bf7dfcce
Fixed HtmlEditorField.js editor instanciation
...
Wasn't parsing data-editor attrs correctly.
Using proper instances of the underlying editor now,
instead of relying on "active editor" states which get
wonky once they lose focus (e.g. when opening a dialog).
2013-06-14 11:46:07 +02:00
Ingo Schommer
9f600ada2c
Min/max constraints for CMS dialog
2013-06-13 20:03:16 +02:00
Ingo Schommer
3b40711b98
BUG Resize infinite loops in IE8 ( fixes #575 )
...
IE8 gets a bit confused and fires resize events
when element dimensions in the DOM are changed
as a result of a resize event, causing an infinite loop.
Apart from artificially throttling the event, the only solution
I've found is to check for actual window dimension changes.
http://stackoverflow.com/questions/12366315/window-resize-event-continually-fires-in-ie7?lq=1
This implicitly fixes an issue where TreeDropdownField panel isn't
accessible in the "Insert Media" popup, because the resize event happes
to be triggered by the popup overlay, and in effect closes the drop down
panel right after opening it.
Relating to the jQuery UI component, there's a host of issues and discussions around this, but no solution…
http://bugs.jquery.com/ticket/4097
http://bugs.jqueryui.com/ticket/4758
http://bugs.jqueryui.com/ticket/4065
http://bugs.jqueryui.com/ticket/7514
http://bugs.jqueryui.com/ticket/8881
https://groups.google.com/forum/?fromgroups#!topic/jquery-ui/fDSvwAKL6Go
http://www.mail-archive.com/jquery-ui@googlegroups.com/msg04839.html
2013-06-13 17:37:25 +02:00
Ingo Schommer
385f364018
TinyMCE "Insert Media" screen, update button triggers navigation ( fixes #742 )
2013-06-13 09:29:55 +02:00
Robert Curry
36f0fd7a58
Force TreeDropdown to remember selected title.
2013-06-13 11:36:08 +12:00
Robert Curry
eaf0fe4b2f
BUG Fix JS issues in treedropdownfield for link editor
2013-06-12 16:59:07 +12:00
Ingo Schommer
d2eef63b7d
BUG Trigger TinyMCE onChange more frequently
...
Periodically check for inline changes when focused,
since TinyMCE's onChange only fires on certain actions
like inserting a new paragraph, as opposed to any user input.
This also works around an issue where the "save" button
wouldn't trigger if the click is the cause of a "blur" event
after an (undetected) inline change. This "blur" causes onChange
to trigger, which will change the button markup to show "alternative" styles,
effectively cancelling the original click event.
2013-06-03 13:32:43 +02:00
Ingo Schommer
5a1d476e8d
Merge branch 'idvalidattr' of git://github.com/wilr/sapphire into wilr-idvalidattr
2013-05-31 19:27:19 +02:00
Damian Mooyman
7f057ce343
API UploadField functions on new records
...
Fixed regression from 1e5d40474d
(UploadField::canPreviewFolder).
Merged in pull request #2009 - (6018bdd631
).
Merged pull request #1259 (34bfc862ee
).
2013-05-27 15:22:59 +12:00
Will Rossiter
831a507c90
FIX: Update references to ID values from 79c9433
2013-05-26 11:11:55 +12:00
Ingo Schommer
6f2ba3fcac
Merge pull request #2009 from sminnee/uploadfield-choose-new-file
...
NEW 'Choose another file' button on upload field AAS-917
2013-05-25 01:55:26 -07:00
Julian Seidenberg
22c7bbfcd4
NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true).
2013-05-25 19:07:06 +12:00
jean
6018bdd631
NEW 'Choose another file' button on upload field AAS-917
2013-05-25 18:38:02 +12:00
Naomi Guyer
8aa8674e78
BUG: Treedropdowns broken inside togglecomposite fields ( fixes #1945 )
...
* Removed positioning javascript from treedropdownfield
* Set parent to be relatively positioned and overflow to visible
2013-05-23 14:41:08 +12:00
Ingo Schommer
214515f232
Merge pull request #1936 from mikg0/patch-1
...
Fix file link recognition in HtmlEditorField.js
2013-05-22 07:43:11 -07:00
Sean Harvey
9f532fe976
BUG GridField action onclick assuming URL without "?" character
...
Sometimes GridState URL will have a query string already appended,
e.g. "?local=en_GB", but the GridField javascript assumes there won't
be.
The result would be an action URL like:
"/my/url?locale=en_US?RelatedPage=123" which is obviously invalid.
The fix is to check that "?" exists in the GridState URL and use
"&" instead to connect the URLs if that's the case.
2013-05-15 15:49:23 +12:00
mikg0
fb5fc62604
Fix file link recognition in HtmlEditorField.js
...
The new file_link format ([file_link,id=\d+]) uses a comma which was not reflected in the regex.
2013-05-13 15:04:52 +03:00
Mateusz Uzdowski
fdb4a1d871
BUG Enable dropdown so alignment on images can be updated.
2013-05-13 10:08:03 +12:00
Will Rossiter
94d6b1ccff
FIX: Disable autocomplete on ConfirmedPasswordField instances.
2013-05-10 20:32:59 +12:00
Ingo Schommer
a1216b5e32
Merge pull request #1250 from wilr/gridfield-action-fixes
...
FIX: Do not blindly pass input values to GridField_FormAction URL's
2013-05-08 04:20:40 -07:00
Ingo Schommer
9a17e3494f
DateField.js event selector regression ( fixes #1528 )
...
See 19a8545076
2013-04-16 09:54:30 +02:00
Ingo Schommer
16c7235942
DateField.js event selector regression ( fixes #1528 )
...
See 19a8545076
2013-04-11 10:19:00 +02:00
Ingo Schommer
9856fcef21
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
javascript/DateField.js
model/DataQuery.php
model/Versioned.php
tests/forms/RequirementsTest.php
tests/model/DataObjectLazyLoadingTest.php
view/Requirements.php
2013-04-09 14:45:35 +02:00
Sam Minnée
39a4aabcdc
Merge pull request #778 from patbolo/bugfix/7853
...
FIX 7853
2013-04-08 16:08:23 -07:00
Ingo Schommer
3768c247b4
Reset TreeDropdownField search field after defocus
...
Was unsetting original selection even if no new one was made.
2013-04-08 19:42:17 +12:00
Ingo Schommer
5119d9aa72
FIX Only allow one concurrent ajax in TreeDropdownField
...
Prevents situations where a previous action might finish out of line
and override later choices, such as first expanding the (full) tree panel,
then limiting the tree through searching.
2013-04-08 19:42:17 +12:00
Ingo Schommer
da87614d8f
FIX Skip autofocus on TreeDropdownField
...
To avoid (visually) unsetting the selected value if the drop down
is the first form field on the page (see LeftAndMain.EditForm.js)
2013-04-08 19:42:17 +12:00
Ingo Schommer
c08ab18c03
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
.travis.yml
admin/javascript/LeftAndMain.AddForm.js
docs/en/reference/requirements.md
2013-04-02 02:00:50 +02:00
Naomi Guyer
19a8545076
BUG: update deprecated 'live' jquery to 'on'
...
'live' has been deprecated since jquery v 1.7.0, and has been removed
in the latest 2 versions of jquery
2013-03-27 15:09:49 +13:00
Ingo Schommer
0a283eacb8
FIX Unset internal metadata on TreeDropdownField setValue()
...
Otherwise the hidden field value and metadata will get out of sync.
Most commonly used together with setTitle('') as well.
2013-03-25 23:39:37 +01:00
Ingo Schommer
8bedf485d6
Don't fail TinyMCE cleanup if no current instance is set
...
Bug has been observed in IE8
2013-03-20 14:46:28 +01:00
Ingo Schommer
e0e481fc46
Removed stray code from HTMLEditorField.js
2013-03-15 12:01:45 +01:00
Wernervanrun
fade5cce51
Update javascript/HtmlEditorField.js
...
we only want this .ss-uploadfield-files - else we get all ss-uploadfield-files wich include the ones not related to #tinymce insertmedia
2013-03-07 20:33:02 +01:00
Will Rossiter
1853fc864a
FIX: Do not blindly pass input values to GridField_FormAction URL's
...
The length of input fields can very quickly exceed the max URI length resulting in 414 errors when printing or exporting results.
To access the input values for a specific GridField action, encapsulate this in your own Entwine instance.
2013-03-05 10:30:39 +13:00
Ingo Schommer
a86e4ee00c
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
tests/injector/InjectorTest.php
tests/travis/before_script
2013-02-18 14:15:42 +01:00
ARNHOE
823b2acda3
Update javascript/lang/nl_NL.js
2013-02-18 12:09:38 +01:00
Sean Harvey
d320247627
Trigger delete confirmation popup when deleting a GridFieldDetailForm record
2013-02-05 13:14:03 +13:00
Ingo Schommer
fe740515b4
Loading "OR" in admin/assets for Chrome ( fixes #8245 )
2013-02-04 22:00:12 +01:00
Sean Harvey
6a1fe05191
Merge pull request #1151 from silverstripe-rebelalliance/bug/image_reedit_attr
...
FIX Assiging width to caption instead of container
2013-01-31 13:23:36 -08:00