aboutsummaryrefslogtreecommitdiff
path: root/sources/plugins/magicline
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/magicline
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/magicline')
-rw-r--r--sources/plugins/magicline/lang/es-mx.js8
-rw-r--r--sources/plugins/magicline/lang/pt.js2
-rw-r--r--sources/plugins/magicline/plugin.js14
3 files changed, 16 insertions, 8 deletions
diff --git a/sources/plugins/magicline/lang/es-mx.js b/sources/plugins/magicline/lang/es-mx.js
new file mode 100644
index 0000000..faf006a
--- /dev/null
+++ b/sources/plugins/magicline/lang/es-mx.js
@@ -0,0 +1,8 @@
1/**
2 * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
3 * For licensing, see LICENSE.md or http://ckeditor.com/license
4 */
5
6CKEDITOR.plugins.setLang( 'magicline', 'es-mx', {
7 title: 'Insertar un párrafo aquí'
8} );
diff --git a/sources/plugins/magicline/lang/pt.js b/sources/plugins/magicline/lang/pt.js
index c03c48a..97884c0 100644
--- a/sources/plugins/magicline/lang/pt.js
+++ b/sources/plugins/magicline/lang/pt.js
@@ -4,5 +4,5 @@
4 */ 4 */
5 5
6CKEDITOR.plugins.setLang( 'magicline', 'pt', { 6CKEDITOR.plugins.setLang( 'magicline', 'pt', {
7 title: 'Insira aqui o parágrafo' 7 title: 'Inserir parágrafo aqui'
8} ); 8} );
diff --git a/sources/plugins/magicline/plugin.js b/sources/plugins/magicline/plugin.js
index ac4bb78..45b6fea 100644
--- a/sources/plugins/magicline/plugin.js
+++ b/sources/plugins/magicline/plugin.js
@@ -12,7 +12,7 @@
12 12
13( function() { 13( function() {
14 CKEDITOR.plugins.add( 'magicline', { 14 CKEDITOR.plugins.add( 'magicline', {
15 lang: 'af,ar,az,bg,ca,cs,cy,da,de,de-ch,el,en,en-gb,eo,es,et,eu,fa,fi,fr,fr-ca,gl,he,hr,hu,id,it,ja,km,ko,ku,lv,nb,nl,no,oc,pl,pt,pt-br,ru,si,sk,sl,sq,sv,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE% 15 lang: 'af,ar,az,bg,ca,cs,cy,da,de,de-ch,el,en,en-gb,eo,es,es-mx,et,eu,fa,fi,fr,fr-ca,gl,he,hr,hu,id,it,ja,km,ko,ku,lv,nb,nl,no,oc,pl,pt,pt-br,ru,si,sk,sl,sq,sv,tr,tt,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
16 init: initPlugin 16 init: initPlugin
17 } ); 17 } );
18 18
@@ -38,7 +38,7 @@
38 // %REMOVE_START% 38 // %REMOVE_START%
39 // Internal DEBUG uses tools located in the topmost window. 39 // Internal DEBUG uses tools located in the topmost window.
40 40
41 // (#9701) Due to security limitations some browsers may throw 41 // (http://dev.ckeditor.com/ticket/9701) Due to security limitations some browsers may throw
42 // errors when accessing window.top object. Do it safely first then. 42 // errors when accessing window.top object. Do it safely first then.
43 try { 43 try {
44 that.debug = window.top.DEBUG; 44 that.debug = window.top.DEBUG;
@@ -278,7 +278,7 @@
278 var elements, element, i; 278 var elements, element, i;
279 279
280 for ( var t in { p: 1, br: 1, div: 1 } ) { 280 for ( var t in { p: 1, br: 1, div: 1 } ) {
281 // document.find is not available in QM (#11149). 281 // document.find is not available in QM (http://dev.ckeditor.com/ticket/11149).
282 elements = editor.document.getElementsByTag( t ); 282 elements = editor.document.getElementsByTag( t );
283 283
284 for ( i = elements.count(); i--; ) { 284 for ( i = elements.count(); i--; ) {
@@ -428,7 +428,7 @@
428 function elementFromPoint( doc, mouse ) { 428 function elementFromPoint( doc, mouse ) {
429 var pointedElement = doc.$.elementFromPoint( mouse.x, mouse.y ); 429 var pointedElement = doc.$.elementFromPoint( mouse.x, mouse.y );
430 430
431 // IE9QM: from times to times it will return an empty object on scroll bar hover. (#12185) 431 // IE9QM: from times to times it will return an empty object on scroll bar hover. (http://dev.ckeditor.com/ticket/12185)
432 return pointedElement && pointedElement.nodeType ? 432 return pointedElement && pointedElement.nodeType ?
433 new CKEDITOR.dom.element( pointedElement ) : 433 new CKEDITOR.dom.element( pointedElement ) :
434 null; 434 null;
@@ -483,7 +483,7 @@
483 // If trigger is an element, neither editable nor editable's ascendant. 483 // If trigger is an element, neither editable nor editable's ascendant.
484 if ( trigger && that.editable.contains( trigger ) ) { 484 if ( trigger && that.editable.contains( trigger ) ) {
485 // Check for closest editable limit. 485 // Check for closest editable limit.
486 // Don't consider trigger as a limit as it may be nested editable (includeSelf=false) (#12009). 486 // Don't consider trigger as a limit as it may be nested editable (includeSelf=false) (http://dev.ckeditor.com/ticket/12009).
487 var limit = getClosestEditableLimit( trigger ); 487 var limit = getClosestEditableLimit( trigger );
488 488
489 // Trigger in nested editable area. 489 // Trigger in nested editable area.
@@ -730,7 +730,7 @@
730 730
731 // Consider the editable to be an element with overflow:scroll 731 // Consider the editable to be an element with overflow:scroll
732 // and non-zero scrollTop/scrollLeft value. 732 // and non-zero scrollTop/scrollLeft value.
733 // For example: divarea editable. (#9383) 733 // For example: divarea editable. (http://dev.ckeditor.com/ticket/9383)
734 styleSet.top += view.editable.scroll.top; 734 styleSet.top += view.editable.scroll.top;
735 styleSet.left += view.editable.scroll.left; 735 styleSet.left += view.editable.scroll.left;
736 } 736 }
@@ -931,7 +931,7 @@
931 var selected = editor.getSelection().getStartElement(), 931 var selected = editor.getSelection().getStartElement(),
932 limit; 932 limit;
933 933
934 // (#9833) Go down to the closest non-inline element in DOM structure 934 // (http://dev.ckeditor.com/ticket/9833) Go down to the closest non-inline element in DOM structure
935 // since inline elements don't participate in in magicline. 935 // since inline elements don't participate in in magicline.
936 selected = selected.getAscendant( DTD_BLOCK, 1 ); 936 selected = selected.getAscendant( DTD_BLOCK, 1 );
937 937