diff options
| author | Fabien Meghazi <fme@openerp.com> | 2013-10-30 09:20:46 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2013-10-30 09:20:46 +0100 |
| commit | 12801a8cbcb57dfd77dd7b6bb1bb60ed90162409 (patch) | |
| tree | 946e19d097371371ccf012aa2b2c6a942c4ff55a /addons/website/static/lib | |
| parent | 4ae5425fb84b6ce99876da83e7138df650bac70b (diff) | |
| parent | 4a3f51bb4ee8926d143d59959a1bd8dd2de8e2cf (diff) | |
[MERGE] upstream
bzr revid: fme@openerp.com-20131030082046-13kxszts8g0ky4wr
Diffstat (limited to 'addons/website/static/lib')
| -rw-r--r-- | addons/website/static/lib/ckeditor/plugins/stylescombo/plugin.js | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/website/static/lib/ckeditor/plugins/stylescombo/plugin.js b/addons/website/static/lib/ckeditor/plugins/stylescombo/plugin.js index f0d94ee343a..3a33d0fe020 100644 --- a/addons/website/static/lib/ckeditor/plugins/stylescombo/plugin.js +++ b/addons/website/static/lib/ckeditor/plugins/stylescombo/plugin.js @@ -129,7 +129,6 @@ element = selection.getSelectedElement(), elementPath = editor.elementPath( element ), counter = [ 0, 0, 0, 0 ]; - this.showAll(); this.unmarkAll(); for ( var name in styles ) { |