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
12,104 Commits 31 Branches 527 Tags 162 MiB
36d8a9f62d
Commit Graph

650 Commits

Author SHA1 Message Date
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
Hamish Friedlander
aa3eb98de2 FIX Assiging width to caption instead of container 2013-02-01 10:17:56 +13:00
Ingo Schommer
dc75d9a5b4 Merge pull request #1149 from silverstripe-rebelalliance/bug/image_reedit_attr 
FIX A couple of bugs integrating the SilverStripe media panel with TinyMCE
 2013-01-31 15:24:51 +01:00
Hamish Friedlander
6f937745b0 FIX Not being able to remove, add or edit the caption on an image properly 2013-01-31 16:35:48 +13:00
Ingo Schommer
0b44d8fbfb Merge pull request #1145 from silverstripe-rebelalliance/bug/image_reedit_attr 
FIX Not calling updateFromNode on re-opening an image
 2013-01-30 14:52:50 +01:00
Hamish Friedlander
9f822d1e3c FIX Not calling updateFromNode on re-opening an image 
Inside mediaform updateFromEditor we called $(this).updateFromNode, but this wasnt
pointing to anything useful after a refactor, which resulted in the fields not
being filled in with current data when editing an already-inserted image
 2013-01-30 17:15:01 +13:00
