ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3560 from FinnStutzenstein/cke-imageplugin-icon-fix

Browse Source 
Fixed image plugin icon (fixes #3553)
This commit is contained in:
Norman Jäckel 2018-01-28 14:01:08 +01:00 committed by GitHub
commit 22231e5852
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openslides/mediafiles/static/js/mediafiles/image-plugin.js
View File

@ -79,12 +79,6 @@ angular.module('OpenSlidesApp.mediafiles.image-plugin', [
} }
} }
}); });
// Set the toolbar icon to the default image icon.
CKEDITOR.on('instanceReady', function () {
var toolbarIcon = $('span.cke_button_icon.cke_button__image.browser_icon');
toolbarIcon.removeClass('cke_button__image browser_icon');
toolbarIcon.addClass('cke_button__image_icon');
});
// Handler for selecting an image. It may be called by clicking on a thumbnail or by // Handler for selecting an image. It may be called by clicking on a thumbnail or by
// just giving the url. The scale is optional. // just giving the url. The scale is optional.
CKEDITOR.tools.imagebrowser.selectImage = function (url, scale) { CKEDITOR.tools.imagebrowser.selectImage = function (url, scale) {
@ -139,7 +133,8 @@ angular.module('OpenSlidesApp.mediafiles.image-plugin', [
dialog.hide(); dialog.hide();
}; };
editor.addCommand('imagebrowser-open', new CKEDITOR.dialogCommand('imagebrowser-dialog')); editor.addCommand('imagebrowser-open', new CKEDITOR.dialogCommand('imagebrowser-dialog'));
editor.ui.addButton(gettextCatalog.getString('Image browser'), { // By naming the button 'image', it gets the same image as the original image button.
editor.ui.addButton('image', {
label: gettextCatalog.getString('Open image browser'), label: gettextCatalog.getString('Open image browser'),
command: 'imagebrowser-open', command: 'imagebrowser-open',
toolbar: 'insert', toolbar: 'insert',