Commit 7dc65cb7 authored by Stefan Galinski's avatar Stefan Galinski 🎮

[TASK] Update tinymce to version 4.4.1

parent d025d3fd
......@@ -5,7 +5,7 @@
You can simplify the selection by using the following command in your developer tools console.
Deselect "ru@petr1708" and "zh_CN.GB2312" afterwards, because this language doesn't exists and leads to errors.
jQuery('input[type=checkbox]').attr('checked', 1)
document.querySelectorAll('input[type=checkbox]').forEach(function(element) { element.checked = true; });
3. Rename node_modules to tinymce_mode_modules, because TYPO3 removes the node_modules directory
4. Add the "langs" directory inside tinymce_node_modules/tinymce with the downloaded languages
......@@ -2,6 +2,6 @@
"name": "sg_tinymce",
"description": "",
"dependencies": {
"tinymce": "^4.3.11"
"tinymce": "^4.4.1"
}
}
Version 4.4.1 (2016-07-26)
Added smart_paste option to paste plugin to allow disabling the paste behavior if needed.
Fixed bug where png urls wasn't properly detected by the smart paste logic.
Fixed bug where the element path wasn't working properly when multiple editor instances where used.
Fixed bug with creating lists out of multiple paragraphs would just create one list item instead of multiple.
Fixed bug where scroll position wasn't properly handled by the inlite theme to place the toolbar properly.
Fixed bug where multiple instances of the editor using the inlite theme didn't render the toolbar properly.
Fixed bug where the shortcut label for fullscreen mode didn't match the actual shortcut key.
Fixed bug where it wasn't possible to select cE=false blocks using touch devices on for example iOS.
Fixed bug where it was possible to select the child image within a cE=false on IE 11.
Fixed so inserts of html containing lists doesn't merge with any existing lists unless it's a paste operation.
Version 4.4.0 (2016-06-30)
Added new inlite theme this is a more lightweight inline UI.
Added smarter paste logic that auto detects urls in the clipboard and inserts images/links based on that.
Added a better image resize algorithm for better image quality in the imagetools plugin.
Fixed bug where it wasn't possible to drag/dropping cE=false elements on FF.
Fixed bug where backspace/delete before/after a cE=false block would produce a new paragraph.
Fixed bug where list style type css property wasn't preserved when indenting lists.
Fixed bug where merging of lists where done even if the list style type was different.
Fixed bug where the image_dataimg_filter function wasn't used when pasting images.
Fixed bug where nested editable within a non editable element would cause scroll on focus in Chrome.
Fixed so invalid targets for inline mode is blocked on initialization. We only support elements that can have children.
Version 4.3.13 (2016-06-08)
Added characters with a diacritical mark to charmap plugin. Patch contributed by Dominik Schilling.
Added better error handling if the image proxy service would produce errors.
......
{
"name": "tinymce/tinymce",
"version": "4.3.13",
"version": "4.4.1",
"description": "Web based JavaScript HTML WYSIWYG editor control.",
"license": [
"LGPL-2.1"
......
......@@ -94,6 +94,25 @@ tinymce.addI18n('tr_TR',{
"Style": "Stil",
"Dimensions": "Boyutlar",
"Insert image": "Resim ekle",
"Zoom in": "Yak\u0131nla\u015ft\u0131r",
"Contrast": "Kontrast",
"Back": "Geri",
"Gamma": "Gama",
"Flip horizontally": "Yatay \u00e7evir",
"Resize": "Yeniden Boyutland\u0131r",
"Sharpen": "Keskinle\u015ftir",
"Zoom out": "Uzakla\u015ft\u0131r",
"Image options": "G\u00f6r\u00fcnt\u00fc se\u00e7enekleri",
"Apply": "Uygula",
"Brightness": "Parlakl\u0131k",
"Rotate clockwise": "Saat y\u00f6n\u00fcnde d\u00f6nd\u00fcr",
"Rotate counterclockwise": "Saat y\u00f6n\u00fcn\u00fcn tersine d\u00f6nd\u00fcr",
"Edit image": "G\u00f6r\u00fcnt\u00fcy\u00fc d\u00fczenle",
"Color levels": "Renk seviyesi",
"Crop": "Kes",
"Orientation": "Y\u00f6n\u00fcn\u00fc Belirle",
"Flip vertically": "Dikey \u00e7evir",
"Invert": "Tersine \u00e7evir",
"Insert date\/time": "Tarih \/ Zaman ekle",
"Remove link": "Ba\u011flant\u0131y\u0131 kald\u0131r",
"Url": "Url",
......
tinymce.addI18n('ug',{
"Cut": "\u0643\u06d0\u0633\u0649\u0634",
"Heading 5": "5 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
"Header 2": "\u062a\u06d0\u0645\u0627 2",
"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0633\u0649\u0632\u0646\u0649\u06ad \u062a\u0648\u0631 \u0643\u06c6\u0631\u06af\u06c8\u0686\u0649\u06ad\u0649\u0632 \u0642\u0649\u064a\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u0627\u062e\u062a\u0649\u0633\u0649 \u0632\u0649\u064a\u0627\u0631\u06d5\u062a \u0642\u0649\u0644\u0649\u0634\u0646\u0649 \u0642\u0648\u0644\u0644\u0649\u0645\u0627\u064a\u062f\u06c7. Ctrl+X\/C\/V \u062a\u06d0\u0632\u0644\u06d5\u062a\u0645\u06d5 \u0643\u0648\u0646\u06c7\u067e\u0643\u0649\u0633\u0649 \u0626\u0627\u0631\u0642\u0649\u0644\u0649\u0642 \u0643\u06d0\u0633\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u0645\u06d5\u0634\u063a\u06c7\u0644\u0627\u062a\u0649 \u0642\u0649\u0644\u0649\u06ad.",
"Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X\/C\/V keyboard shortcuts instead.": "\u0633\u0649\u0632\u0646\u0649\u06ad \u062a\u0648\u0631 \u0643\u06c6\u0631\u06af\u06c8\u0686\u0649\u06ad\u0649\u0632 \u0642\u0649\u064a\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u0627\u062e\u062a\u0649\u0633\u0649 \u0632\u0649\u064a\u0627\u0631\u06d5\u062a \u0642\u0649\u0644\u0649\u0634\u0646\u0649 \u0642\u0648\u0644\u0644\u0649\u0645\u0627\u064a\u062f\u06c7. Ctrl+X\/C\/V \u062a\u06d0\u0632\u0644\u06d5\u062a\u0645\u06d5 \u0643\u06c7\u0646\u06c7\u067e\u0643\u0649\u0633\u0649 \u0626\u0627\u0631\u0642\u0649\u0644\u0649\u0642 \u0643\u06d0\u0633\u0649\u067e \u0686\u0627\u067e\u0644\u0627\u0634 \u0645\u06d5\u0634\u063a\u06c7\u0644\u0627\u062a\u0649 \u0642\u0649\u0644\u0649\u06ad.",
"Heading 4": "4 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
"Div": "Div",
"Heading 2": "2 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
"Paste": "\u0686\u0627\u067e\u0644\u0627\u0634",
"Close": "\u062a\u0627\u0642\u0627\u0634",
"Font Family": "Font Family",
"Font Family": "\u062e\u06d5\u062a \u0646\u06c7\u0633\u062e\u0649\u0633\u0649",
"Pre": "Pre",
"Align right": "\u0626\u0648\u06ad\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
"New document": "\u064a\u06d0\u06ad\u0649 \u06be\u06c6\u062c\u062c\u06d5\u062a \u0642\u06c7\u0631\u06c7\u0634",
"New document": "\u064a\u06d0\u06ad\u0649 \u067e\u06c8\u062a\u06c8\u0643",
"Blockquote": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
"Numbered list": "\u0633\u0627\u0646\u0644\u0649\u0642 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
"Heading 1": "1 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
"Headings": "\u0645\u0627\u06cb\u0632\u06c7",
"Increase indent": "\u0643\u06d5\u064a\u0646\u0649\u06af\u06d5 \u0633\u06c8\u0631\u06c8\u0634",
"Formats": "\u0641\u0648\u0631\u0645\u0627\u062a",
"Headers": "Headers",
"Headers": "\u0628\u06d0\u0634\u0649",
"Select all": "\u06be\u06d5\u0645\u0645\u0649\u0646\u0649 \u062a\u0627\u0644\u0644\u0627\u0634",
"Header 3": "\u062a\u06d0\u0645\u0627 3",
"Blocks": "Blocks",
"Blocks": "\u0631\u0627\u064a\u0648\u0646",
"Undo": "\u0626\u0627\u0631\u0642\u0649\u063a\u0627 \u064a\u06d0\u0646\u0649\u0634",
"Strikethrough": "\u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634 \u0633\u0649\u0632\u0649\u0642\u0649",
"Bullet list": "\u0628\u06d5\u0644\u06af\u06d5 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643",
"Header 1": "\u062a\u06d0\u0645\u0627 1",
"Superscript": "\u0626\u06c8\u0633\u062a\u06c8\u0646\u0643\u0649 \u0628\u06d5\u0644\u06af\u06d5",
"Clear formatting": "\u0641\u0648\u0631\u0645\u0627\u062a\u0646\u0649 \u062a\u0627\u0632\u0644\u0627\u0634",
"Font Sizes": "Font Sizes",
"Font Sizes": "\u062e\u06d5\u062a \u0686\u0648\u06ad\u0644\u06c7\u0642\u0649",
"Subscript": "\u0626\u0627\u0633\u062a\u0649\u0646\u0642\u0649 \u0628\u06d5\u0644\u06af\u06d5",
"Header 6": "\u062a\u06d0\u0645\u0627 6",
"Redo": "\u0642\u0627\u064a\u062a\u0627 \u0642\u0649\u0644\u0649\u0634",
"Paragraph": "\u067e\u0627\u0631\u0627\u06af\u0649\u0631\u0627 \u0641",
"Ok": "\u062c\u06d5\u0632\u0649\u0645\u0644\u06d5\u0634",
"Bold": "\u062a\u0648\u0645",
"Code": "Code",
"Code": "\u0643\u0648\u062f",
"Italic": "\u064a\u0627\u0646\u062a\u06c7",
"Align center": "\u0645\u06d5\u0631\u0643\u06d5\u0632\u06af\u06d5 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
"Header 5": "\u062a\u06d0\u0645\u0627 5",
"Heading 6": "6 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
"Heading 3": "3 \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0643 \u0645\u0627\u06cb\u0632\u06c7",
"Decrease indent": "\u0626\u0627\u0644\u062f\u0649\u063a\u0627 \u0633\u06c8\u0631\u06c8\u0634",
"Header 4": "\u062a\u06d0\u0645\u0627 4",
"Paste is now in plain text mode. Contents will now be pasted as plain text until you toggle this option off.": "\u06be\u0627\u0632\u0649\u0631 \u0686\u0627\u067e\u0644\u0649\u0633\u0649\u06ad\u0649\u0632 \u0633\u0627\u067e \u062a\u06d0\u0643\u0649\u0634 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0649 \u0686\u0627\u067e\u0644\u0649\u0646\u0649\u062f\u06c7. \u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634 \u062a\u06d5\u06ad\u0634\u0649\u0643\u0649\u0646\u0649 \u062a\u0627\u0642\u0649\u06cb\u06d5\u062a\u0643\u06d5\u0646\u06af\u06d5 \u0642\u06d5\u062f\u06d5\u0631.",
"Underline": "\u0626\u0627\u0633\u062a\u0649 \u0633\u0649\u0632\u0649\u0642",
"Cancel": "\u0642\u0627\u0644\u062f\u06c7\u0631\u06c7\u0634",
"Justify": "\u0626\u0649\u0643\u0643\u0649 \u064a\u0627\u0646\u063a\u0627 \u062a\u0648\u063a\u06c7\u0631\u0644\u0627\u0634",
"Inline": "Inline",
"Inline": "\u0626\u0649\u0686\u0643\u0649",
"Copy": "\u0643\u06c6\u0686\u06c8\u0631\u06c8\u0634",
"Align left": "\u0633\u0648\u0644\u063a\u0627 \u062a\u0648\u063a\u0631\u0649\u0644\u0627\u0634",
"Visual aids": "\u0626\u06d5\u0633\u0643\u06d5\u0631\u062a\u0649\u0634",
......@@ -59,6 +66,10 @@ tinymce.addI18n('ug',{
"Restore last draft": "\u0626\u0627\u062e\u0649\u0631\u0642\u0649 \u0643\u06c7\u067e\u0649\u064a\u0649\u06af\u06d5 \u0642\u0627\u064a\u062a\u0649\u0634",
"Special character": "\u0626\u0627\u0644\u0627\u06be\u0649\u062f\u06d5 \u0628\u06d5\u0644\u06af\u0649\u0644\u06d5\u0631",
"Source code": "\u0626\u06d5\u0633\u0644\u0649 \u0643\u0648\u062f\u0649",
"B": "B",
"R": "R",
"G": "G",
"Color": "\u0631\u06d5\u06ad",
"Right to left": "\u0626\u0648\u06ad\u062f\u0649\u0646 \u0633\u0648\u0644\u063a\u0627",
"Left to right": "\u0633\u0648\u0644\u062f\u0649\u0646 \u0626\u0648\u06ad\u063a\u0627 ",
"Emoticons": "\u0686\u0649\u0631\u0627\u064a \u0626\u0649\u067e\u0627\u062f\u06d5",
......@@ -83,17 +94,36 @@ tinymce.addI18n('ug',{
"Style": "\u0626\u06c7\u0633\u0644\u06c7\u067e",
"Dimensions": "\u0686\u0648\u06ad-\u0643\u0649\u0686\u0649\u0643",
"Insert image": "\u0631\u06d5\u0633\u0649\u0645 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
"Zoom in": "\u064a\u06d0\u0642\u0649\u0646\u0644\u0627\u062a\u0645\u0627\u0642",
"Contrast": "\u0633\u06d0\u0644\u0649\u0634\u062a\u06c7\u0631\u0645\u0627",
"Back": "\u0642\u0627\u064a\u062a\u0649\u0634",
"Gamma": "\u06af\u0627\u0645\u0645\u0627",
"Flip horizontally": "\u06af\u0648\u0631\u0649\u0632\u0648\u0646\u062a\u0627\u0644 \u0626\u06c6\u0631\u06c8\u0634",
"Resize": "\u0686\u0648\u06ad\u0644\u06c7\u0642\u0649\u0646\u0649 \u0626\u06c6\u0632\u06af\u06d5\u0631\u062a\u0649\u0634",
"Sharpen": "\u0626\u06c6\u062a\u0643\u06c8\u0631\u0644\u06d5\u0634\u062a\u06c8\u0631\u06c8\u0634",
"Zoom out": "\u064a\u0649\u0631\u0627\u0642\u0644\u0627\u062a\u0645\u0627\u0642",
"Image options": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u0627\u0644\u0644\u0627\u0646\u0645\u0649\u0644\u0649\u0631\u0649",
"Apply": "\u0642\u0648\u0644\u0644\u0649\u0646\u0649\u0634",
"Brightness": "\u064a\u0648\u0631\u06c7\u0642\u0644\u06c7\u0642\u0649",
"Rotate clockwise": "\u200f\u200f\u0633\u0627\u0626\u06d5\u062a \u064a\u06c6\u0646\u0649\u0644\u0649\u0634\u0649\u062f\u06d5 \u0686\u06c6\u0631\u06c8\u0634",
"Rotate counterclockwise": "\u200f\u200f\u0633\u0627\u0626\u06d5\u062a\u0643\u06d5 \u0642\u0627\u0631\u0634\u0649 \u0686\u06c6\u0631\u06c8\u0634",
"Edit image": "\u0631\u06d5\u0633\u0649\u0645 \u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
"Color levels": "\u0631\u06d5\u06ad \u062f\u06d5\u0631\u0649\u062c\u0649\u0644\u0649\u0631\u0649",
"Crop": "\u0642\u0649\u064a\u0649\u0634",
"Orientation": "\u064a\u06c6\u0646\u0649\u0644\u0649\u0634",
"Flip vertically": "\u06cb\u06d0\u0631\u062a\u0649\u0643\u0627\u0644 \u0626\u06c6\u0631\u06c8\u0634",
"Invert": "\u062a\u06d5\u062a\u06c8\u0631",
"Insert date\/time": "\u0686\u0649\u0633\u0644\u0627\/\u06cb\u0627\u0642\u0649\u062a \u0643\u0649\u0631\u06af\u06c8\u0632\u06c8\u0634",
"Remove link": "Remove link",
"Remove link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0626\u06c6\u0686\u06c8\u0631\u06c8\u0634",
"Url": "\u0626\u0627\u062f\u0631\u0649\u0633",
"Text to display": "\u0643\u06c6\u0631\u06c8\u0646\u0649\u062f\u0649\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646",
"Anchors": "Anchors",
"Anchors": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634",
"Insert link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
"New window": "\u064a\u06d0\u06ad\u0649 \u0643\u06c6\u0632\u0646\u06d5\u0643",
"None": "\u064a\u0648\u0642",
"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 \u062a\u0648\u0631 \u0626\u0627\u062f\u0631\u06d0\u0633\u0649 \u0633\u0649\u0631\u062a\u0642\u0649 \u0626\u06c7\u0644\u0627\u0646\u0645\u0649\u062f\u06d5\u0643 \u0642\u0649\u0644\u0649\u067e \u062a\u06c7\u0631\u0649\u062f\u06c7 \u060c\u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 http:\/\/ \u0646\u0649 \u0642\u0648\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
"Target": "\u0646\u0649\u0634\u0627\u0646",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0633\u0649\u0632 \u0643\u0649\u0631\u06af\u06c8\u0632\u06af\u06d5\u0646 URL \u0628\u0649\u0631 \u0626\u06d0\u0644\u062e\u06d5\u062a \u0626\u0627\u062f\u0631\u06d0\u0633\u0649\u062f\u06d5\u0643 \u0642\u0649\u0644\u0649\u067e \u062a\u06c7\u0631\u0649\u062f\u06c7\u060c\u062a\u06d5\u0644\u06d5\u067e \u0642\u0649\u0644\u0649\u0646\u063a\u0627\u0646 mailto \u0646\u0649 \u0642\u06c7\u0634\u0627\u0645\u0633\u0649\u0632\u061f",
"Insert\/edit link": "\u0626\u06c7\u0644\u0649\u0646\u0649\u0634 \u0642\u06c7\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
"Insert\/edit video": "\u0633\u0649\u0646 \u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634\/\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
"Poster": "\u064a\u0648\u0644\u0644\u0649\u063a\u06c7\u0686\u0649",
......@@ -105,7 +135,7 @@ tinymce.addI18n('ug',{
"Page break": "\u0628\u06d5\u062a \u0626\u0627\u062e\u0649\u0631\u0644\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
"Paste as text": "\u062a\u06d0\u0643\u0649\u0634 \u0634\u06d5\u0643\u0644\u0649\u062f\u06d5 \u0686\u0627\u067e\u0644\u0627\u0634",
"Preview": "\u0643\u06c6\u0631\u06c8\u0634",
"Print": "\u0628\u0627\u0633\u0645\u0627\u0642 ",
"Print": "\u0628\u06d0\u0633\u0649\u0634",
"Save": "\u0633\u0627\u0642\u0644\u0627\u0634",
"Could not find the specified string.": "\u0626\u0649\u0632\u062f\u0649\u0645\u06d5\u0643\u0686\u0649 \u0628\u0648\u0644\u063a\u0627\u0646 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0646\u0649 \u062a\u0627\u067e\u0627\u0644\u0645\u0649\u062f\u0649.",
"Replace": "\u0626\u0627\u0644\u0645\u0627\u0634\u062a\u06c7\u0631\u06c7\u0634",
......@@ -181,7 +211,7 @@ tinymce.addI18n('ug',{
"Insert": "\u0642\u0649\u0633\u062a\u06c7\u0631\u06c7\u0634",
"File": "\u06be\u06c6\u062c\u062c\u06d5\u062a",
"Edit": "\u062a\u06d5\u06be\u0631\u0649\u0631\u0644\u06d5\u0634",
"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help",
"Rich Text Area. Press ALT-F9 for menu. Press ALT-F10 for toolbar. Press ALT-0 for help": "\u0645\u0648\u0644 \u0645\u06d5\u0632\u0645\u06c7\u0646\u0644\u06c7\u0642 \u062a\u06d0\u0643\u06d0\u0633\u0649\u062a \u0631\u0627\u0645\u0643\u0649\u0633\u0649 \u0631\u0627\u064a\u0648\u0646\u0649\u062f\u0627 \u062a\u0649\u0632\u0649\u0645\u0644\u0649\u0643 \u0626\u06c8\u0686\u06c8\u0646 ALT-F9 \u0646\u0649\u060c \u0642\u0648\u0631\u0627\u0644 \u0628\u0627\u0644\u062f\u0649\u0642\u0649 \u0626\u06c8\u0686\u06c8\u0646 ALT-F10 \u0646\u0649\u060c \u064a\u0627\u0631\u062f\u06d5\u0645 \u0626\u06c8\u0686\u06c8\u0646 ALT-0 \u0646\u0649 \u0628\u06d0\u0633\u0649\u06ad",
"Tools": "\u0642\u06c7\u0631\u0627\u0644",
"View": "\u0643\u06c6\u0631\u06c8\u0634",
"Table": "\u062c\u06d5\u062f\u06cb\u06d5\u0644",
......
{
"_args": [
[
"tinymce@^4.3.4",
{
"name": "tinymce",
"raw": "tinymce@^4.4.1",
"rawSpec": "^4.4.1",
"scope": null,
"spec": ">=4.4.1 <5.0.0",
"type": "range"
},
"/home/sgalinski/disk2/Vagrant/WebsiteBase/web/website-base.dev/typo3conf/ext/tinymce"
]
],
"_from": "tinymce@>=4.3.4 <5.0.0",
"_id": "tinymce@4.3.13",
"_from": "tinymce@>=4.4.1 <5.0.0",
"_id": "tinymce@4.4.1",
"_inCache": true,
"_installable": true,
"_location": "/tinymce",
"_nodeVersion": "5.11.1",
"_npmOperationalInternal": {
"host": "packages-16-east.internal.npmjs.com",
"tmp": "tmp/tinymce-4.3.13.tgz_1465389487608_0.7176297463010997"
"host": "packages-12-west.internal.npmjs.com",
"tmp": "tmp/tinymce-4.4.1.tgz_1469527487002_0.7330783300567418"
},
"_npmUser": {
"email": "is-accounts@ephox.com",
......@@ -23,19 +30,19 @@
"_phantomChildren": {},
"_requested": {
"name": "tinymce",
"raw": "tinymce@^4.3.4",
"rawSpec": "^4.3.4",
"raw": "tinymce@^4.4.1",
"rawSpec": "^4.4.1",
"scope": null,
"spec": ">=4.3.4 <5.0.0",
"spec": ">=4.4.1 <5.0.0",
"type": "range"
},
"_requiredBy": [
"/"
],
"_resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.3.13.tgz",
"_shasum": "0066241bb6bed429d7c55806812c3e2a566107a1",
"_resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.4.1.tgz",
"_shasum": "c39037add71b0ae4226e29bf7d55be1f92435dcd",
"_shrinkwrap": null,
"_spec": "tinymce@^4.3.4",
"_spec": "tinymce@^4.4.1",
"_where": "/home/sgalinski/disk2/Vagrant/WebsiteBase/web/website-base.dev/typo3conf/ext/tinymce",
"bugs": {
"url": "http://www.tinymce.com/develop/bugtracker.php"
......@@ -45,8 +52,8 @@
"devDependencies": {},
"directories": {},
"dist": {
"shasum": "0066241bb6bed429d7c55806812c3e2a566107a1",
"tarball": "https://registry.npmjs.org/tinymce/-/tinymce-4.3.13.tgz"
"shasum": "c39037add71b0ae4226e29bf7d55be1f92435dcd",
"tarball": "https://registry.npmjs.org/tinymce/-/tinymce-4.4.1.tgz"
},
"keywords": [
"editor",
......@@ -71,5 +78,5 @@
"optionalDependencies": {},
"readme": "ERROR: No README data found!",
"scripts": {},
"version": "4.3.13"
"version": "4.4.1"
}
......@@ -44,7 +44,11 @@ tinymce.PluginManager.add('advlist', function(editor) {
// Switch/add list type if needed
if (!list || list.nodeName != listName || styleValue === false) {
editor.execCommand(listName == 'UL' ? 'InsertUnorderedList' : 'InsertOrderedList');
var detail = {
'list-style-type': styleValue ? styleValue : ''
};
editor.execCommand(listName == 'UL' ? 'InsertUnorderedList' : 'InsertOrderedList', false, detail);
}
// Set style
......
tinymce.PluginManager.add("advlist",function(a){function b(a,b){var c=[];return tinymce.each(b.split(/[ ,]/),function(a){c.push({text:a.replace(/\-/g," ").replace(/\b\w/g,function(a){return a.toUpperCase()}),data:"default"==a?"":a})}),c}function c(b,c){a.undoManager.transact(function(){var d,e=a.dom,f=a.selection;d=e.getParent(f.getNode(),"ol,ul"),d&&d.nodeName==b&&c!==!1||a.execCommand("UL"==b?"InsertUnorderedList":"InsertOrderedList"),c=c===!1?g[b]:c,g[b]=c,d=e.getParent(f.getNode(),"ol,ul"),d&&(e.setStyle(d,"listStyleType",c?c:null),d.removeAttribute("data-mce-style")),a.focus()})}function d(b){var c=a.dom.getStyle(a.dom.getParent(a.selection.getNode(),"ol,ul"),"listStyleType")||"";b.control.items().each(function(a){a.active(a.settings.data===c)})}var e,f,g={};e=b("OL",a.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),f=b("UL",a.getParam("advlist_bullet_styles","default,circle,disc,square")),a.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:e,onshow:d,onselect:function(a){c("OL",a.control.settings.data)},onclick:function(){c("OL",!1)}}),a.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:f,onshow:d,onselect:function(a){c("UL",a.control.settings.data)},onclick:function(){c("UL",!1)}})});
\ No newline at end of file
tinymce.PluginManager.add("advlist",function(a){function b(a,b){var c=[];return tinymce.each(b.split(/[ ,]/),function(a){c.push({text:a.replace(/\-/g," ").replace(/\b\w/g,function(a){return a.toUpperCase()}),data:"default"==a?"":a})}),c}function c(b,c){a.undoManager.transact(function(){var d,e=a.dom,f=a.selection;if(d=e.getParent(f.getNode(),"ol,ul"),!d||d.nodeName!=b||c===!1){var h={"list-style-type":c?c:""};a.execCommand("UL"==b?"InsertUnorderedList":"InsertOrderedList",!1,h)}c=c===!1?g[b]:c,g[b]=c,d=e.getParent(f.getNode(),"ol,ul"),d&&(e.setStyle(d,"listStyleType",c?c:null),d.removeAttribute("data-mce-style")),a.focus()})}function d(b){var c=a.dom.getStyle(a.dom.getParent(a.selection.getNode(),"ol,ul"),"listStyleType")||"";b.control.items().each(function(a){a.active(a.settings.data===c)})}var e,f,g={};e=b("OL",a.getParam("advlist_number_styles","default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman")),f=b("UL",a.getParam("advlist_bullet_styles","default,circle,disc,square")),a.addButton("numlist",{type:"splitbutton",tooltip:"Numbered list",menu:e,onshow:d,onselect:function(a){c("OL",a.control.settings.data)},onclick:function(){c("OL",!1)}}),a.addButton("bullist",{type:"splitbutton",tooltip:"Bullet list",menu:f,onshow:d,onselect:function(a){c("UL",a.control.settings.data)},onclick:function(){c("UL",!1)}})});
\ No newline at end of file
......@@ -117,7 +117,7 @@ tinymce.PluginManager.add('fullscreen', function(editor) {
editor.addMenuItem('fullscreen', {
text: 'Fullscreen',
shortcut: 'Meta+Alt+F',
shortcut: 'Ctrl+Shift+F',
selectable: true,
onClick: function() {
toggleFullscreen();
......@@ -135,7 +135,7 @@ tinymce.PluginManager.add('fullscreen', function(editor) {
editor.addButton('fullscreen', {
tooltip: 'Fullscreen',
shortcut: 'Meta+Alt+F',
shortcut: 'Ctrl+Alt+F',
onClick: toggleFullscreen,
onPostRender: function() {
var self = this;
......
tinymce.PluginManager.add("fullscreen",function(a){function b(){var a,b,c=window,d=document,e=d.body;return e.offsetWidth&&(a=e.offsetWidth,b=e.offsetHeight),c.innerWidth&&c.innerHeight&&(a=c.innerWidth,b=c.innerHeight),{w:a,h:b}}function c(){var a=tinymce.DOM.getViewPort();return{x:a.x,y:a.y}}function d(a){scrollTo(a.x,a.y)}function e(){function e(){m.setStyle(p,"height",b().h-(o.clientHeight-p.clientHeight))}var n,o,p,q,r=document.body,s=document.documentElement;l=!l,o=a.getContainer(),n=o.style,p=a.getContentAreaContainer().firstChild,q=p.style,l?(k=c(),f=q.width,g=q.height,q.width=q.height="100%",i=n.width,j=n.height,n.width=n.height="",m.addClass(r,"mce-fullscreen"),m.addClass(s,"mce-fullscreen"),m.addClass(o,"mce-fullscreen"),m.bind(window,"resize",e),e(),h=e):(q.width=f,q.height=g,i&&(n.width=i),j&&(n.height=j),m.removeClass(r,"mce-fullscreen"),m.removeClass(s,"mce-fullscreen"),m.removeClass(o,"mce-fullscreen"),m.unbind(window,"resize",h),d(k)),a.fire("FullscreenStateChanged",{state:l})}var f,g,h,i,j,k,l=!1,m=tinymce.DOM;return a.settings.inline?void 0:(a.on("init",function(){a.addShortcut("Ctrl+Shift+F","",e)}),a.on("remove",function(){h&&m.unbind(window,"resize",h)}),a.addCommand("mceFullScreen",e),a.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Meta+Alt+F",selectable:!0,onClick:function(){e(),a.focus()},onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})},context:"view"}),a.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Meta+Alt+F",onClick:e,onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})}}),{isFullscreen:function(){return l}})});
\ No newline at end of file
tinymce.PluginManager.add("fullscreen",function(a){function b(){var a,b,c=window,d=document,e=d.body;return e.offsetWidth&&(a=e.offsetWidth,b=e.offsetHeight),c.innerWidth&&c.innerHeight&&(a=c.innerWidth,b=c.innerHeight),{w:a,h:b}}function c(){var a=tinymce.DOM.getViewPort();return{x:a.x,y:a.y}}function d(a){scrollTo(a.x,a.y)}function e(){function e(){m.setStyle(p,"height",b().h-(o.clientHeight-p.clientHeight))}var n,o,p,q,r=document.body,s=document.documentElement;l=!l,o=a.getContainer(),n=o.style,p=a.getContentAreaContainer().firstChild,q=p.style,l?(k=c(),f=q.width,g=q.height,q.width=q.height="100%",i=n.width,j=n.height,n.width=n.height="",m.addClass(r,"mce-fullscreen"),m.addClass(s,"mce-fullscreen"),m.addClass(o,"mce-fullscreen"),m.bind(window,"resize",e),e(),h=e):(q.width=f,q.height=g,i&&(n.width=i),j&&(n.height=j),m.removeClass(r,"mce-fullscreen"),m.removeClass(s,"mce-fullscreen"),m.removeClass(o,"mce-fullscreen"),m.unbind(window,"resize",h),d(k)),a.fire("FullscreenStateChanged",{state:l})}var f,g,h,i,j,k,l=!1,m=tinymce.DOM;return a.settings.inline?void 0:(a.on("init",function(){a.addShortcut("Ctrl+Shift+F","",e)}),a.on("remove",function(){h&&m.unbind(window,"resize",h)}),a.addCommand("mceFullScreen",e),a.addMenuItem("fullscreen",{text:"Fullscreen",shortcut:"Ctrl+Shift+F",selectable:!0,onClick:function(){e(),a.focus()},onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})},context:"view"}),a.addButton("fullscreen",{tooltip:"Fullscreen",shortcut:"Ctrl+Alt+F",onClick:e,onPostRender:function(){var b=this;a.on("FullscreenStateChanged",function(a){b.active(a.state)})}}),{isFullscreen:function(){return l}})});
\ No newline at end of file
......@@ -81,7 +81,7 @@ var defineGlobal = function (id, ref) {
define(id, [], function () { return ref; });
};
/*jsc
["tinymce/imagetoolsplugin/Plugin","global!tinymce.PluginManager","global!tinymce.Env","global!tinymce.util.Promise","global!tinymce.util.URI","global!tinymce.util.Tools","global!tinymce.util.Delay","ephox/imagetools/api/ImageTransformations","ephox/imagetools/api/BlobConversions","tinymce/imagetoolsplugin/Dialog","tinymce/imagetoolsplugin/ImageSize","tinymce/imagetoolsplugin/Proxy","ephox/imagetools/transformations/Filters","ephox/imagetools/transformations/ImageTools","ephox/imagetools/util/Conversions","global!tinymce.dom.DOMUtils","global!tinymce.ui.Factory","global!tinymce.ui.Form","global!tinymce.ui.Container","tinymce/imagetoolsplugin/ImagePanel","tinymce/imagetoolsplugin/UndoStack","tinymce/imagetoolsplugin/Utils","ephox/imagetools/util/Canvas","ephox/imagetools/util/ImageSize","ephox/imagetools/util/Promise","ephox/imagetools/util/Mime","ephox/imagetools/transformations/ColorMatrix","global!tinymce.ui.Control","global!tinymce.ui.DragHelper","global!tinymce.geom.Rect","tinymce/imagetoolsplugin/CropRect","global!tinymce.dom.DomQuery","global!tinymce.util.Observable","global!tinymce.util.VK"]
["tinymce/imagetoolsplugin/Plugin","global!tinymce.PluginManager","global!tinymce.Env","global!tinymce.util.Promise","global!tinymce.util.URI","global!tinymce.util.Tools","global!tinymce.util.Delay","ephox/imagetools/api/ImageTransformations","ephox/imagetools/api/BlobConversions","tinymce/imagetoolsplugin/Dialog","tinymce/imagetoolsplugin/ImageSize","tinymce/imagetoolsplugin/Proxy","ephox/imagetools/transformations/Filters","ephox/imagetools/transformations/ImageTools","ephox/imagetools/util/Conversions","global!tinymce.dom.DOMUtils","global!tinymce.ui.Factory","global!tinymce.ui.Form","global!tinymce.ui.Container","tinymce/imagetoolsplugin/ImagePanel","tinymce/imagetoolsplugin/UndoStack","tinymce/imagetoolsplugin/Utils","ephox/imagetools/util/Canvas","ephox/imagetools/util/ImageSize","ephox/imagetools/util/Promise","ephox/imagetools/util/Mime","ephox/imagetools/transformations/ColorMatrix","ephox/imagetools/transformations/ImageResizerCanvas","global!tinymce.ui.Control","global!tinymce.ui.DragHelper","global!tinymce.geom.Rect","tinymce/imagetoolsplugin/CropRect","global!tinymce.dom.DomQuery","global!tinymce.util.Observable","global!tinymce.util.VK"]
jsc*/
defineGlobal("global!tinymce.PluginManager", tinymce.PluginManager);
defineGlobal("global!tinymce.Env", tinymce.Env);
......@@ -111,6 +111,19 @@ define("ephox/imagetools/util/Canvas", [], function() {
return canvas.getContext("2d");
}
function get3dContext(canvas) {
var gl = null;
try {
gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl");
}
catch(e) {}
if (!gl) { // it seems that sometimes it doesn't throw exception, but still fails to get context
gl = null;
}
return gl;
}
function resize(canvas, width, height) {
canvas.width = width;
canvas.height = height;
......@@ -121,7 +134,8 @@ define("ephox/imagetools/util/Canvas", [], function() {
return {
create: create,
resize: resize,
get2dContext: get2dContext
get2dContext: get2dContext,
get3dContext: get3dContext
};
});
/**
......@@ -1035,6 +1049,79 @@ define("ephox/imagetools/transformations/Filters", [
convoluteFilter: convoluteFilter
};
});
/**
* ImageResizerCanvas.js
*
* Released under LGPL License.
* Copyright (c) 1999-2015 Ephox Corp. All rights reserved
*
* License: http://www.tinymce.com/license
* Contributing: http://www.tinymce.com/contributing
*/
/**
* Resizes image/canvas using canvas
*/
define("ephox/imagetools/transformations/ImageResizerCanvas", [
"ephox/imagetools/util/Promise",
"ephox/imagetools/util/Conversions",
"ephox/imagetools/util/Canvas",
"ephox/imagetools/util/ImageSize"
], function(Promise, Conversions, Canvas, ImageSize) {
/**
* @method scale
* @static
* @param image {Image|Canvas}
* @param dW {Number} Width that the image should be scaled to
* @param dH {Number} Height that the image should be scaled to
* @returns {Promise}
*/
function scale(image, dW, dH) {
var sW = ImageSize.getWidth(image);
var sH = ImageSize.getHeight(image);
var wRatio = dW / sW;
var hRatio = dH / sH;
var scaleCapped = false;
if (wRatio < 0.5 || wRatio > 2) {
wRatio = wRatio < 0.5 ? 0.5 : 2;
scaleCapped = true;
}
if (hRatio < 0.5 || hRatio > 2) {
hRatio = hRatio < 0.5 ? 0.5 : 2;
scaleCapped = true;
}
var scaled = _scale(image, wRatio, hRatio);
return !scaleCapped ? scaled : scaled.then(function (tCanvas) {
return scale(tCanvas, dW, dH);
});
}
function _scale(image, wRatio, hRatio) {
return new Promise(function(resolve) {
var sW = ImageSize.getWidth(image);
var sH = ImageSize.getHeight(image);
var dW = Math.floor(sW * wRatio);
var dH = Math.floor(sH * hRatio);
var canvas = Canvas.create(dW, dH);
var context = Canvas.get2dContext(canvas);
context.drawImage(image, 0, 0, sW, sH, 0, 0, dW, dH);
resolve(canvas);
});
}
return {
scale: scale
};
});
/**
* ImageTools.js
*
......@@ -1051,8 +1138,9 @@ define("ephox/imagetools/transformations/Filters", [
define("ephox/imagetools/transformations/ImageTools", [
"ephox/imagetools/util/Conversions",
"ephox/imagetools/util/Canvas",
"ephox/imagetools/util/ImageSize"
], function(Conversions, Canvas, ImageSize) {
"ephox/imagetools/util/ImageSize",
"ephox/imagetools/transformations/ImageResizerCanvas"
], function(Conversions, Canvas, ImageSize, ImageResizerCanvas) {
var revokeImageUrl = Conversions.revokeImageUrl;
function rotate(blob, angle) {
......@@ -1115,15 +1203,25 @@ define("ephox/imagetools/transformations/ImageTools", [
});
}
var revokeImage = function (image) {
return function (result) {
revokeImageUrl(image);
return result;
};
};
function resize(blob, w, h) {
return Conversions.blobToImage(blob).then(function(image) {
var canvas = Canvas.create(w, h),
context = Canvas.get2dContext(canvas);
var result;
context.drawImage(image, 0, 0, w, h);
revokeImageUrl(image);
result = ImageResizerCanvas.scale(image, w, h)
.then(function(canvas) {
return Conversions.canvasToBlob(canvas, blob.type);
})
.then(revokeImage(image))
.catch(revokeImage(image));
return Conversions.canvasToBlob(canvas, blob.type);
return result;
});
}
......
......@@ -270,11 +270,17 @@ tinymce.PluginManager.add('lists', function(editor) {
}
}
var shouldMerge = function (listBlock, sibling) {
var targetStyle = editor.dom.getStyle(listBlock, 'list-style-type', true);
var style = editor.dom.getStyle(sibling, 'list-style-type', true);
return targetStyle === style;
};
function mergeWithAdjacentLists(listBlock) {
var sibling, node;
sibling = listBlock.nextSibling;
if (sibling && isListNode(sibling) && sibling.nodeName == listBlock.nodeName) {
if (sibling && isListNode(sibling) && sibling.nodeName == listBlock.nodeName && shouldMerge(listBlock, sibling)) {
while ((node = sibling.firstChild)) {
listBlock.appendChild(node);
}
......@@ -283,7 +289,7 @@ tinymce.PluginManager.add('lists', function(editor) {
}
sibling = listBlock.previousSibling;
if (sibling && isListNode(sibling) && sibling.nodeName == listBlock.nodeName) {
if (sibling && isListNode(sibling) && sibling.nodeName == listBlock.nodeName && shouldMerge(listBlock, sibling)) {
while ((node = sibling.firstChild)) {
listBlock.insertBefore(node, listBlock.firstChild);
}
......@@ -394,7 +400,7 @@ tinymce.PluginManager.add('lists', function(editor) {
}
function indent(li) {
var sibling, newList;
var sibling, newList, listStyle;
function mergeLists(from, to) {
var node;
......@@ -440,6 +446,10 @@ tinymce.PluginManager.add('lists', function(editor) {
sibling = li.previousSibling;
if (sibling && sibling.nodeName == 'LI') {
newList = dom.create(li.parentNode.nodeName);
listStyle = dom.getStyle(li.parentNode, 'listStyleType');
if (listStyle) {
dom.setStyle(newList, 'listStyleType', listStyle);
}
sibling.appendChild(newList);
newList.appendChild(li);
mergeLists(li.lastChild, newList);
......@@ -505,7 +515,7 @@ tinymce.PluginManager.add('lists', function(editor) {
}
}
function applyList(listName) {
function applyList(listName, detail) {
var rng = selection.getRng(true), bookmark, listItemName = 'LI';