Skip to content

Commit

Permalink
Update TinyMCE to version 4.3.13 (#5309)
Browse files Browse the repository at this point in the history
Conflicts:
	CHANGELOG
  • Loading branch information
alecpl committed Jun 12, 2016
1 parent 2168a33 commit 25b651e
Show file tree
Hide file tree
Showing 62 changed files with 1,401 additions and 443 deletions.
1 change: 1 addition & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================

- Update TinyMCE to version 4.3.13 (#5309)
- Fix bug where errors could have been not logged when per_user_logging=true
- Fix bug where message list columns could be in wrong order after column drag-n-drop and list sorting
- Fix so minified publickey.js (with cache-buster) is used when available (#5254)
Expand Down
11 changes: 4 additions & 7 deletions program/js/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function rcube_text_editor(config, id)
abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
conf = {
selector: '#' + ($('#' + id).is('.mce_editor') ? id : 'fake-editor-id'),
cache_suffix: 's=4020700',
cache_suffix: 's=4031300',
theme: 'modern',
language: config.lang,
content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css'),
Expand Down Expand Up @@ -71,9 +71,6 @@ function rcube_text_editor(config, id)
tinymce.registered_request_token = true;
tinymce.util.XHR.on('beforeSend', function(e) {
e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token);
// Fix missing lang parameter on addToDictionary request (#1490634)
if (e.settings && e.settings.data && /^method=addToDictionary/.test(e.settings.data) && !/&lang=/.test(e.settings.data))
e.settings.data += '&lang=' + ref.editor.plugins.spellchecker.getLanguage();
});
}

Expand Down Expand Up @@ -777,10 +774,9 @@ function rcube_text_editor(config, id)
// create smart files upload button
this.hack_file_input = function(elem, clone_form)
{
var link = $(elem),
var offset, link = $(elem),
file = $('<input>').attr('name', '_file[]'),
form = $('<form>').attr({method: 'post', enctype: 'multipart/form-data'}),
offset = link.offset();
form = $('<form>').attr({method: 'post', enctype: 'multipart/form-data'});

// clone existing upload form
if (clone_form) {
Expand All @@ -790,6 +786,7 @@ function rcube_text_editor(config, id)
}

function move_file_input(e) {
if (!offset) offset = link.offset();
file.css({top: (e.pageY - offset.top - 10) + 'px', left: (e.pageX - offset.left - 10) + 'px'});
}

Expand Down
15 changes: 13 additions & 2 deletions program/js/tinymce/langs/bs.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ tinymce.addI18n('bs',{
"Restore last draft": "Vrati posljednju skicu",
"Special character": "Specijalni znak",
"Source code": "Izvorni kod",
"Color": "Boja",
"Right to left": "S desna na lijevo",
"Left to right": "S lijeva na desno",
"Emoticons": "Smajliji",
Expand Down Expand Up @@ -128,11 +129,13 @@ tinymce.addI18n('bs',{
"Finish": "Zavr\u0161i",
"Ignore all": "Zanemari sve",
"Ignore": "Zanemari",
"Add to Dictionary": "Dodaj u rje\u010dnik",
"Insert row before": "Umetni red iznad",
"Rows": "Redovi",
"Height": "Visina",
"Paste row after": "Zalijepi red iznad",
"Alignment": "Poravnanje",
"Border color": "Boja okvira",
"Column group": "Grupa kolone",
"Row": "Red",
"Insert column before": "Umetni kolonu iznad",
Expand All @@ -148,15 +151,20 @@ tinymce.addI18n('bs',{
"Paste row before": "Zalijepi red ispod",
"Scope": "Opseg",
"Delete table": "Obri\u0161i tabelu",
"H Align": "H poravnanje",
"Top": "Vrh",
"Header cell": "\u0106elija zaglavlja",
"Column": "Kolona",
"Row group": "Grupa reda",
"Cell": "\u0106elija",
"Header": "Zaglavlje",
"Middle": "Sredina",
"Cell type": "Vrsta \u0107elije",
"Copy row": "Kopiraj red",
"Row properties": "Svojstva reda",
"Table properties": "Svojstva tabele",
"Row group": "Grupa reda",
"Bottom": "Dno",
"V Align": "V poravnanje",
"Header": "Zaglavlje",
"Right": "Desno",
"Insert column after": "Umetni kolonu ispod",
"Cols": "Kolone",
Expand All @@ -171,6 +179,9 @@ tinymce.addI18n('bs',{
"Insert template": "Umetni predlo\u017eak",
"Templates": "Predlo\u0161ci",
"Background color": "Boja pozadine",
"Custom...": "Prilago\u0111eno...",
"Custom color": "Korisni\u010dka boja",
"No color": "Bez boje",
"Text color": "Boja tekst",
"Show blocks": "Prika\u017ei blokove",
"Show invisible characters": "Prika\u017ei nevidljive znakove",
Expand Down
28 changes: 28 additions & 0 deletions program/js/tinymce/langs/en_CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ tinymce.addI18n('en_CA',{
"Restore last draft": "Restore last draft",
"Special character": "Special character",
"Source code": "Source code",
"B": "B",
"R": "R",
"G": "G",
"Color": "Colour",
"Right to left": "Right to left",
"Left to right": "Left to right",
"Emoticons": "Emoticons",
Expand All @@ -90,6 +94,25 @@ tinymce.addI18n('en_CA',{
"Style": "Style",
"Dimensions": "Dimensions",
"Insert image": "Insert image",
"Zoom in": "Zoom in",
"Contrast": "Contrast",
"Back": "Back",
"Gamma": "Gamma",
"Flip horizontally": "Flip horizontally",
"Resize": "Resize",
"Sharpen": "Sharpen",
"Zoom out": "Zoom out",
"Image options": "Image options",
"Apply": "Apply",
"Brightness": "Brightness",
"Rotate clockwise": "Rotate clockwise",
"Rotate counterclockwise": "Rotate counterclockwise",
"Edit image": "Edit image",
"Color levels": "Colour levels",
"Crop": "Crop",
"Orientation": "Orientation",
"Flip vertically": "Flip vertically",
"Invert": "Invert",
"Insert date\/time": "Insert date\/time",
"Remove link": "Remove link",
"Url": "Url",
Expand Down Expand Up @@ -128,11 +151,13 @@ tinymce.addI18n('en_CA',{
"Finish": "Finish",
"Ignore all": "Ignore all",
"Ignore": "Ignore",
"Add to Dictionary": "Add to Dictionary",
"Insert row before": "Insert row before",
"Rows": "Rows",
"Height": "Height",
"Paste row after": "Paste row after",
"Alignment": "Alignment",
"Border color": "Border colour",
"Column group": "Column group",
"Row": "Row",
"Insert column before": "Insert column before",
Expand Down Expand Up @@ -176,6 +201,9 @@ tinymce.addI18n('en_CA',{
"Insert template": "Insert template",
"Templates": "Templates",
"Background color": "Background colour",
"Custom...": "Custom...",
"Custom color": "Custom colour",
"No color": "No colour",
"Text color": "Text colour",
"Show blocks": "Show blocks",
"Show invisible characters": "Show invisible characters",
Expand Down
57 changes: 38 additions & 19 deletions program/js/tinymce/langs/es_MX.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,17 @@ tinymce.addI18n('es_MX',{
"Circle": "Circulo",
"Disc": "Disco",
"Upper Alpha": "Alfa may\u00fascula",
"Upper Roman": "Mayuscula Romana",
"Upper Roman": "May\u00fascula Romana",
"Lower Roman": "Romano min\u00fascula",
"Name": "Nombre",
"Anchor": "Anclar",
"You have unsaved changes are you sure you want to navigate away?": "No se han guardado los cambios. \u00bfSeguro que desea abandonar la pagina?",
"Restore last draft": "Restaurar el ultimo borrador",
"You have unsaved changes are you sure you want to navigate away?": "No se han guardado los cambios. \u00bfSeguro que desea abandonar la p\u00e1gina?",
"Restore last draft": "Restaurar el \u00faltimo borrador",
"Special character": "Caracter especial",
"Source code": "C\u00f3digo fuente",
"B": "B",
"R": "R",
"G": "G",
"Color": "Color",
"Right to left": "Derecha a Izquierda",
"Left to right": "Izquierda a derecha",
Expand All @@ -74,18 +77,15 @@ tinymce.addI18n('es_MX',{
"Document properties": "Propiedades del documento",
"Title": "T\u00edtulo",
"Keywords": "Palabras clave",
"Encoding": "Codificacion",
"Encoding": "Codificaci\u00f3n",
"Description": "Descripci\u00f3n ",
"Author": "Autor",
"Fullscreen": "Pantalla completa",
"Horizontal line": "L\u00ednea Horizontal",
"Horizontal space": "Espacio horizontal",
"B": "B",
"Insert\/edit image": "Insertar\/editar imagen",
"General": "General",
"Advanced": "Avanzado",
"G": "G",
"R": "R",
"Source": "Origen",
"Border": "Borde",
"Constrain proportions": "Restringir proporciones",
Expand All @@ -94,6 +94,25 @@ tinymce.addI18n('es_MX',{
"Style": "Estilo",
"Dimensions": "Dimensiones",
"Insert image": "Insertar imagen",
"Zoom in": "Acercar",
"Contrast": "Contraste",
"Back": "Regresar",
"Gamma": "Gamma",
"Flip horizontally": "Volter horizontalmente",
"Resize": "Cambiar tama\u00f1o",
"Sharpen": "Nitidez",
"Zoom out": "Alejar",
"Image options": "Opciones de la imagen",
"Apply": "Aplicar",
"Brightness": "Brillo",
"Rotate clockwise": "Rotar en sentido de las manecillas",
"Rotate counterclockwise": "Rotar en sentido contrario a las manecillas",
"Edit image": "Editar imagen",
"Color levels": "Niveles de Color",
"Crop": "Recortar",
"Orientation": "Orientaci\u00f3n",
"Flip vertically": "Voltear verticalmente",
"Invert": "Invertir",
"Insert date\/time": "Insertar fecha\/hora",
"Remove link": "Eliminar elnace",
"Url": "Url",
Expand All @@ -102,9 +121,9 @@ tinymce.addI18n('es_MX',{
"Insert link": "Insertar enlace",
"New window": "Nueva ventana",
"None": "Ninguno",
"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El URL que ha ingresado es un enlace externo, desea agregar el prefijo http:\/\/",
"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "El URL que ha ingresado es un enlace externo. \u00bfDesea agregar el prefijo \"http:\/\/\"?",
"Target": "Objetivo",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El URL que ha insertado tiene formato de correo electr\u00f3nico. Desea agregar con prefijo responder a.",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "El URL que ha insertado tiene formato de correo electr\u00f3nico. \u00bfDesea agregar con prefijo \"mailto:\"?",
"Insert\/edit link": "Inserta\/editar enlace",
"Insert\/edit video": "Insertar\/editar video",
"Poster": "Cartel",
Expand All @@ -113,7 +132,7 @@ tinymce.addI18n('es_MX',{
"Insert video": "Insertar video",
"Embed": "Incrustar",
"Nonbreaking space": "Espacio de no separaci\u00f3n",
"Page break": "Salto de pagina ",
"Page break": "Salto de p\u00e1gina ",
"Paste as text": "Copiar como texto",
"Preview": "Vista previa ",
"Print": "Imprimir",
Expand All @@ -125,33 +144,33 @@ tinymce.addI18n('es_MX',{
"Find and replace": "Buscar y reemplazar",
"Replace with": "Remplazar con",
"Find": "Buscar",
"Replace all": "Reemplazar todo",
"Replace all": "Remplazar todo",
"Match case": "Coincidencia",
"Prev": "Anterior",
"Spellcheck": "Revisi\u00f3n ortogr\u00e1fica",
"Finish": "Terminar",
"Ignore all": "Ignorar todo",
"Ignore": "Ignorar",
"Add to Dictionary": "Agregar al diccionario ",
"Insert row before": "Insertar rengl\u00f3n antes de",
"Insert row before": "Insertar rengl\u00f3n antes",
"Rows": "Renglones ",
"Height": "Alto",
"Paste row after": "Pegar rengl\u00f3n despu\u00e9s de",
"Paste row after": "Pegar rengl\u00f3n despu\u00e9s",
"Alignment": "Alineaci\u00f3n ",
"Border color": "Color del borde",
"Column group": "Grupo de columnas",
"Row": "Rengl\u00f3n ",
"Insert column before": "Insertar columna antes de",
"Insert column before": "Insertar columna antes",
"Split cell": "Dividir celdas",
"Cell padding": "Relleno de la celda",
"Cell spacing": "Espacio entre celdas",
"Row type": "Tipo de rengl\u00f3n ",
"Insert table": "Insertar tabla",
"Body": "Cuerpo",
"Caption": "Subtitulo",
"Caption": "Subt\u00edtulo",
"Footer": "Pie",
"Delete row": "Eliminar rengl\u00f3n ",
"Paste row before": "Pegar rengl\u00f3n antes de",
"Paste row before": "Pegar rengl\u00f3n antes",
"Scope": "Alcance",
"Delete table": "Eliminar tabla",
"H Align": "Alineaci\u00f3n Horizontal",
Expand All @@ -169,14 +188,14 @@ tinymce.addI18n('es_MX',{
"V Align": "Alineaci\u00f3n Vertical",
"Header": "Encabezado",
"Right": "Derecha",
"Insert column after": "Insertar columna despu\u00e9s de",
"Insert column after": "Insertar columna despu\u00e9s",
"Cols": "Columnas",
"Insert row after": "Insertar rengl\u00f3n despu\u00e9s de",
"Insert row after": "Insertar rengl\u00f3n despu\u00e9s",
"Width": "Ancho",
"Cell properties": "Propiedades de celda",
"Left": "Izquierda",
"Cut row": "Cortar renglon",
"Delete column": "Eliminar Columna",
"Delete column": "Eliminar columna",
"Center": "Centro",
"Merge cells": "Unir celdas",
"Insert template": "Insertar plantilla",
Expand Down
2 changes: 1 addition & 1 deletion program/js/tinymce/langs/fa.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tinymce.addI18n('fa',{
"Headings": "\u0639\u0646\u0648\u0627\u0646",
"Increase indent": "\u0627\u0641\u0632\u0627\u06cc\u0634 \u062a\u0648 \u0631\u0641\u062a\u06af\u06cc",
"Formats": "\u0642\u0627\u0644\u0628",
"Headers": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647\u200c\u0647\u0627",
"Headers": "\u0633\u0631\u0622\u06cc\u0646\u062f",
"Select all": "\u0627\u0646\u062a\u062e\u0627\u0628 \u0647\u0645\u0647",
"Header 3": "\u0633\u0631\u200c\u0635\u0641\u062d\u0647 3",
"Blocks": "\u0628\u0644\u0648\u06a9",
Expand Down
4 changes: 2 additions & 2 deletions program/js/tinymce/langs/fo.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,13 +118,13 @@ tinymce.addI18n('fo',{
"Url": "Url",
"Text to display": "Tekstur at v\u00edsa",
"Anchors": "Akker",
"Insert link": "Innset leinkju",
"Insert link": "Innset leinki",
"New window": "N\u00fdggjan glugga",
"None": "Eingin",
"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Tann URL t\u00fa skriva\u00f0i s\u00e6r \u00fat til at ver\u00f0a ein uttanh\u00fdsis adressa. Ynskir t\u00fa at seta ta\u00f0 kravda http:\/\/ forskoyti frammanfyri?",
"Target": "M\u00e1l",
"The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Tann URL t\u00fa skriva\u00f0i s\u00e6r \u00fat til at vera ein teldupost adressa. Ynskir t\u00fa at seta ta\u00f0 kravda mailto: forskoyti frammanfyri?",
"Insert\/edit link": "Innset\/r\u00e6tta leinkju",
"Insert\/edit link": "Innset\/r\u00e6tta leinki",
"Insert\/edit video": "Innset\/r\u00e6tta kykmynd",
"Poster": "Uppslag",
"Alternative source": "Onnur kelda",
Expand Down
Loading

0 comments on commit 25b651e

Please sign in to comment.