Commit f3c7d041 authored by Johan Cwiklinski's avatar Johan Cwiklinski

Fix merge, jslint

parent 3365a621
......@@ -43,6 +43,7 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Question\ConfirmationQuestion;
use Symfony\Component\PropertyAccess\PropertyAccessor;
use Symfony\Component\Yaml\Yaml;
use Toolbox;
......
......@@ -340,7 +340,6 @@ var insertImageInTinyMCE = function(editor, image) {
*/
if (typeof tinyMCE != 'undefined') {
tinyMCE.PluginManager.add('glpi_upload_doc', function(editor) {
/* global stopEvent */
editor.on('PastePreProcess', function(event) {
//Check if data is an image
if (isImageFromPaste(event.content)) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment