Skip to content

miscutils: fix CKEDITOR bug on enter #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: prod
Choose a base branch
from
Open

miscutils: fix CKEDITOR bug on enter #217

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions modules/miscutil/lib/htmlutils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-

# This file is part of Invenio.
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015 CERN.
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2017 CERN.
#
# Invenio is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
Expand Down Expand Up @@ -493,8 +493,7 @@ def get_html_text_editor(name, id=None, content='', textual_content=None, width=
'textarea', but not when editor_type equals to 'ckeditor'.

NOTE: When you update the CKEditor, change the value of CKEDITOR.timestamp
and the parameter that is sent when ckeditor.js is imported to any
different value, to invalidate the browser cache.
to any different value, to invalidate the settings cache.

@param name: *str* the name attribute of the returned editor

Expand Down Expand Up @@ -560,9 +559,9 @@ def get_html_text_editor(name, id=None, content='', textual_content=None, width=
/* Load the script only once, or else multiple instance of the editor on the same page will not work */
var INVENIO_CKEDITOR_ALREADY_LOADED
if (INVENIO_CKEDITOR_ALREADY_LOADED != 1) {
document.write('<script type="text/javascript" src="%(CFG_SITE_URL)s/ckeditor/ckeditor.js?v=2015_09_07"><\/script>');
document.write('<script type="text/javascript" src="%(CFG_SITE_URL)s/ckeditor/ckeditor.js?v=2017_06_29"><\/script>');
/* Add custom timestamp to invalidate config files cache */
document.write('<script type="text/javascript">CKEDITOR.timestamp = "2015_09_07"<\/script>');
document.write('<script type="text/javascript">CKEDITOR.timestamp = "2017_06_29"<\/script>');
INVENIO_CKEDITOR_ALREADY_LOADED = 1;
}
//]]></script>
Expand All @@ -573,7 +572,9 @@ def get_html_text_editor(name, id=None, content='', textual_content=None, width=
var CKEDITOR_BASEPATH = '/ckeditor/';

CKEDITOR.replace( '%(name)s',
{customConfig: '%(custom_configurations_path)s',
{
// Remove support of custom config and use vanilla ckeditor
// customConfig: '%(custom_configurations_path)s',
toolbar: '%(toolbar)s',
width: '%(width)s',
height:'%(height)s',
Expand Down Expand Up @@ -619,7 +620,8 @@ def get_html_text_editor(name, id=None, content='', textual_content=None, width=
var selection = oEditor.getSelection();
var element = selection.getStartElement();
var parent = element.getParent();
var range_split_block = true;
// Turn it off
var range_split_block = false;

if ( element.is("blockquote") && parent.is("body") ) {
if ( element.getText().trim() == "" ) {
Expand All @@ -629,8 +631,7 @@ def get_html_text_editor(name, id=None, content='', textual_content=None, width=
CKEDITOR.instances.msg.insertHtml("<p></p>");
}
}

if ( range_split_block == true ) {
if (range_split_block === true) {
var ranges = selection.getRanges(true);
for ( var i = ranges.length - 1 ; i > 0 ; i-- ) {
ranges[i].deleteContents();
Expand Down