Mateusz Uzdowski
6c78bf9be9 BUG Flush editors on form submission (os#8222) 
Otherwise some non-textual changes such as moving images and resizing
them could be missed when saving.

This is because TinyMCE does not treat the image move/resize as an
undolevel and does not register this via regular "onChange" event.
 2013-01-30 11:54:29 +13: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
Kirk Mayo
d12ae82f70 Bug fix for open/8181 which stops the HTML source editor window saving/publishing 2013-01-21 08:26:19 +01:00
uniun
e9ba54dec7 Impossible to unselect TreeDropdownField 
It was impossible to unselect TreeDropdownField.
'!' operator should not be used at all and identical comparison (===) was too "strict" (self.getValue() returns string but $(node).data('id') returns number).
 2013-01-15 11:29:35 +02:00
Ingo Schommer
f30277c3cf Split out getLinkAttributes() in .htmleditor JavaScript for more flexibility 
Saves us from overwriting the whole insertLink() method just
to add another option.
 2013-01-14 16:54:58 +01:00
Nathan Cox
fd80c4fb3e Issue #7818: Making sure UploadField can find the form/SecurityID on direct page load/refresh 2013-01-11 16:42:20 +01:00
Kirk Mayo
561e629c16 NEW Show the allowed extensions as a toggle tip as per trac 7993 
NEW Added a behat test for showing extension trac 7993
 2012-12-19 17:00:39 +01:00
Adam Judd
3a555d2bcb Set 'active' correctly for accordion widget 
The accordion widget was previously being passed true and false, where as it either expects true or the integer of the panel to show.

This fix sets it as either false or 0.
 2012-12-18 23:22:37 -08:00
Ingo Schommer
d13c53fda6 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	tests/model/DataQueryTest.php
 2012-12-14 10:57:28 +01:00
Mateusz Uzdowski
4d6d823cb1 API Allow ignoring persistent tab state through entwine property. 
In this case we don't want to rely on data attributes in the DOM, as
this should be an inbuilt property associated with this class.
 2012-12-13 17:43:25 +01:00
Naomi Guyer
5cef05ebea Separate out ActionTabSet functionality into a new file & clean up. 2012-12-13 17:43:25 +01:00
Naomi Guyer
618e639526 Refactor and comment TabSet.js 2012-12-13 17:43:25 +01:00
Naomi Guyer
235e8c8138 CSS fixes for the ActionTabSet. 
Thanks for contributing @clarkepaul!
 2012-12-13 17:43:25 +01:00
Mateusz Uzdowski
fe08236f21 API Add action tabsets as a interface idiom. 
Introduces the concept of action tabsets - usage of TabSet and Tabs
in between the action buttons to allow richer set of capabilities that
can be offered to the user.

Goes along with c8d0cdec99c95dbed3b58ebcc098cc9d22c58206 that implements
a change to the CMS actions.
 2012-12-13 17:43:24 +01:00
Loz Calver
639cc0222c BUG Fix insert media form inserting images from other UploadFields (fixes #8051) 
The insert media form would pick up unwanted images from other
UploadFields. Limiting where it is looking to only the closest form
fixes this.
 2012-12-12 15:55:33 +00: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
Ingo Schommer
548ad503ed API Removed keyed arrays for title/value setting in SelectionGroup 
Use SelectionGroup_Item class instead. Necessary because
of removal of array key support from ArrayList (see d12b49702).
 2012-12-11 11:06:06 +01:00
Ingo Schommer
fa84c2d705 Merge remote-tracking branch 'origin/3.0' 2012-12-10 17:50:43 +01:00
Ingo Schommer
b15b5cd115 Ability to replace entire content in HTMLEditorField JS API 2012-12-10 15:39:15 +01:00
Marcus Nyeholt
1a4b245e84 BUG Fix rewriteHashlinks in TabSet 
As per commit 3478813, check for presence of href before matching
 2012-12-04 16:00:40 +11:00
Sean Harvey
6ce6f9a2c1 Merge branch '3.0' 2012-11-26 17:17:41 +13:00
UndefinedOffset
4310718b94 BUG Insert Media, inserts all previous media (fixes #7545) 2012-11-23 17:37:39 +01:00
Mateusz Uzdowski
b02b1e6dbc API Forward the editor events to underlying textarea. 
Makes the editor API more flexible by triggering generic JS events that
can be used from entwine. This makes it easier to add event handlers to
the editor and cleans up the initialisation call from unrelated code.

The patching code also forwards editor changes to the textarea field,
which in perspective will allow the changetracker to react to changes in
this field as they happen.
 2012-11-23 00:50:18 +01:00
Sean Harvey
4651e9bbc9 BUG Fixing ToggleField to work correctly with jQuery 2012-11-16 11:33:58 +13:00
Sean Harvey
77337ae58c Removing deprecated TableListField and subclasses 
These have been moved to a module called "legacytablefields"
located at https://github.com/silverstripe-labs/legacytablefields
 2012-11-16 11:04:28 +13:00
Ingo Schommer
62280b9ba3 Merge pull request #950 from webspilka/patch-1 
Update javascript/GridField.js
 2012-11-15 02:23:08 -08:00
Sean Harvey
6ce33d5e59 Removing deprecated ImageFormAction 
Use FormAction with setAttribute('src', 'myimage.png') and custom
JavaScript to achieve hover effect.
 2012-11-15 14:43:15 +13:00
Sean Harvey
594faf71b2 Removing deprecated FileIFrameField, use UploadField instead 2012-11-15 14:43:14 +13:00
Vitaliy
41efeedc30 Update javascript/GridField.js 
The escape and unescape functions do not work properly for non-ASCII characters and have been deprecated. In JavaScript 1.5 and later, use encodeURI, decodeURI, encodeURIComponent, and decodeURIComponent.
I have problem with cyrillic http://www.silverstripe.org/general-questions/show/21433
 2012-11-15 03:31:37 +02:00
Sean Harvey
f4a4465873 Merge branch '3.0' 2012-11-07 11:12:01 +13:00
Ingo Schommer
a7efc76c36 Removed usage of deprecated jQuery UI 1.9 features 
See http://jqueryui.com/upgrade-guide/1.9 for details.
Fixes fade effect on changing toplevel tabs
(semantics for "show" option in $.tabs() changed).
 2012-11-06 22:53:34 +01:00
Ingo Schommer
3214a0a756 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	admin/css/screen.css
 2012-11-06 19:56:34 +01:00
Ingo Schommer
ff39f9ad38 Upgrade jQuery UI to 1.9 
- Fixed jQuery.tabs remote tabs loading behaviour (see http://forum.jquery.com/topic/tabs-api-redesign)
 2012-11-06 19:45:56 +01:00
Sean Harvey
169366a011 Merge branch '3.0' 2012-11-06 13:04:21 +13:00
Sean Harvey
fbc6e3366b Merge branch '3.0' 2012-11-05 15:11:48 +13:00
Normann Lou
5152164d17 BUGFIX: Multiple HTMLEditorFields not redrawing, fix by storing its container object before setting timeout 2012-11-05 11:56:29 +13:00
Naomi Guyer
2dabaebad8 BUG: File Uploading Notifications (fixes #7883) 
Put "File upload complete" and "back to folder" together. Turned 'File
upload' into a message, and updated the message styles.
Moved allowed file types into the area where users are uploading files.
This is a temporary fix until js tooltips are implemented, at which
point, these details will be shown when clicking a question mark beside
"Choose files".
Added small animation effect to files when opening iframe to edit. Now
slides down, rather than just appearing open
Linked to silverstripe/silverstripe-cms#223
 2012-11-02 12:46:16 +13:00
Ingo Schommer
d342794cfe BUG Fixed intermittent absence of UploadField "drop" area 
Only occurs when the UploadField resources are loaded uncached.
Possible cause: Randomized application between UploadField.js
setting "display: block" and UploadField.css setting "display: none". Simply hiding the element before showing it fixes the issue.
 2012-10-31 11:34:12 +01:00
Simon Welsh
bedb579b07 Merge branch '3.0' 2012-10-23 15:21:20 +13:00
Mateusz Uzdowski
e84b0339d8 FIX Pass only the search string where testing, not the entire form. 2012-10-15 16:47:54 +13:00
Ingo Schommer
e9cf4affc7 Merge remote-tracking branch 'origin/3.0' 2012-10-09 09:32:43 +02:00
Ingo Schommer
680baab925 BUG Delay HTMLEditorField showing (TinyMCE workaround) 
Delayed show because TinyMCE calls hide() via
setTimeout on removing an element,
which is called in quick succession with adding a new editor
after ajax loading new markup

See e0378ceb77
and https://github.com/silverstripe/sapphire/pull/847
 2012-10-08 21:44:03 +02:00
Ingo Schommer
d1ee7612f5 Merge remote-tracking branch 'origin/3.0' 2012-10-08 16:48:52 +02:00
Normann Lou
9aaa6b1a7b ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty. 2012-10-05 17:00:39 +13:00
Normann Lou
1fca4911e1 BUGFIX: replace 'sapphire' with 'framework' in those legacy fields: TableField, TableListField and ComplexTableField. 2012-10-05 16:54:14 +13:00
Ingo Schommer
56f7ce1dcf Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php
 2012-10-03 16:16:19 +02:00
Ingo Schommer
b22a7afc03 BUG TreeDropdownField panel positioning 
See https://github.com/silverstripe/sapphire/pull/809, thanks martinduparc
 2012-10-02 12:02:42 +02: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
Jeremy Bridson
07bc75c281 ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab. 2012-09-28 16:37:35 +02:00
Simon Welsh
1e629f4585 Merge branch '3.0' 
Conflicts:
	control/Cookie.php
	control/Director.php
	dev/Profiler.php
	view/Requirements.php
 2012-09-21 14:56:56 +12:00
jean
d1a3c80a9d FIX 7862 Strict equality check on previously selected item in the TreeDropdownField 2012-09-13 09:27:09 +12:00
jean
17bd8733d0 FIX 7853 Flush the content of drop down fields when closing html editor linker (links and images) 2012-09-10 11:12:05 +12:00
Ingo Schommer
1088d044c5 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	.travis.yml
 2012-09-07 17:21:41 +02:00
Andrew O'Neil
ce68c4a870 FEATURE: Send javascript events on show and hide of treedropdown 2012-09-05 14:18:36 +12:00
Zauberfisch
d24ea5ec97 BUG jQueryUI configs broken because keys were all lowercase 2012-09-02 12:51:25 +02:00
Will Rossiter
10d0296721 FIX: ensure date input has a date picker to trigger open (#7504) 2012-08-30 22:39:06 +12:00
Ingo Schommer
a8f335360b Merge remote-tracking branch 'origin/3.0' 2012-08-27 09:25:59 +02:00
Ingo Schommer
3b592122fd i18n for "select an anchor" string (see #7798) 2012-08-26 23:58:31 +02:00
Ingo Schommer
4cc82e906b Merge remote-tracking branch 'origin/3.0' 2012-08-20 10:13:55 +02:00
Sam Minnée
9adf0a4155 Merge pull request #703 from patbolo/fix/7742_2 
FIX 7742
 2012-08-16 18:05:10 -07:00
Ingo Schommer
fb7008627c Merge remote-tracking branch 'origin/3.0' 2012-08-09 10:47:44 +02:00
Damian Mooyman
a80daef2c6 FIXED: Issue where urls with querystring arguments would not be properly concatenated with additional query parameters during ajax requests. The behaviour would not normally be noted except when using a module (such as Translatable) that adds parameters to data-url fields in forms. 2012-08-09 10:18:33 +12:00
jean
34812971cc FIX 7742 Decode the URI encoded attribute before displaying it as the value for the tree dropdown 2012-08-07 09:20:13 +12:00
Ingo Schommer
b135218789 BUG Detect JS lang by <body>, and force init 2012-08-06 10:59:18 +02:00
Will Rossiter
7162d65258 Merge pull request #691 from dd1079/patch-1 
Update javascript/lang/de_DE.js
 2012-08-04 21:53:33 -07:00
jean
fb9e997b5e BUGFIX Use tree/xxx instead of tree?ID=xxx when fetching subtrees for TreeDropdownField. Fix #7730 2012-08-04 10:53:12 +12:00
dd1079
fa671062f8 Update javascript/lang/de_DE.js 
Adding German language strings
 2012-08-01 19:17:04 +03:00
Hamish Friedlander
3efdb5c981 Merge in changes from 3.0.1 final 2012-07-31 16:51:10 +12:00
Naomi Guyer
55ec92d40e ENHANCEMENT: Maori language javascript 2012-07-26 17:18:44 +12:00
Hamish Friedlander
95d0be636c Merge remote-tracking branch 'origin/3.0' 2012-07-25 11:44:53 +12:00
Hamish Friedlander
dc18c51f32 Add javascript japanese translation - thanks Yuki Awano 2012-07-25 09:38:36 +12:00
unclecheese
b57f2bd022 BUGFIX: UploadField does not work on DataObjects 2012-07-19 22:11:38 -03:00
Ingo Schommer
3ae8b0b665 Merge remote-tracking branch 'origin/3.0' 2012-07-18 15:00:06 +02:00
Ingo Schommer
1a91431d39 Query param searches for GridFieldAddExistingAutocompleter 
Fixes issues with query construction in JS when the search URL
already contains GET paramters (e.g. when using the 'translatable'
module).
 2012-07-17 13:26:33 +02:00
Ingo Schommer
a033ddf773 More init checks in HtmlEditorField.js 2012-07-16 23:33:22 +02:00
Ingo Schommer
b4ecc308a1 BUG Enforce startClosed prop on ToggleCompositeField 2012-07-15 20:53:44 +02:00
Mateusz Uzdowski
c785f3c492 BUG Adjust the tree construction and triggers to work with IE. 
After Hamish's suggestion. Entwine onchange would not get executed in
IE8 at all, which would have the effect of the displyed dropdown
selection not being set.

Change to onadd also mandates the changes to onadd on other parts of the
tree component - otherwise the change event can trigger before the
tree elements are added to the DOM.
 2012-07-12 16:44:21 +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
Mateusz Uzdowski
29a039929b Refactor the linking functionality for the TinyMCE popup. 
Functionality that affects the values in the form better fits in
updateFromEditor function, where we expect the form to be modified.
Redraw should only affect visibility parameters.

Also added a more robust reset code, so we can always expect to get at
least a clean form, and re-added missing "target" checkbox.
 2012-07-12 16:44:15 +12:00
Mateusz Uzdowski
eef67b6f87 API Clean up the return values for getCurrentLink 
Returning a link type "internal" in the situation when no link has been
detected is confusing and makes it hard to know downstream if the link
was detected or not. Switched that to null.

Also added target option to file downloads, as we don't currently have a
mechanism to default this field to "yes" for files.
 2012-07-12 09:13:32 +12:00
Jeremy Shipman
606d86a926 BUGFIX: DateField javascript fails when it is included in a GroupField 2012-06-25 20:32:53 +12:00
Sam Minnee
7685a0b59d Merge branch '3.0' 2012-06-25 10:01:34 +12:00
Ingo Schommer
682a6a0d1b BUGFIX "Insert media" loading indicator (fixes #7542) 
No "working" indicator in insert media from web button.
Returning the $.ajax object to allow for deferred callbacks
on events other than 'success'
 2012-06-22 10:25:15 +02:00
Sam Minnee
4aa4cd2c28 Merge branch '3.0' 
Conflicts:
	admin/scss/ie7.scss
 2012-06-22 17:20:07 +12:00
Naomi Guyer
1197a2fa14 BUGFIX: Media styles in IE9 (fixes #4 of #7497) 
Changed media conditional as was evaluating as false in IE9
 2012-06-21 16:50:14 +12:00