security update core+modules

This commit is contained in:
Bachir Soussi Chiadmi
2015-04-26 18:38:56 +02:00
parent 2f45ea820a
commit 7c96373038
1022 changed files with 30319 additions and 11259 deletions

View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

View File

@@ -1,10 +1,10 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
/**
* @file Plugin for inserting files from imce without image dialog
* @file Plugin for inserting files from IMCE without image dialog
*/
( function() {
CKEDITOR.plugins.add( 'imce',
@@ -30,7 +30,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
});
//add editor function
editor._.filebrowserFnIMCE = CKEDITOR.tools.addFunction( setFile, editor )
editor._.filebrowserFnIMCE = CKEDITOR.tools.addFunction( setFile, editor );
//function which receive imce response
window.ckeditor_setFile = function (file, win) {

View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -27,12 +27,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
data.node = data.node.$;
}
if (selection.getType() == CKEDITOR.SELECTION_TEXT) {
if (CKEDITOR.env.ie) {
data.content = selection.getNative().createRange().text;
}
else {
data.content = selection.getNative().toString();
}
data.content = selection.getSelectedText();
}
else if (data.node) {
// content is supposed to contain the "outerHTML".

View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/

View File

@@ -1,5 +1,5 @@
/*
Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.
Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.html or http://ckeditor.com/license
*/
@@ -36,7 +36,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
'}'
);
editor.addCommand( 'mediaembedDialog', new CKEDITOR.dialogCommand( 'mediaembedDialog' ) );
editor.addCommand( 'mediaembedDialog', new CKEDITOR.dialogCommand( 'mediaembedDialog', { allowedContent : 'div(media_embed);iframe[*](*)' } ) );
editor.ui.addButton( 'MediaEmbed',
{
label: 'Embed Media',
@@ -87,7 +87,7 @@ For licensing, see LICENSE.html or http://ckeditor.com/license
if (element.attributes[ 'class' ] == 'media_embed') {
var fakeElement = editor.createFakeParserElement(element, 'cke_mediaembed', 'div', true);
var fakeStyle = fakeElement.attributes.style || '';
if (typeof(element.children[0].attributes) != 'undefined') {
if (element.children[0] && typeof(element.children[0].attributes) != 'undefined') {
var height = element.children[0].attributes.height,
width = element.children[0].attributes.width;
}