aboutsummaryrefslogtreecommitdiff
path: root/sources/plugins/image
diff options
context:
space:
mode:
authorIsmaël Bouya <ismael.bouya@normalesup.org>2017-12-04 18:55:29 +0100
committerIsmaël Bouya <ismael.bouya@normalesup.org>2017-12-04 18:55:29 +0100
commit1794320dcfdfcd19572fb1676294f9853a6bbc20 (patch)
treea4c9e978947d6930d50391747382d7f95a5863e3 /sources/plugins/image
parent7183f6a6a21ad9124e70c997e0168459f377a9f2 (diff)
downloadludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.tar.gz
ludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.tar.zst
ludivine-ckeditor-component-1794320dcfdfcd19572fb1676294f9853a6bbc20.zip
Update to 4.7.3HEAD4.7.3master
Diffstat (limited to 'sources/plugins/image')
-rw-r--r--sources/plugins/image/dialogs/image.js8
-rw-r--r--sources/plugins/image/lang/es-mx.js25
-rw-r--r--sources/plugins/image/lang/hr.js2
-rw-r--r--sources/plugins/image/lang/pt.js8
-rw-r--r--sources/plugins/image/plugin.js8
5 files changed, 38 insertions, 13 deletions
diff --git a/sources/plugins/image/dialogs/image.js b/sources/plugins/image/dialogs/image.js
index 7d7537a..5302a7c 100644
--- a/sources/plugins/image/dialogs/image.js
+++ b/sources/plugins/image/dialogs/image.js
@@ -107,7 +107,7 @@
107 107
108 var oImageOriginal = dialog.originalElement; 108 var oImageOriginal = dialog.originalElement;
109 109
110 // Dialog may already closed. (#5505) 110 // Dialog may already closed. (http://dev.ckeditor.com/ticket/5505)
111 if ( !oImageOriginal ) 111 if ( !oImageOriginal )
112 return null; 112 return null;
113 113
@@ -233,7 +233,7 @@
233 this.firstLoad = false; 233 this.firstLoad = false;
234 this.dontResetSize = false; 234 this.dontResetSize = false;
235 235
236 // Possible fix for #12818. 236 // Possible fix for http://dev.ckeditor.com/ticket/12818.
237 updatePreview( this ); 237 updatePreview( this );
238 }; 238 };
239 239
@@ -310,7 +310,7 @@
310 this.linkEditMode = true; 310 this.linkEditMode = true;
311 311
312 // If there is an existing link, by default keep it (true). 312 // If there is an existing link, by default keep it (true).
313 // It will be removed if certain conditions are met and Link tab is enabled. (#13351) 313 // It will be removed if certain conditions are met and Link tab is enabled. (http://dev.ckeditor.com/ticket/13351)
314 this.addLink = true; 314 this.addLink = true;
315 315
316 // Look for Image element. 316 // Look for Image element.
@@ -542,7 +542,7 @@
542 this.getDialog().dontResetSize = true; 542 this.getDialog().dontResetSize = true;
543 543
544 field.setValue( url ); // And call this.onChange() 544 field.setValue( url ); // And call this.onChange()
545 // Manually set the initial value.(#4191) 545 // Manually set the initial value.(http://dev.ckeditor.com/ticket/4191)
546 field.setInitValue(); 546 field.setInitValue();
547 } 547 }
548 }, 548 },
diff --git a/sources/plugins/image/lang/es-mx.js b/sources/plugins/image/lang/es-mx.js
new file mode 100644
index 0000000..dc9b24c
--- /dev/null
+++ b/sources/plugins/image/lang/es-mx.js
@@ -0,0 +1,25 @@
1/*
2Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
3For licensing, see LICENSE.md or http://ckeditor.com/license
4*/
5CKEDITOR.plugins.setLang( 'image', 'es-mx', {
6 alt: 'Texto alternativo',
7 border: 'Borde',
8 btnUpload: 'Enviar al servidor',
9 button2Img: '¿Desea transformar el botón de imagen seleccionado en una imagen simple?',
10 hSpace: 'Espacio horizontal',
11 img2Button: '¿Desea transformar la imagen seleccionada en un botón de imagen?',
12 infoTab: 'Información de imagen',
13 linkTab: 'Enlace',
14 lockRatio: 'Bloquear aspecto',
15 menu: 'Propiedades de la imagen',
16 resetSize: 'Reiniciar tamaño',
17 title: 'Propiedades de la imagen',
18 titleButton: 'Propiedades del botón de imagen',
19 upload: 'Cargar',
20 urlMissing: 'Falta la URL de origen de la imagen.',
21 vSpace: 'Espacio vertical',
22 validateBorder: 'El borde debe ser un número entero.',
23 validateHSpace: 'El espacio horizontal debe ser un número entero.',
24 validateVSpace: 'El espacio vertical debe ser un número entero.'
25} );
diff --git a/sources/plugins/image/lang/hr.js b/sources/plugins/image/lang/hr.js
index 8c272eb..962533a 100644
--- a/sources/plugins/image/lang/hr.js
+++ b/sources/plugins/image/lang/hr.js
@@ -10,7 +10,7 @@ CKEDITOR.plugins.setLang( 'image', 'hr', {
10 hSpace: 'HSpace', 10 hSpace: 'HSpace',
11 img2Button: 'Želite li promijeniti odabranu sliku u gumb?', 11 img2Button: 'Želite li promijeniti odabranu sliku u gumb?',
12 infoTab: 'Info slike', 12 infoTab: 'Info slike',
13 linkTab: 'Link', 13 linkTab: 'Veza',
14 lockRatio: 'Zaključaj odnos', 14 lockRatio: 'Zaključaj odnos',
15 menu: 'Svojstva slika', 15 menu: 'Svojstva slika',
16 resetSize: 'Obriši veličinu', 16 resetSize: 'Obriši veličinu',
diff --git a/sources/plugins/image/lang/pt.js b/sources/plugins/image/lang/pt.js
index 2b8f50c..729c48e 100644
--- a/sources/plugins/image/lang/pt.js
+++ b/sources/plugins/image/lang/pt.js
@@ -6,9 +6,9 @@ CKEDITOR.plugins.setLang( 'image', 'pt', {
6 alt: 'Texto alternativo', 6 alt: 'Texto alternativo',
7 border: 'Limite', 7 border: 'Limite',
8 btnUpload: 'Enviar para o servidor', 8 btnUpload: 'Enviar para o servidor',
9 button2Img: 'Deseja transformar o botão com imagem selecionado em uma imagem?', 9 button2Img: 'Deseja transformar o botão com imagem selecionado numa imagem simples?',
10 hSpace: 'Esp. Horiz', 10 hSpace: 'Esp. Horiz',
11 img2Button: 'Deseja transformar a imagem selecionada em um botão com imagem?', 11 img2Button: 'Deseja transformar a imagem selecionada num botão com imagem?',
12 infoTab: 'Informação da imagem', 12 infoTab: 'Informação da imagem',
13 linkTab: 'Hiperligação', 13 linkTab: 'Hiperligação',
14 lockRatio: 'Proporcional', 14 lockRatio: 'Proporcional',
@@ -17,9 +17,9 @@ CKEDITOR.plugins.setLang( 'image', 'pt', {
17 title: 'Propriedades da imagem', 17 title: 'Propriedades da imagem',
18 titleButton: 'Propriedades do botão de imagem', 18 titleButton: 'Propriedades do botão de imagem',
19 upload: 'Carregar', 19 upload: 'Carregar',
20 urlMissing: 'O URL da fonte da imagem está em falta.', 20 urlMissing: 'O URL de origem da imagem está em falta.',
21 vSpace: 'Esp. Vert', 21 vSpace: 'Esp. Vert',
22 validateBorder: 'A borda tem de ser um numero.', 22 validateBorder: 'A borda tem de ser um número inteiro.',
23 validateHSpace: 'HSpace tem de ser um numero.', 23 validateHSpace: 'HSpace tem de ser um numero.',
24 validateVSpace: 'VSpace tem de ser um numero.' 24 validateVSpace: 'VSpace tem de ser um numero.'
25} ); 25} );
diff --git a/sources/plugins/image/plugin.js b/sources/plugins/image/plugin.js
index 1394510..507ce0a 100644
--- a/sources/plugins/image/plugin.js
+++ b/sources/plugins/image/plugin.js
@@ -12,13 +12,13 @@
12 CKEDITOR.plugins.add( 'image', { 12 CKEDITOR.plugins.add( 'image', {
13 requires: 'dialog', 13 requires: 'dialog',
14 // jscs:disable maximumLineLength 14 // jscs:disable maximumLineLength
15 lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% 15 lang: 'af,ar,az,bg,bn,bs,ca,cs,cy,da,de,de-ch,el,en,en-au,en-ca,en-gb,eo,es,es-mx,et,eu,fa,fi,fo,fr,fr-ca,gl,gu,he,hi,hr,hu,id,is,it,ja,ka,km,ko,ku,lt,lv,mk,mn,ms,nb,nl,no,oc,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
16 // jscs:enable maximumLineLength 16 // jscs:enable maximumLineLength
17 icons: 'image', // %REMOVE_LINE_CORE% 17 icons: 'image', // %REMOVE_LINE_CORE%
18 hidpi: true, // %REMOVE_LINE_CORE% 18 hidpi: true, // %REMOVE_LINE_CORE%
19 init: function( editor ) { 19 init: function( editor ) {
20 // Abort when Image2 is to be loaded since both plugins 20 // Abort when Image2 is to be loaded since both plugins
21 // share the same button, command, etc. names (#11222). 21 // share the same button, command, etc. names (http://dev.ckeditor.com/ticket/11222).
22 if ( editor.plugins.image2 ) 22 if ( editor.plugins.image2 )
23 return; 23 return;
24 24
@@ -78,11 +78,11 @@
78 }, 78 },
79 afterInit: function( editor ) { 79 afterInit: function( editor ) {
80 // Abort when Image2 is to be loaded since both plugins 80 // Abort when Image2 is to be loaded since both plugins
81 // share the same button, command, etc. names (#11222). 81 // share the same button, command, etc. names (http://dev.ckeditor.com/ticket/11222).
82 if ( editor.plugins.image2 ) 82 if ( editor.plugins.image2 )
83 return; 83 return;
84 84
85 // Customize the behavior of the alignment commands. (#7430) 85 // Customize the behavior of the alignment commands. (http://dev.ckeditor.com/ticket/7430)
86 setupAlignCommand( 'left' ); 86 setupAlignCommand( 'left' );
87 setupAlignCommand( 'right' ); 87 setupAlignCommand( 'right' );
88 setupAlignCommand( 'center' ); 88 setupAlignCommand( 'center' );