Ingo Schommer
14895a2056
BUGFIX Only call TinyMCE.init() once per window load (actual editor creation happens through new tinymce.Editor()
2012-04-18 17:38:24 +02:00
Ingo Schommer
f26951c63d
MINOR Don't try to remove editor containers before they exist
2012-04-18 16:54:20 +02:00
Sean Harvey
5bb31c4e81
BUGFIX Stop "Insert Link" or "Insert Image" header disappearing inside the HtmlEditorField toolbar
...
when clicking a link type
2012-04-17 15:47:40 +12:00
Ingo Schommer
b025b95ede
ENHANCEMENT Lazy-loading image and link dialogs for HtmlEditorField, to avoid unnecessary processing overhead on initial CMS load (also means they'll never get loaded if not required, e.g. in ReportAdmin)
2012-04-12 23:53:12 +02:00
Ingo Schommer
ac45e5b9c0
Merge branch 'integration'
...
Conflicts:
admin/css/ie8.css
admin/css/screen.css
admin/scss/_style.scss
dev/install/config-form.html
dev/install/install.css
dev/install/php5-required.html
2012-04-11 16:31:12 +02:00
Ingo Schommer
a64715beeb
BUGFIX Calling tinyMCE.init() in sync with entwine rules to avoid uncached loading interfereing with call order ( fixes #6877 )
2012-04-10 21:41:00 +02:00
Ingo Schommer
8c5e56fe31
Merge branch 'master' into integration
...
Conflicts:
admin/css/screen.css
dev/install/php5-required.html
2012-04-09 21:10:08 +02:00
Sean Harvey
6f89fe0703
BUGFIX Show/hide correct fields when inserting a link in HtmlEditorField
2012-04-05 16:50:49 +12:00
Julian Seidenberg
64d0cbab9a
BUGFIX: SSF-38 hiding the insert image controls when editing an already inserted image.
2012-04-05 12:10:35 +12:00
Julian Seidenberg
7f8a682ad7
BUGFIX: SSF-38 fixing the "Choose files from your computer" upload field
2012-04-04 13:46:24 +12:00
Sean Harvey
89267419d4
BUGFIX When inserting an image in HtmlEditorField, don't append "px" as
...
the width and height attributes only accept a number without a unit
2012-04-02 14:10:20 +12:00
Julian Seidenberg
2110906715
BUGFIX: SSF-38 making the entwine selector for the upload field more specific, so it doesn't apply to every upload field in the CMS. Also, handling the case of uploading multiple files at once
2012-03-30 13:45:53 +13:00
Julian Seidenberg
9f9dc25338
ENHANCEMENT: SSF-38 initial rearranging of the insert image form to allow uploads as well as choosing an image from the CMS (and you can pick and choose from both)
2012-03-29 13:34:55 +13: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
Sean Harvey
898c8f5497
ENHANCEMENT [file_link id=n] shortcode support for file links in HtmlEditorField
2012-03-01 22:20:58 +13:00
Ingo Schommer
9465df6fb4
MINOR Less specific button selectors in CMS JavaScript to cover <button> tags as well
2012-02-23 23:29:58 +01:00
Ingo Schommer
0bc6bffa9b
BUGFIX Changed CSS class structure of GridField to avoid duplication of ".ss-gridfield" selector in different contexts, and make selectors less verbose (no more "fieldset.ss-gridfield"). Added "field" class to GridField container to ensure it displays correctly alongside other form fields (mainly around margins and paddings)
2012-02-23 23:29:58 +01:00
Ingo Schommer
8790ba3c4f
BUGFIX Retain editor focus when insert images, update attributes on existing image to avoid IE bugs through TinyMCE
2012-02-22 17:53:37 +01:00
Ingo Schommer
6ffb941c28
MINOR JS formatting
2012-02-22 11:15:54 +01:00
Ingo Schommer
bb7c128025
MINOR JS syntax errors
2012-02-17 15:58:31 +01:00
Ingo Schommer
5220a46fd0
ENHANCEMENT Inserting image via new dialog with ajax field retrieval and GridField file selection. Rewritten to jQuery.entwine and using the new HTML editor abstraction layer.
2012-02-14 13:53:35 +01:00
Ingo Schommer
3866f561f5
ENHANCEMENT Using GridField for file selection in "insert image" dialog
...
API CHANGE Combined HTMLEditorField_Toolbar->FlashForm() and ImageForm() into new MediaForm() to handle both file types
2012-02-14 13:30:52 +01:00
Ingo Schommer
d91f76a7d0
ENHANCEMENT Created TinyMCE wrapper for link insertion dialogs in order to support other editors
2012-01-05 00:41:41 +01:00
Ingo Schommer
98852677d5
ENHANCEMENT Simplified "insert link" interface and logic by reverting to TinyMCE's standard behaviour: Only allow linking on an existing selection, don't allow modifying the link content in the "insert" interface. Now that we're presenting this interface as a dialog rather than persistent sidebar its no longer necessary to have "unselected link creation+insertion".
2012-01-05 00:41:41 +01:00
Ingo Schommer
b5c739e71d
ENHANCEMENT Refactored TinyMCE LinkForm from behaviour.js to jQuery.entwine. Fixed clearing of fields when popup is closed.
2012-01-05 00:41:41 +01:00
Ingo Schommer
dc2a1205a6
MINOR Moved HTMLEditorField dialog title to jQuery UI compatible form attribute
2011-04-25 21:49:35 +12:00
Ingo Schommer
6dbfd5fdde
MINOR Renaming <div id="contentPanel"> to "cms-editor-dialogs"
2011-04-24 11:46:48 +12:00
Ingo Schommer
ff29f3e4e8
ENHANCEMENT Changed HtmlEditorField link/image/flash forms to use model jQuery.dialog instead of side panel - less side effects when switching focus between editor and side panels, and fits better in new design drafts
2011-04-24 11:46:43 +12:00
Ingo Schommer
96fe7babb9
MINOR Removed debug code
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@111839 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-10-10 05:06:01 +00:00
Ingo Schommer
73ba193ad6
ENHANCEMENT: Select the uploaded image after uploading by default. #4962 (from r97765)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102531 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:36:50 +00:00
Ingo Schommer
e2ca5d058d
BUGFIX: Fixed CMS Editor loading in AssetAdmin (from r97638)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102521 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:05:43 +00:00
Ingo Schommer
afc0cd0ee7
ENHANCEMENT: CMS Editor Upload panel now loads the root files directly and allows the user to upload to the root assets dir (from r97601)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102520 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 23:05:23 +00:00
Ingo Schommer
7654557068
APICHANGE: removed SWFUpload. Refactored Content Editors uploader to use standard uploader. (from r97489)
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@102505 467b73ca-7a2a-4603-9d3b-597d59a354a9
2010-04-12 21:54:41 +00:00
Sean Harvey
1588da54d8
ENHANCEMENT Added support for loading external plugins (with relative paths) in HtmlEditorConfig. This means relative paths can be separate from the plugin name, and fixes a bug where paths containing dashes were ignored by TinyMCE.init().
...
ENHANCEMENT Changed sapphire/thirdparty/tinymce-advcode to use the original plugin name, and specify its relative path through HtmlEditorConfig instead. (from r94060)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@95582 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-12-16 05:30:46 +00:00
Normann Lou
617ad7e07c
BUGFIX: the folder tinymce_advcode is changed to tinymec-advcode, so should the path
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@93934 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-11-29 23:41:22 +00:00
Sam Minnee
9fdf9e1dc8
BUGFIX #3892 : Removed reference to non-existent blockquote module in front-end tiymce.
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@80651 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-06-30 22:55:53 +00:00
Sean Harvey
cd1417a029
BUGFIX Added missing HtmlEditorField.js file from branches/2.3 that wasn't copied over during the last merge effort
...
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@75619 467b73ca-7a2a-4603-9d3b-597d59a354a9
2009-04-29 02:52:18 +00:00
