Skip to content

Commit e4b5063

Browse files
committed
update tinymce > 4.3.3
1 parent c006f8c commit e4b5063

File tree

90 files changed

+30483
-18555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+30483
-18555
lines changed

.bowerrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2+
"strict-ssl": false, "https-proxy": "",
23
"directory" : "/tinymce_4/static/tinymce_4/"
34
}

CHANGELOG.rst

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
Changelog
22
=========
33

4-
* 0.0.12 - Merge css files in __tinymce_4.css
5-
* 0.0.11 - Set RU language by default, add files for custom css
6-
* 0.0.10 - Update to TinyMCE 4.2.6
4+
0.0.12
5+
------
6+
* Merge css files in __tinymce_4.css
7+
8+
0.0.11
9+
------
10+
* Set RU language by default, add files for custom css
11+
12+
0.0.10
13+
------
14+
* Update to TinyMCE 4.2.6

README.rst

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
*****************
21
django-tinymce-4
3-
*****************
2+
================
43

54
Integrate `TinyMCE`_ in `Django`_ projects.
65

76
Features
87
========
98
* Support only `TinyMCE`_ 4.
10-
119
* Support `django-filebrowser`_.
1210

1311
Install
@@ -19,7 +17,7 @@ Install package from current repo:
1917
pip install git+git://github.com/ITCase-django/django-tinymce-4
2018
2119
22-
Add application in project settings (**order is important**):
20+
Add application in project settings **(order is important)**:
2321

2422
.. code-block:: python
2523

bower.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "django-tinymce-4",
3-
"version": "0.0.11",
4-
"homepage": "https://github.com/ITCase/django-tinymce-4",
3+
"version": "0.0.12",
4+
"homepage": "https://github.com/ITCase-django/django-tinymce-4",
55
"authors": [
66
"ITCase <[email protected]>"
77
],
@@ -15,6 +15,6 @@
1515
"tests"
1616
],
1717
"dependencies": {
18-
"tinymce": "~4.2.6"
18+
"tinymce": "~4.3.3"
1919
}
2020
}
Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "tinymce",
3-
"version": "4.2.6",
43
"description": "Web based JavaScript HTML WYSIWYG editor control.",
5-
"license": "http://www.tinymce.com/license",
4+
"license": "LGPL-2.1",
65
"keywords": [
76
"editor",
87
"wysiwyg",
@@ -12,19 +11,19 @@
1211
"html"
1312
],
1413
"homepage": "http://www.tinymce.com",
15-
"main": "tinymce.min.js",
1614
"ignore": [
1715
"readme.md",
1816
"composer.json",
1917
"package.json"
2018
],
21-
"_release": "4.2.6",
19+
"version": "4.3.3",
20+
"_release": "4.3.3",
2221
"_resolution": {
2322
"type": "version",
24-
"tag": "4.2.6",
25-
"commit": "fcbae6a7e245b50f80ebc648bc1fff9aa0812e5a"
23+
"tag": "4.3.3",
24+
"commit": "ea98451a2b7b7d64b5aa3c33509bd07406a6ab90"
2625
},
2726
"_source": "git://github.com/tinymce/tinymce-dist.git",
28-
"_target": "~4.2.6",
27+
"_target": "~4.3.3",
2928
"_originalSource": "tinymce"
3029
}

