summaryrefslogtreecommitdiff
path: root/addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2014-01-28 15:13:36 +0100
committerXavier Morel <xmo@openerp.com>2014-01-28 15:13:36 +0100
commit1f4bb2d28975ef11aaf3de15d6c982529f76ecd8 (patch)
tree781f67f566c5a4b965747f0f24908e5063c318c2 /addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js
parenta4e801aa5f71c0540b2af92c4bb4a4b13f7fdab2 (diff)
[FIX] update CKEditor to 4.3.2, fixes problem of double-escaping of non-ascii characters in widgets
bzr revid: xmo@openerp.com-20140128141336-boloxf0cfcrzej03
Diffstat (limited to 'addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js')
-rw-r--r--addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js b/addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js
index c86de59051d..953de6967b9 100644
--- a/addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js
+++ b/addons/web/static/lib/ckeditor/plugins/image/dialogs/image.js
@@ -1,5 +1,5 @@
/*
- Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2014, CKSource - Frederico Knabben. All rights reserved.
For licensing, see LICENSE.md or http://ckeditor.com/license
*/
(function(){var r=function(c,j){function r(){var a=arguments,b=this.getContentElement("advanced","txtdlgGenStyle");b&&b.commit.apply(b,a);this.foreach(function(b){b.commit&&"txtdlgGenStyle"!=b.id&&b.commit.apply(b,a)})}function i(a){if(!s){s=1;var b=this.getDialog(),d=b.imageElement;if(d){this.commit(f,d);for(var a=[].concat(a),e=a.length,c,g=0;g<e;g++)(c=b.getContentElement.apply(b,a[g].split(":")))&&c.setup(f,d)}s=0}}var f=1,k=/^\s*(\d+)((px)|\%)?\s*$/i,v=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,o=/^\d+px$/,