[MERGE] Merged lp:~openerp-dev/openobject-addons/trunk-website-al

bzr revid: psa@tinyerp.com-20131224053125-3lrogsrgd3ccp0i6

1 files changed, 0 insertions, 95 deletions

diff --git a/addons/website/static/lib/ckeditor/plugins/smiley/plugin.js b/addons/website/static/lib/ckeditor/plugins/smiley/plugin.js
deleted file mode 100644
index 198523c0b40..00000000000
--- a/addons/website/static/lib/ckeditor/plugins/smiley/plugin.js
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * @license Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-CKEDITOR.plugins.add( 'smiley', {
-	requires: 'dialog',
-	lang: 'af,ar,bg,bn,bs,ca,cs,cy,da,de,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,pl,pt,pt-br,ro,ru,si,sk,sl,sq,sr,sr-latn,sv,th,tr,ug,uk,vi,zh,zh-cn', // %REMOVE_LINE_CORE%
-	icons: 'smiley', // %REMOVE_LINE_CORE%
-	hidpi: true, // %REMOVE_LINE_CORE%
-	init: function( editor ) {
-		editor.config.smiley_path = editor.config.smiley_path || ( this.path + 'images/' );
-		editor.addCommand( 'smiley', new CKEDITOR.dialogCommand( 'smiley', {
-			allowedContent: 'img[alt,height,!src,title,width]',
-			requiredContent: 'img'
-		} ) );
-		editor.ui.addButton && editor.ui.addButton( 'Smiley', {
-			label: editor.lang.smiley.toolbar,
-			command: 'smiley',
-			toolbar: 'insert,50'
-		});
-		CKEDITOR.dialog.add( 'smiley', this.path + 'dialogs/smiley.js' );
-	}
-});
-
-/**
- * The base path used to build the URL for the smiley images. It must end with a slash.
- *
- *		config.smiley_path = 'http://www.example.com/images/smileys/';
- *
- *		config.smiley_path = '/images/smileys/';
- *
- * @cfg {String} [smiley_path=CKEDITOR.basePath + 'plugins/smiley/images/']
- * @member CKEDITOR.config
- */
-
-/**
- * The file names for the smileys to be displayed. These files must be
- * contained inside the URL path defined with the {@link #smiley_path} setting.
- *
- *		// This is actually the default value.
- *		config.smiley_images = [
- *			'regular_smile.png','sad_smile.png','wink_smile.png','teeth_smile.png','confused_smile.png','tongue_smile.png',
- *			'embarrassed_smile.png','omg_smile.png','whatchutalkingabout_smile.png','angry_smile.png','angel_smile.png','shades_smile.png',
- *			'devil_smile.png','cry_smile.png','lightbulb.png','thumbs_down.png','thumbs_up.png','heart.png',
- *			'broken_heart.png','kiss.png','envelope.png'
- *		];
- *
- * @cfg
- * @member CKEDITOR.config
- */
-CKEDITOR.config.smiley_images = [
-	'regular_smile.png', 'sad_smile.png', 'wink_smile.png', 'teeth_smile.png', 'confused_smile.png', 'tongue_smile.png',
-	'embarrassed_smile.png', 'omg_smile.png', 'whatchutalkingabout_smile.png', 'angry_smile.png', 'angel_smile.png', 'shades_smile.png',
-	'devil_smile.png', 'cry_smile.png', 'lightbulb.png', 'thumbs_down.png', 'thumbs_up.png', 'heart.png',
-	'broken_heart.png', 'kiss.png', 'envelope.png' ];
-
-/**
- * The description to be used for each of the smileys defined in the
- * {@link CKEDITOR.config#smiley_images} setting. Each entry in this array list
- * must match its relative pair in the {@link CKEDITOR.config#smiley_images}
- * setting.
- *
- *		// Default settings.
- *		config.smiley_descriptions = [
- *			'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
- *			'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
- *			'yes', 'heart', 'broken heart', 'kiss', 'mail'
- *		];
- *
- *		// Use textual emoticons as description.
- *		config.smiley_descriptions = [
- *			':)', ':(', ';)', ':D', ':/', ':P', ':*)', ':-o',
- *			':|', '>:(', 'o:)', '8-)', '>:-)', ';(', '', '', '',
- *			'', '', ':-*', ''
- *		];
- *
- * @cfg
- * @member CKEDITOR.config
- */
-CKEDITOR.config.smiley_descriptions = [
-	'smiley', 'sad', 'wink', 'laugh', 'frown', 'cheeky', 'blush', 'surprise',
-	'indecision', 'angry', 'angel', 'cool', 'devil', 'crying', 'enlightened', 'no',
-	'yes', 'heart', 'broken heart', 'kiss', 'mail'
-];
-
-/**
- * The number of columns to be generated by the smilies matrix.
- *
- *		config.smiley_columns = 6;
- *
- * @since 3.3.2
- * @cfg {Number} [smiley_columns=8]
- * @member CKEDITOR.config
- */