pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] completely remove usages of link and image plugin and import missing pieces

Browse Source 
CKEDITOR plugins are not loaded in dependency order (see previous
commits), and in the end the vast majority of the (used subpart of)
link and image plugins were reimplemented to handle new dialogs.

Bite the bullet, disable link and image and implement/import missing
parts (link removal, doubleclick hooks & toolbar button definition).

bzr revid: xmo@openerp.com-20130916090353-933av2nsrygxz64y
This commit is contained in:
Xavier Morel
2013-09-16 11:03:53 +02:00
parent 560f12cffc
commit 0c145b7577
2 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/lib/ckeditor/core/resourcemanager.js
+5 -8
View File
@@ -172,7 +172,8 @@ CKEDITOR.resourceManager.prototype = {
var loaded = this.loaded,
registered = this.registered,
urls = [],
urlsNames = {};
urlsNames = {},
resources = {};
// Loop through all names.
for ( var i = 0; i < names.length; i++ ) {
@@ -188,7 +189,8 @@ CKEDITOR.resourceManager.prototype = {
if ( !( url in urlsNames ) )
urlsNames[ url ] = [];
urlsNames[ url ].push( name );
}
} else
resources[ name ] = this.get( name );
}
CKEDITOR.scriptLoader.load( urls, function( completed, failed ) {
@@ -201,16 +203,11 @@ CKEDITOR.resourceManager.prototype = {
var nameList = urlsNames[ completed[ i ] ];
for ( var j = 0; j < nameList.length; j++ ) {
var name = nameList[ j ];
resources[ name ] = this.get( name );
loaded[ name ] = 1;
}
}
var resources = {};
for ( var k = 0; k < names.length; ++k ) {
var name_ = names[ k ];
if ( !name_ ) continue;
resources[ name_ ] = this.get( name_ );
}
callback.call( scope, resources );
}, this );
addons/website/static/src/js/website.editor.js
+43 -21
View File
@@ -33,18 +33,20 @@
}
website.init_editor = function () {
CKEDITOR.plugins.add('customdialogs', {
requires: 'link,image',
// requires: 'link,image',
init: function (editor) {
editor.on('doubleclick', function (evt) {
if (evt.data.dialog === 'link') {
delete evt.data.dialog;
link_dialog(editor);
} else if(evt.data.dialog === 'image') {
delete evt.data.dialog;
var element = evt.data.element;
if (element.is('img') && !element.data( 'cke-realelement' ) && !element.isReadOnly()) {
image_dialog(editor);
return;
}
// priority should be smaller than dialog (999) but bigger
// than link or image (default=10)
element = get_selected_link(editor) || evt.data.element;
if (element.isReadOnly() || !element.is('a')) { return; }
editor.getSelection().selectElement(element);
link_dialog(editor);
}, null, null, 500);
//noinspection JSValidateTypes
@@ -65,6 +67,19 @@
canUndo: false,
editorFocus: true,
});
editor.ui.addButton('Link', {
label: 'Link',
command: 'link',
toolbar: 'links,10',
icon: '/website/static/lib/ckeditor/plugins/link/icons/link.png',
});
editor.ui.addButton('Image', {
label: 'Image',
command: 'image',
toolbar: 'insert,10',
icon: '/website/static/lib/ckeditor/plugins/image/icons/image.png',
});
}
});
CKEDITOR.plugins.add( 'tablebutton', {
@@ -325,7 +340,7 @@
'clipboard', 'colorbutton', 'colordialog', 'dialogadvtab',
'elementspath', 'enterkey', 'entities', 'filebrowser',
'find', 'floatingspace','format', 'htmlwriter', 'iframe',
'image', 'indentblock', 'indentlist', 'justify', 'link',
'indentblock', 'indentlist', 'justify',
'list', 'pastefromword', 'pastetext', 'preview',
'removeformat', 'resize', 'save', 'selectall', 'stylescombo',
'tab', 'table', 'templates', 'toolbar', 'undo', 'wysiwygarea'
@@ -465,7 +480,11 @@
var editor = this.editor;
// same issue as in make_link
setTimeout(function () {
editor.execCommand('unlink');
editor.removeStyle(new CKEDITOR.style({
element: 'a',
type: CKEDITOR.STYLE_INLINE,
alwaysRemoveElement: true,
}));
}, 0);
this.close();
},
@@ -568,17 +587,7 @@
* if the editor is set directly on a link it will thus not work.
*/
get_selected_link: function () {
var sel = this.editor.getSelection(),
el = sel.getSelectedElement();
if (el && el.is('a')) { return el; }
var range = sel.getRanges(true)[0];
if (!range) { return null; }
range.shrink(CKEDITOR.SHRINK_TEXT);
return this.editor.elementPath(range.getCommonAncestor())
.contains('a');
return get_selected_link(this.editor);
},
fetch_pages: function () {
return openerp.jsonRpc('/web/dataset/call_kw', 'call', {
@@ -710,6 +719,19 @@
},
});
function get_selected_link(editor) {
var sel = editor.getSelection(),
el = sel.getSelectedElement();
if (el && el.is('a')) { return el; }
var range = sel.getRanges(true)[0];
if (!range) { return null; }
range.shrink(CKEDITOR.SHRINK_TEXT);
return editor.elementPath(range.getCommonAncestor())
.contains('a');
}
var Observer = window.MutationObserver || window.WebkitMutationObserver || window.JsMutationObserver;
var OBSERVER_CONFIG = {