--- a/client/js/main-renderer.js Thu Mar 31 17:12:55 2016 +0200
+++ b/client/js/main-renderer.js Tue Apr 05 18:32:32 2016 +0200
@@ -7,15 +7,20 @@
'underscore':'../lib/lodash/lodash',
'filesaver' :'../lib/FileSaver/FileSaver',
'requtils':'require-utils',
+ 'jquery-private':'jquery-private',
'ckeditor-core':'../lib/ckeditor/ckeditor',
- 'ckeditor-jquery':'../lib/ckeditor/adapters/jquery',
'screenfull':'../lib/screenfull/screenfull-umd'
},
+ // JQuery config. cf: http://requirejs.org/docs/jquery.html#noconflictmap
+ map: {
+ '*': { 'jquery': 'jquery-private' },
+ 'jquery-private': { 'jquery': 'jquery' }
+ },
shim: {
- 'ckeditor-jquery':{
- deps:['jquery','ckeditor-core']
+ 'ckeditor-core': {
+ exports: 'CKEDITOR',
}
- },
+ }
});
}