tinymce_4/static/tinymce_4/tinymce/bower.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "tinymce",
3-
"version": "4.2.6",
43
"description": "Web based JavaScript HTML WYSIWYG editor control.",
5-
"license": "http://www.tinymce.com/license",
4+
"license": "LGPL-2.1",
65
"keywords": [
76
"editor",
87
"wysiwyg",
@@ -12,7 +11,6 @@
1211
"html"
1312
],
1413
"homepage": "http://www.tinymce.com",
15-
"main": "tinymce.min.js",
1614
"ignore": [
1715
"readme.md",
1816
"composer.json",

tinymce_4/static/tinymce_4/tinymce/changelog.txt

Lines changed: 74 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,70 @@
1+
Version 4.3.3 (2016-01-14)
2+
Added new table_resize_bars configuration setting. This setting allows you to disable the table resize bars.
3+
Added new beforeInitialize event to tinymce.util.XHR lets you modify XHR properties before open. Patch contributed by Brent Clintel.
4+
Added new autolink_pattern setting to autolink plugin. Enables you to override the default autolink formats. Patch contributed by Ben Tiedt.
5+
Added new charmap option that lets you override the default charmap of the charmap plugin.
6+
Added new charmap_append option that lets you add new characters to the default charmap of the charmap plugin.
7+
Added new insertCustomChar event that gets fired when a character is inserted by the charmap plugin.
8+
Fixed bug where table cells started with a superfluous &nbsp; in IE10+.
9+
Fixed bug where table plugin would retain all BR tags when cells were merged.
10+
Fixed bug where media plugin would strip underscores from youtube urls.
11+
Fixed bug where IME input would fail on IE 11 if you typed within a table.
12+
Fixed bug where double click selection of a word would remove the space before the word on insert contents.
13+
Fixed bug where table plugin would produce exceptions when hovering tables with invalid structure.
14+
Fixed bug where fullscreen wouldn't scroll back to it's original position when untoggled.
15+
Fixed so the template plugins templates setting can be a function that gets a callback that can provide templates.
16+
Version 4.3.2 (2015-12-14)
17+
Fixed bug where the resize bars for table cells were not affected by the object_resizing property.
18+
Fixed bug where the contextual table toolbar would appear incorrectly if TinyMCE was initialized inline inside a table.
19+
Fixed bug where resizing table cells did not fire a node change event or add an undo level.
20+
Fixed bug where double click selection of text on IE 11 wouldn't work properly.
21+
Fixed bug where codesample plugin would incorrectly produce br elements inside code elements.
22+
Fixed bug where media plugin would strip dashes from youtube urls.
23+
Fixed bug where it was possible to move the caret into the table resize bars.
24+
Fixed bug where drag/drop into a cE=false element was possible on IE.
25+
Version 4.3.1 (2015-11-30)
26+
Fixed so it's possible to disable the table inline toolbar by setting it to false or an empty string.
27+
Fixed bug where it wasn't possible to resize some tables using the drag handles.
28+
Fixed bug where unique id:s would clash for multiple editor instances and cE=false selections.
29+
Fixed bug where the same plugin could be initialized multiple times.
30+
Fixed bug where the table inline toolbars would be displayed at the same time as the image toolbars.
31+
Fixed bug where the table selection rect wouldn't be removed when selecting another control element.
32+
Version 4.3.0 (2015-11-23)
33+
Added new table column/row resize support. Makes it a lot more easy to resize the columns/rows in a table.
34+
Added new table inline toolbar. Makes it easier to for example add new rows or columns to a table.
35+
Added new notification API. Lets you display floating notifications to the end user.
36+
Added new codesample plugin that lets you insert syntax highlighted pre elements into the editor.
37+
Added new image_caption to images. Lets you create images with captions using a HTML5 figure/figcaption elements.
38+
Added new live previews of embeded videos. Lets you play the video right inside the editor.
39+
Added new setDirty method and "dirty" event to the editor. Makes it easier to track the dirty state change.
40+
Added new setMode method to Editor instances that lets you dynamically switch between design/readonly.
41+
Added new core support for contentEditable=false elements within the editor overrides the browsers broken behavior.
42+
Rewrote the noneditable plugin to use the new contentEditable false core logic.
43+
Fixed so the dirty state doesn't set set to false automatically when the undo index is set to 0.
44+
Fixed the Selection.placeCaretAt so it works better on IE when the coordinate is between paragraphs.
45+
Fixed bug where data-mce-bogus="all" element contents where counted by the word count plugin.
46+
Fixed bug where contentEditable=false elements would be indented by the indent buttons.
47+
Fixed bug where images within contentEditable=false would be selected in WebKit on mouse click.
48+
Fixed bug in DOMUntils split method where the replacement parameter wouldn't work on specific cases.
49+
Fixed bug where the importcss plugin would import classes from the skin content css file.
50+
Fixed so all button variants have a wrapping span for it's text to make it easier to skin.
51+
Fixed so it's easier to exit pre block using the arrow keys.
52+
Fixed bug where listboxes with fix widths didn't render correctly.
53+
Version 4.2.8 (2015-11-13)
54+
Fixed bug where it was possible to delete tables as the inline root element if all columns where selected.
55+
Fixed bug where the UI buttons active state wasn't properly updated due to recent refactoring of that logic.
56+
Version 4.2.7 (2015-10-27)
57+
Fixed bug where backspace/delete would remove all formats on the last paragraph character in WebKit/Blink.
58+
Fixed bug where backspace within a inline format element with a bogus caret container would move the caret.
59+
Fixed bug where backspace/delete on selected table cells wouldn't add an undo level.
60+
Fixed bug where script tags embedded within the editor could sometimes get a mce- prefix prepended to them
61+
Fixed bug where validate: false option could produce an error to be thrown from the Serialization step.
62+
Fixed bug where inline editing of a table as the root element could let the user delete that table.
63+
Fixed bug where inline editing of a table as the root element wouldn't properly handle enter key.
64+
Fixed bug where inline editing of a table as the root element would normalize the selection incorrectly.
65+
Fixed bug where inline editing of a list as the root element could let the user delete that list.
66+
Fixed bug where inline editing of a list as the root element could let the user split that list.
67+
Fixed bug where resize handles would be rendered on editable root elements such as table.
168
Version 4.2.6 (2015-09-28)
269
Added capability to set request headers when using XHRs.
370
Added capability to upload local images automatically default delay is set to 30 seconds after editing images.
@@ -12,7 +79,7 @@ Version 4.2.6 (2015-09-28)
1279
Fixed bug where shift+delete wouldn't do a cut operation on Blink/WebKit.
1380
Fixed bug where cut action wouldn't properly store the before selection bookmark for the undo level.
1481
Fixed bug where backspace in side an empty list element on IE would loose editor focus.
15-
Fixed bug where the save plugin wouldn't enable the buttons when a change occured.
82+
Fixed bug where the save plugin wouldn't enable the buttons when a change occurred.
1683
Fixed bug where Edge wouldn't initialize the editor if a document.domain was specified.
1784
Fixed bug where enter key before nested images would sometimes not properly expand the previous block.
1885
Fixed bug where the inline toolbars wouldn't get properly hidden when blurring the editor instance.
@@ -112,7 +179,7 @@ Version 4.1.9 (2015-03-10)
112179
Fixed bug with image plugin not pulling the image dimensions out correctly if a custom document_base_url was used.
113180
Fixed bug where ctrl+alt+[1-9] would conflict with the AltGr+[1-9] on Windows. New shortcuts is ctrl+shift+[1-9].
114181
Fixed bug with removing formatting on nodes in inline mode would sometimes include nodes outside the editor body.
115-
Fixed bug where extra nbsp:s would be inserted when you replaced a word surronded by spaces using insertContent.
182+
Fixed bug where extra nbsp:s would be inserted when you replaced a word surrounded by spaces using insertContent.
116183
Fixed bug with pasting from Google Docs would produce extra strong elements and line feeds.
117184
Version 4.1.8 (2015-03-05)
118185
Added new html5 sizes attribute to img elements used together with srcset.
@@ -179,7 +246,7 @@ Version 4.1.5 (2014-09-09)
179246
Fixed bug where sometimes the resize rectangles wouldn't properly render on images on WebKit/Blink.
180247
Fixed bug in list plugin where delete/backspace would merge empty LI elements in lists incorrectly.
181248
Fixed bug where empty list elements would result in empty LI elements without it's parent container.
182-
Fixed bug where backspace in empty caret formated element could produce an type error exception of Gecko.
249+
Fixed bug where backspace in empty caret formatted element could produce an type error exception of Gecko.
183250
Fixed bug where lists pasted from word with a custom start index above 9 wouldn't be properly handled.
184251
Fixed bug where tabfocus plugin would tab out of the editor instance even if the default action was prevented.
185252
Fixed bug where tabfocus wouldn't tab properly to other adjacent editor instances.
@@ -414,7 +481,7 @@ Version 4.0.20 (2014-03-18)
414481
Fixed bug where some events wasn't properly unbound when all editors where removed from page.
415482
Fixed bug where tapping links on iOS 7.1 would open the link instead of placing the caret inside.
416483
Fixed bug where holding the finger down on iOS 7.1 would open the link/image callout menu.
417-
Fixed so the jQuery plugin returns null when getting the the tinymce instance of an element before it's initialized.
484+
Fixed so the jQuery plugin returns null when getting the tinymce instance of an element before it's initialized.
418485
Fixed so selection normalization gets executed more often to reduce incorrect UI states on Gecko.
419486
Fixed so the default action of closing the window on a form submission can be prevented using "preventDefault".
420487
Version 4.0.19 (2014-03-11)
@@ -504,7 +571,7 @@ Version 4.0.13 (2014-01-30)
504571
Fixed bug where image dimension constrains proportions wouldn't work properly if you altered a value and immediately clicked the submit button.
505572
Fixed so you don't need to set language option to false when specifying a custom language_url.
506573
Fixed so the link dialog "text to display" field gets automatically hidden if the selection isn't text contents. Patch contributed by Godefroy.
507-
Fixed so the none option for the target field in the link dialog gets excluded when specifiying the target_list config option.
574+
Fixed so the none option for the target field in the link dialog gets excluded when specifying the target_list config option.
508575
Fixed so outline styles are displayed by default in the formats preview. Patch contributed by nhammadi.
509576
Fixed so the max characters for width/height is more than 3 in the media and image dialogs.
510577
Fixed so the old mceSpellCheck command toggles the spellchecker on/off.
@@ -583,7 +650,7 @@ Version 4.0.9 (2013-10-24)
583650
Fixed bug where the paste_data_images option wouldn't strip all kinds of data images.
584651
Fixed bug where the GridLayout didn't render items correctly if the contents overflowed the layout container.
585652
Fixed bug where the Window wasn't properly positioned if the size of the button bar or title bar was wider than the contents.
586-
Fixed bug where psuedo selectors for finding UI controls didn't work properly.
653+
Fixed bug where pseudo selectors for finding UI controls didn't work properly.
587654
Fixed bug where resized splitbuttons would throw an exception if it didn't contain an icon.
588655
Fixed bug where setContent would move focus into the editor even though it wasn't active.
589656
Fixed bug where IE 11 would sometimes throw an "Invalid function" error when calling setActive on the body element.
@@ -617,7 +684,7 @@ Version 4.0.7 (2013-10-02)
617684
Fixed bug where closing a dialog with an opened listbox would cause errors if new dialogs where opened.
618685
Fixed bug where hidden input elements wasn't removed when inline editor instances where removed.
619686
Fixed bug where editors wouldn't initialize some times due to event logic not working correctly.
620-
Fixed bug where pre elements woudl cause searchreplace and spellchecker plugins to mark incorrect locations.
687+
Fixed bug where pre elements would cause searchreplace and spellchecker plugins to mark incorrect locations.
621688
Fixed bug where embed elements wouldn't be properly resized if they where configured in using the video_template_callback.
622689
Fixed bug where paste from word would remove all BR elements since it was missing in the default paste_word_valid_elements.
623690
Fixed bug where paste filtering wouldn't work properly on old WebKit installations pre Clipboard API.

0 commit comments

Comments
 (0)