' +
@@ -606,9 +682,9 @@ define([
'
' + lang.shortcut.shortcuts + '
' +
(agent.isMac ? tplShortcutTable(lang, options) : replaceMacKeys(tplShortcutTable(lang, options))) +
'
' +
- 'Summernote @VERSION · ' +
- 'Project · ' +
- 'Issues' +
+ 'Summernote @VERSION · ' +
+ 'Project · ' +
+ 'Issues' +
'
';
return tplDialog('note-help-dialog', '', body, '');
}
@@ -696,7 +772,7 @@ define([
});
};
- this.createPalette = createPalette; // odoo change for overwrite
+ this.createPalette = createPalette; // ODOO: allow access for override
/**
* create summernote layout (air mode)
@@ -709,24 +785,25 @@ define([
var keyMap = options.keyMap[agent.isMac ? 'mac' : 'pc'];
var id = func.uniqueId();
- $holder.addClass('note-air-editor note-editable');
+ $holder.addClass('note-air-editor note-editable panel-body');
$holder.attr({
- 'data-note-id': id,
+ 'data-note-id': id, // ODOO: we use [data-note-id="{id}"] instead of [id="{id}"]
+ // 'id': 'note-editor-' + id,
'contentEditable': true
});
var body = document.body;
// create Popover
- var $popover = $(this.tplPopovers(langInfo, options)); // odoo change for overwrite
+ var $popover = $(this.tplPopovers(langInfo, options)); // ODOO: user (maybe) overrided method
$popover.addClass('note-air-layout');
$popover.attr('id', 'note-popover-' + id);
$popover.appendTo(body);
createTooltip($popover, keyMap);
- this.createPalette($popover, options); // odoo change for overwrite
+ this.createPalette($popover, options); // ODOO: use (maybe) overrided method
// create Handle
- var $handle = $(tplHandles());
+ var $handle = $(tplHandles(options));
$handle.addClass('note-air-layout');
$handle.attr('id', 'note-handle-' + id);
$handle.appendTo(body);
@@ -751,7 +828,7 @@ define([
var langInfo = options.langInfo;
//01. create Editor
- var $editor = $('
');
+ var $editor = $('
');
if (options.width) {
$editor.width(options.width);
}
@@ -761,70 +838,81 @@ define([
$('
' + (options.disableResizeEditor ? '' : tplStatusbar()) + '
').prependTo($editor);
}
- //03. create Editable
+ //03 editing area
+ var $editingArea = $('
');
+ //03. create editable
var isContentEditable = !$holder.is(':disabled');
- var $editable = $('
')
- .prependTo($editor);
+ var $editable = $('
').prependTo($editingArea);
+
if (options.height) {
$editable.height(options.height);
}
if (options.direction) {
$editable.attr('dir', options.direction);
}
- if (options.placeholder) {
- $editable.attr('data-placeholder', options.placeholder);
+ var placeholder = $holder.attr('placeholder') || options.placeholder;
+ if (placeholder) {
+ $editable.attr('data-placeholder', placeholder);
}
- $editable.html(dom.html($holder));
+ $editable.html(dom.html($holder) || dom.emptyPara);
//031. create codable
- $('
').prependTo($editor);
+ $('
').prependTo($editingArea);
- //04. create Toolbar
- var toolbarHTML = '';
+ //04. create Popover
+ var $popover = $(this.tplPopovers(langInfo, options)).prependTo($editingArea); // ODOO: use (maybe) overrided method
+ this.createPalette($popover, options); // ODOO: use (maybe) overrided method
+ createTooltip($popover, keyMap);
+
+ //05. handle(control selection, ...)
+ $(tplHandles(options)).prependTo($editingArea);
+
+ $editingArea.prependTo($editor);
+
+ //06. create Toolbar
+ var $toolbar = $('
');
for (var idx = 0, len = options.toolbar.length; idx < len; idx ++) {
var groupName = options.toolbar[idx][0];
var groupButtons = options.toolbar[idx][1];
- toolbarHTML += '
';
+ var $group = $('
');
for (var i = 0, btnLength = groupButtons.length; i < btnLength; i++) {
var buttonInfo = tplButtonInfo[groupButtons[i]];
// continue creating toolbar even if a button doesn't exist
if (!$.isFunction(buttonInfo)) { continue; }
- toolbarHTML += buttonInfo(langInfo, options);
+
+ var $button = $(buttonInfo(langInfo, options));
+ $button.attr('data-name', groupButtons[i]); // set button's alias, becuase to get button element from $toolbar
+ $group.append($button);
}
- toolbarHTML += '
';
+ $toolbar.append($group);
}
- toolbarHTML = '
' + toolbarHTML + '
';
-
- var $toolbar = $(toolbarHTML).prependTo($editor);
var keyMap = options.keyMap[agent.isMac ? 'mac' : 'pc'];
- this.createPalette($toolbar, options); // odoo change for overwrite
+ this.createPalette($toolbar, options); // ODOO: use (maybe) overrided method
createTooltip($toolbar, keyMap, 'bottom');
+ $toolbar.prependTo($editor);
- //05. create Popover
- var $popover = $(this.tplPopovers(langInfo, options)).prependTo($editor); // odoo change for overwrite
- this.createPalette($popover, options); // odoo change for overwrite
- createTooltip($popover, keyMap);
+ //07. create Dropzone
+ $('
').prependTo($editor);
- //06. handle(control selection, ...)
- $(tplHandles()).prependTo($editor);
-
- //07. create Dialog
- var $dialog = $(tplDialogs(langInfo, options)).prependTo($editor);
+ //08. create Dialog
+ var $dialogContainer = options.dialogsInBody ? $(document.body) : $editor;
+ var $dialog = $(tplDialogs(langInfo, options)).prependTo($dialogContainer);
$dialog.find('button.close, a.modal-close').click(function () {
$(this).closest('.modal').modal('hide');
});
- //08. create Dropzone
- $('
').prependTo($editor);
-
//09. Editor/Holder switch
$editor.insertAfter($holder);
$holder.hide();
};
+ this.hasNoteEditor = function ($holder) {
+ return this.noteEditorFromHolder($holder).length > 0;
+ };
+
this.noteEditorFromHolder = function ($holder) {
if ($holder.hasClass('note-air-editor')) {
return $holder;
@@ -842,10 +930,6 @@ define([
* @param {Object} options
*/
this.createLayout = function ($holder, options) {
- if (this.noteEditorFromHolder($holder).length) {
- return;
- }
-
if (options.airMode) {
this.createLayoutByAirMode($holder, options);
} else {
@@ -857,20 +941,18 @@ define([
* returns layoutInfo from holder
*
* @param {jQuery} $holder - placeholder
- * @returns {Object}
+ * @return {Object}
*/
this.layoutInfoFromHolder = function ($holder) {
var $editor = this.noteEditorFromHolder($holder);
- if (!$editor.length) { return; }
-
- var layoutInfo = dom.buildLayoutInfo($editor);
- // cache all properties.
- for (var key in layoutInfo) {
- if (layoutInfo.hasOwnProperty(key)) {
- layoutInfo[key] = layoutInfo[key].call();
- }
+ if (!$editor.length) {
+ return;
}
- return layoutInfo;
+
+ // connect $holder to $editor
+ $editor.data('holder', $holder);
+
+ return dom.buildLayoutInfo($editor);
};
/**
@@ -884,31 +966,53 @@ define([
this.removeLayout = function ($holder, layoutInfo, options) {
if (options.airMode) {
$holder.removeClass('note-air-editor note-editable')
- .removeAttr('contentEditable');
+ .removeAttr('contentEditable'); // ODOO: removed id 'id contentEditable'
- layoutInfo.popover.remove();
- layoutInfo.handle.remove();
- layoutInfo.dialog.remove();
+ layoutInfo.popover().remove();
+ layoutInfo.handle().remove();
+ layoutInfo.dialog().remove();
} else {
- $holder.html(layoutInfo.editable.html());
+ $holder.html(layoutInfo.editable().html());
- layoutInfo.editor.remove();
+ if (options.dialogsInBody) {
+ layoutInfo.dialog().remove();
+ }
+ layoutInfo.editor().remove();
$holder.show();
}
};
+ /**
+ *
+ * @return {Object}
+ * @return {function(label, options=):string} return.button {@link #tplButton function to make text button}
+ * @return {function(iconClass, options=):string} return.iconButton {@link #tplIconButton function to make icon button}
+ * @return {function(className, title=, body=, footer=):string} return.dialog {@link #tplDialog function to make dialog}
+ */
this.getTemplate = function () {
return {
button: tplButton,
iconButton: tplIconButton,
- dialog: tplDialog
+ dialog: tplDialog,
+ dropdown: tplDropdown // ODOO: suggest upstream
};
};
+ /**
+ * add button information
+ *
+ * @param {String} name button name
+ * @param {Function} buttonInfo function to make button, reference to {@link #tplButton},{@link #tplIconButton}
+ */
this.addButtonInfo = function (name, buttonInfo) {
tplButtonInfo[name] = buttonInfo;
};
+ /**
+ *
+ * @param {String} name
+ * @param {Function} dialogInfo function to make dialog, reference to {@link #tplDialog}
+ */
this.addDialogInfo = function (name, dialogInfo) {
tplDialogInfo[name] = dialogInfo;
};
diff --git a/addons/web_editor/static/lib/summernote/src/js/app.js b/addons/web_editor/static/lib/summernote/src/js/app.js
index 0a93e94d7cc..fba17afd588 100644
--- a/addons/web_editor/static/lib/summernote/src/js/app.js
+++ b/addons/web_editor/static/lib/summernote/src/js/app.js
@@ -1,8 +1,8 @@
require.config({
baseUrl: 'src/js',
paths: {
- jquery: '//code.jquery.com/jquery-1.9.1.min',
- bootstrap: '//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min',
+ jquery: '//code.jquery.com/jquery-1.11.3',
+ bootstrap: '//netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min',
summernotevideo: '/../../plugin/summernote-ext-video',
CodeMirror: '//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/codemirror',
CodeMirrorXml: '//cdnjs.cloudflare.com/ajax/libs/codemirror/3.20.0/mode/xml/xml.min',
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/agent.js b/addons/web_editor/static/lib/summernote/src/js/core/agent.js
index d0ba7ba1ef2..21555a1191c 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/agent.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/agent.js
@@ -1,51 +1,54 @@
define(['jquery'], function ($) {
- if ('function' !== typeof Array.prototype.reduce) {
+ if (!Array.prototype.reduce) {
/**
- * Array.prototype.reduce fallback
+ * Array.prototype.reduce polyfill
*
- * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/Reduce
+ * @param {Function} callback
+ * @param {Value} [initialValue]
+ * @return {Value}
+ *
+ * @see http://goo.gl/WNriQD
*/
- Array.prototype.reduce = function (callback, optInitialValue) {
- var idx, value, length = this.length >>> 0, isValueSet = false;
- if (1 < arguments.length) {
- value = optInitialValue;
- isValueSet = true;
- }
- for (idx = 0; length > idx; ++idx) {
- if (this.hasOwnProperty(idx)) {
- if (isValueSet) {
- value = callback(value, this[idx], idx, this);
- } else {
- value = this[idx];
- isValueSet = true;
- }
+ Array.prototype.reduce = function (callback) {
+ var t = Object(this), len = t.length >>> 0, k = 0, value;
+ if (arguments.length === 2) {
+ value = arguments[1];
+ } else {
+ while (k < len && !(k in t)) {
+ k++;
}
+ if (k >= len) {
+ throw new TypeError('Reduce of empty array with no initial value');
+ }
+ value = t[k++];
}
- if (!isValueSet) {
- throw new TypeError('Reduce of empty array with no initial value');
+ for (; k < len; k++) {
+ if (k in t) {
+ value = callback(value, t[k], k, t);
+ }
}
return value;
};
}
if ('function' !== typeof Array.prototype.filter) {
- Array.prototype.filter = function (fun/*, thisArg*/) {
- if (this === void 0 || this === null) {
- throw new TypeError();
- }
-
- var t = Object(this);
- var len = t.length >>> 0;
- if (typeof fun !== 'function') {
- throw new TypeError();
- }
-
+ /**
+ * Array.prototype.filter polyfill
+ *
+ * @param {Function} func
+ * @return {Array}
+ *
+ * @see http://goo.gl/T1KFnq
+ */
+ Array.prototype.filter = function (func) {
+ var t = Object(this), len = t.length >>> 0;
+
var res = [];
var thisArg = arguments.length >= 2 ? arguments[1] : void 0;
for (var i = 0; i < len; i++) {
if (i in t) {
var val = t[i];
- if (fun.call(thisArg, val, i, t)) {
+ if (func.call(thisArg, val, i, t)) {
res.push(val);
}
}
@@ -55,10 +58,52 @@ define(['jquery'], function ($) {
};
}
+ if (!Array.prototype.map) {
+ /**
+ * Array.prototype.map polyfill
+ *
+ * @param {Function} callback
+ * @return {Array}
+ *
+ * @see https://goo.gl/SMWaMK
+ */
+ Array.prototype.map = function (callback, thisArg) {
+ var T, A, k;
+ if (this === null) {
+ throw new TypeError(' this is null or not defined');
+ }
+
+ var O = Object(this);
+ var len = O.length >>> 0;
+ if (typeof callback !== 'function') {
+ throw new TypeError(callback + ' is not a function');
+ }
+
+ if (arguments.length > 1) {
+ T = thisArg;
+ }
+
+ A = new Array(len);
+ k = 0;
+
+ while (k < len) {
+ var kValue, mappedValue;
+ if (k in O) {
+ kValue = O[k];
+ mappedValue = callback.call(T, kValue, k, O);
+ A[k] = mappedValue;
+ }
+ k++;
+ }
+ return A;
+ };
+ }
+
var isSupportAmd = typeof define === 'function' && define.amd;
/**
* returns whether font is installed or not.
+ *
* @param {String} fontName
* @return {Boolean}
*/
@@ -79,13 +124,41 @@ define(['jquery'], function ($) {
return originalWidth !== width;
};
+ var userAgent = navigator.userAgent;
+ var isMSIE = /MSIE|Trident/i.test(userAgent);
+ var browserVersion;
+ if (isMSIE) {
+ var matches = /MSIE (\d+[.]\d+)/.exec(userAgent);
+ if (matches) {
+ browserVersion = parseFloat(matches[1]);
+ }
+ matches = /Trident\/.*rv:([0-9]{1,}[\.0-9]{0,})/.exec(userAgent);
+ if (matches) {
+ browserVersion = parseFloat(matches[1]);
+ }
+ }
+
/**
+ * @class core.agent
+ *
* Object which check platform and agent
+ *
+ * @singleton
+ * @alternateClassName agent
*/
var agent = {
+ /** @property {Boolean} [isMac=false] true if this agent is Mac */
isMac: navigator.appVersion.indexOf('Mac') > -1,
- isMSIE: navigator.userAgent.indexOf('MSIE') > -1 || navigator.userAgent.indexOf('Trident') > -1,
- isFF: navigator.userAgent.indexOf('Firefox') > -1,
+ /** @property {Boolean} [isMSIE=false] true if this agent is a Internet Explorer */
+ isMSIE: isMSIE,
+ /** @property {Boolean} [isFF=false] true if this agent is a Firefox */
+ isFF: /firefox/i.test(userAgent),
+ isWebkit: /webkit/i.test(userAgent),
+ /** @property {Boolean} [isSafari=false] true if this agent is a Safari */
+ isSafari: /safari/i.test(userAgent),
+ /** @property {Float} browserVersion current browser version */
+ browserVersion: browserVersion,
+ /** @property {String} jqueryVersion current jQuery version string */
jqueryVersion: parseFloat($.fn.jquery),
isSupportAmd: isSupportAmd,
hasCodeMirror: isSupportAmd ? require.specified('CodeMirror') : !!window.CodeMirror,
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/async.js b/addons/web_editor/static/lib/summernote/src/js/core/async.js
index 9df0c8e6895..7bc23586e86 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/async.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/async.js
@@ -1,9 +1,16 @@
define('summernote/core/async', function () {
/**
+ * @class core.async
+ *
* Async functions which returns `Promise`
+ *
+ * @singleton
+ * @alternateClassName async
*/
var async = (function () {
/**
+ * @method readFileAsDataURL
+ *
* read contents of file as representing URL
*
* @param {File} file
@@ -24,22 +31,30 @@ define('summernote/core/async', function () {
};
/**
+ * @method createImage
+ *
* create `
` from url string
*
* @param {String} sUrl
+ * @param {String} filename
* @return {Promise} - then: $image
*/
var createImage = function (sUrl, filename) {
return $.Deferred(function (deferred) {
- $('![]()
').one('load', function () {
- deferred.resolve($(this));
+ var $img = $('![]()
');
+
+ $img.one('load', function () {
+ $img.off('error abort');
+ deferred.resolve($img);
}).one('error abort', function () {
- deferred.reject($(this).detach());
+ $img.off('load').detach();
+ deferred.reject($img);
}).css({
display: 'none'
- }).appendTo(document.body)
- .attr('src', sUrl)
- .attr('data-filename', filename);
+ }).appendTo(document.body).attr({
+ 'src': sUrl,
+ 'data-filename': filename
+ });
}).promise();
};
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/dom.js b/addons/web_editor/static/lib/summernote/src/js/core/dom.js
index ba55ae8fa01..2250b50ac2a 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/dom.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/dom.js
@@ -8,10 +8,17 @@ define([
var ZERO_WIDTH_NBSP_CHAR = '\ufeff';
/**
+ * @class core.dom
+ *
* Dom functions
+ *
+ * @singleton
+ * @alternateClassName dom
*/
var dom = (function () {
/**
+ * @method isEditable
+ *
* returns whether node is `note-editable` or not.
*
* @param {Node} node
@@ -22,6 +29,8 @@ define([
};
/**
+ * @method isControlSizing
+ *
* returns whether node is `note-control-sizing` or not.
*
* @param {Node} node
@@ -32,16 +41,28 @@ define([
};
/**
+ * @method buildLayoutInfo
+ *
* build layoutInfo from $editor(.note-editor)
*
* @param {jQuery} $editor
* @return {Object}
+ * @return {Function} return.editor
+ * @return {Node} return.dropzone
+ * @return {Node} return.toolbar
+ * @return {Node} return.editable
+ * @return {Node} return.codable
+ * @return {Node} return.popover
+ * @return {Node} return.handle
+ * @return {Node} return.dialog
*/
var buildLayoutInfo = function ($editor) {
var makeFinder;
// air mode
if ($editor.hasClass('note-air-editor')) {
+ // ODOO: editor on [data-note-id] attribute
+ // var id = list.last($editor.attr('id').split('-'));
var id = list.last($editor.attr('data-note-id').split('-'));
makeFinder = function (sIdPrefix) {
return function () { return $(sIdPrefix + id); };
@@ -49,6 +70,7 @@ define([
return {
editor: function () { return $editor; },
+ holder : function () { return $editor.data('holder'); },
editable: function () { return $editor; },
popover: makeFinder('#note-popover-'),
handle: makeFinder('#note-handle-'),
@@ -57,11 +79,17 @@ define([
// frame mode
} else {
- makeFinder = function (sClassName) {
- return function () { return $editor.find(sClassName); };
+ makeFinder = function (className, $base) {
+ $base = $base || $editor;
+ return function () { return $base.find(className); };
};
+
+ var options = $editor.data('options');
+ var $dialogHolder = (options && options.dialogsInBody) ? $(document.body) : null;
+
return {
editor: function () { return $editor; },
+ holder : function () { return $editor.data('holder'); },
dropzone: makeFinder('.note-dropzone'),
toolbar: makeFinder('.note-toolbar'),
editable: makeFinder('.note-editable'),
@@ -69,16 +97,44 @@ define([
statusbar: makeFinder('.note-statusbar'),
popover: makeFinder('.note-popover'),
handle: makeFinder('.note-handle'),
- dialog: makeFinder('.note-dialog')
+ dialog: makeFinder('.note-dialog', $dialogHolder)
};
}
};
/**
+ * returns makeLayoutInfo from editor's descendant node.
+ *
+ * @private
+ * @param {Node} descendant
+ * @return {Object}
+ */
+ var makeLayoutInfo = function (descendant) {
+ var $target = $(descendant).closest('.note-editor, .note-air-editor, .note-air-layout');
+
+ if (!$target.length) {
+ return null;
+ }
+
+ var $editor;
+ if ($target.is('.note-editor, .note-air-editor')) {
+ $editor = $target;
+ } else {
+ // ODOO: editor on [data-note-id] attribute
+ // $editor = $('#note-editor-' + list.last($target.attr('id').split('-')));
+ $editor = $('[data-note-id="' + list.last($target.attr('id')) + '"]');
+ }
+
+ return buildLayoutInfo($editor);
+ };
+
+ /**
+ * @method makePredByNodeName
+ *
* returns predicate which judge whether nodeName is same
*
* @param {String} nodeName
- * @return {String}
+ * @return {Function}
*/
var makePredByNodeName = function (nodeName) {
nodeName = nodeName.toUpperCase();
@@ -87,6 +143,14 @@ define([
};
};
+ /**
+ * @method isText
+ *
+ *
+ *
+ * @param {Node} node
+ * @return {Boolean} true if node's type is text(3)
+ */
var isText = function (node) {
return node && node.nodeType === 3;
};
@@ -96,7 +160,7 @@ define([
* @see http://www.w3.org/html/wg/drafts/html/master/syntax.html#void-elements
*/
var isVoid = function (node) {
- return node && /^BR|^IMG|^HR/.test(node.nodeName.toUpperCase());
+ return node && /^BR|^IMG|^HR|^IFRAME|^BUTTON/.test(node.nodeName.toUpperCase());
};
var isPara = function (node) {
@@ -114,14 +178,23 @@ define([
return isPara(node) && !isLi(node);
};
+ var isTable = makePredByNodeName('TABLE');
+
var isInline = function (node) {
- return !isBodyContainer(node) && !isList(node) && !isPara(node);
+ return !isBodyContainer(node) &&
+ !isList(node) &&
+ !isHr(node) &&
+ !isPara(node) &&
+ !isTable(node) &&
+ !isBlockquote(node);
};
var isList = function (node) {
return node && /^UL|^OL/.test(node.nodeName.toUpperCase());
};
+ var isHr = makePredByNodeName('HR');
+
var isCell = function (node) {
return node && /^TD|^TH/.test(node.nodeName.toUpperCase());
};
@@ -145,11 +218,48 @@ define([
var isBody = makePredByNodeName('BODY');
/**
- * blank HTML for cursor position
+ * returns whether nodeB is closest sibling of nodeA
+ *
+ * @param {Node} nodeA
+ * @param {Node} nodeB
+ * @return {Boolean}
*/
- var blankHTML = agent.isMSIE ? ' ' : '
';
+ var isClosestSibling = function (nodeA, nodeB) {
+ return nodeA.nextSibling === nodeB ||
+ nodeA.previousSibling === nodeB;
+ };
/**
+ * returns array of closest siblings with node
+ *
+ * @param {Node} node
+ * @param {function} [pred] - predicate function
+ * @return {Node[]}
+ */
+ var withClosestSiblings = function (node, pred) {
+ pred = pred || func.ok;
+
+ var siblings = [];
+ if (node.previousSibling && pred(node.previousSibling)) {
+ siblings.push(node.previousSibling);
+ }
+ siblings.push(node);
+ if (node.nextSibling && pred(node.nextSibling)) {
+ siblings.push(node.nextSibling);
+ }
+ return siblings;
+ };
+
+ /**
+ * blank HTML for cursor position
+ * - [workaround] old IE only works with
+ * - [workaround] IE11 and other browser works with bogus br
+ */
+ var blankHTML = agent.isMSIE && agent.browserVersion < 11 ? ' ' : '
';
+
+ /**
+ * @method nodeLength
+ *
* returns #text's text size or element's childNodes size
*
* @param {Node} node
@@ -173,9 +283,12 @@ define([
if (len === 0) {
return true;
- } else if (!dom.isText(node) && len === 1 && node.innerHTML === blankHTML) {
+ } else if (!isText(node) && len === 1 && node.innerHTML === blankHTML) {
// ex)
,
return true;
+ } else if (list.all(node.childNodes, isText) && node.innerHTML === '') {
+ // ex) ,
+ return true;
}
return false;
@@ -206,6 +319,25 @@ define([
return null;
};
+ /**
+ * find nearest ancestor only single child blood line and predicate hit
+ *
+ * @param {Node} node
+ * @param {Function} pred - predicate function
+ */
+ var singleChildAncestor = function (node, pred) {
+ node = node.parentNode;
+
+ while (node) {
+ if (nodeLength(node) !== 1) { break; }
+ if (pred(node)) { return node; }
+ if (isEditable(node)) { break; }
+
+ node = node.parentNode;
+ }
+ return null;
+ };
+
/**
* returns new array of ancestor nodes (until predicate hit).
*
@@ -419,6 +551,26 @@ define([
return true;
};
+ /**
+ * returns whether point is left edge of ancestor or not.
+ * @param {BoundaryPoint} point
+ * @param {Node} ancestor
+ * @return {Boolean}
+ */
+ var isLeftEdgePointOf = function (point, ancestor) {
+ return isLeftEdgePoint(point) && isLeftEdgeOf(point.node, ancestor);
+ };
+
+ /**
+ * returns whether point is right edge of ancestor or not.
+ * @param {BoundaryPoint} point
+ * @param {Node} ancestor
+ * @return {Boolean}
+ */
+ var isRightEdgePointOf = function (point, ancestor) {
+ return isRightEdgePoint(point) && isRightEdgeOf(point.node, ancestor);
+ };
+
/**
* returns offset from parent.
*
@@ -530,6 +682,8 @@ define([
};
/**
+ * @method prevPointUtil
+ *
* @param {BoundaryPoint} point
* @param {Function} pred
* @return {BoundaryPoint}
@@ -547,6 +701,8 @@ define([
};
/**
+ * @method nextPointUntil
+ *
* @param {BoundaryPoint} point
* @param {Function} pred
* @return {BoundaryPoint}
@@ -564,6 +720,23 @@ define([
};
/**
+ * returns whether point has character or not.
+ *
+ * @param {Point} point
+ * @return {Boolean}
+ */
+ var isCharPoint = function (point) {
+ if (!isText(point.node)) {
+ return false;
+ }
+
+ var ch = point.node.nodeValue.charAt(point.offset - 1);
+ return ch && (ch !== ' ' && ch !== NBSP_CHAR);
+ };
+
+ /**
+ * @method walkPoint
+ *
* @param {BoundaryPoint} startPoint
* @param {BoundaryPoint} endPoint
* @param {Function} handler
@@ -587,6 +760,8 @@ define([
};
/**
+ * @method makeOffsetPath
+ *
* return offsetPath(array of offset) from ancestor
*
* @param {Node} ancestor - ancestor node
@@ -594,95 +769,145 @@ define([
*/
var makeOffsetPath = function (ancestor, node) {
var ancestors = listAncestor(node, func.eq(ancestor));
- return $.map(ancestors, position).reverse();
+ return ancestors.map(position).reverse();
};
/**
+ * @method fromOffsetPath
+ *
* return element from offsetPath(array of offset)
*
* @param {Node} ancestor - ancestor node
- * @param {array} aOffset - offsetPath
+ * @param {array} offsets - offsetPath
*/
- var fromOffsetPath = function (ancestor, aOffset) {
+ var fromOffsetPath = function (ancestor, offsets) {
var current = ancestor;
- for (var i = 0, len = aOffset.length; i < len; i++) {
- if (current.childNodes.length <= aOffset[i]) {
+ for (var i = 0, len = offsets.length; i < len; i++) {
+ if (current.childNodes.length <= offsets[i]) {
current = current.childNodes[current.childNodes.length - 1];
} else {
- current = current.childNodes[aOffset[i]];
+ current = current.childNodes[offsets[i]];
}
}
return current;
};
/**
+ * @method splitNode
+ *
* split element or #text
*
* @param {BoundaryPoint} point
- * @param {Boolean} [isSkipPaddingBlankHTML]
+ * @param {Object} [options]
+ * @param {Boolean} [options.isSkipPaddingBlankHTML] - default: false
+ * @param {Boolean} [options.isNotSplitEdgePoint] - default: false
* @return {Node} right node of boundaryPoint
*/
- var splitNode = function (point, isSkipPaddingBlankHTML) {
- // split #text
- if (isText(point.node)) {
- // edge case
+ var splitNode = function (point, options) {
+ var isSkipPaddingBlankHTML = options && options.isSkipPaddingBlankHTML;
+ var isNotSplitEdgePoint = options && options.isNotSplitEdgePoint;
+
+ // edge case
+ if (isEdgePoint(point) && (isText(point.node) || isNotSplitEdgePoint)) {
if (isLeftEdgePoint(point)) {
return point.node;
} else if (isRightEdgePoint(point)) {
return point.node.nextSibling;
}
+ }
+ // split #text
+ if (isText(point.node)) {
return point.node.splitText(point.offset);
+ } else {
+ var childNode = point.node.childNodes[point.offset];
+ var clone = insertAfter(point.node.cloneNode(false), point.node);
+ appendChildNodes(clone, listNext(childNode));
+
+ if (!isSkipPaddingBlankHTML) {
+ paddingBlankHTML(point.node);
+ paddingBlankHTML(clone);
+ }
+
+ return clone;
}
-
- // split element
- var childNode = point.node.childNodes[point.offset];
- var clone = insertAfter(point.node.cloneNode(false), point.node);
- appendChildNodes(clone, listNext(childNode));
-
- if (!isSkipPaddingBlankHTML) {
- paddingBlankHTML(point.node);
- paddingBlankHTML(clone);
- }
-
- return clone;
};
/**
+ * @method splitTree
+ *
* split tree by point
*
* @param {Node} root - split root
* @param {BoundaryPoint} point
- * @param {Boolean} [isSkipPaddingBlankHTML]
+ * @param {Object} [options]
+ * @param {Boolean} [options.isSkipPaddingBlankHTML] - default: false
+ * @param {Boolean} [options.isNotSplitEdgePoint] - default: false
* @return {Node} right node of boundaryPoint
*/
- var splitTree = function (root, point, isSkipPaddingBlankHTML) {
+ var splitTree = function (root, point, options) {
// ex) [#text, , ]
var ancestors = listAncestor(point.node, func.eq(root));
if (!ancestors.length) {
return null;
} else if (ancestors.length === 1) {
- return splitNode(point, isSkipPaddingBlankHTML);
+ return splitNode(point, options);
}
return ancestors.reduce(function (node, parent) {
- var clone = insertAfter(parent.cloneNode(false), parent);
-
if (node === point.node) {
- node = splitNode(point, isSkipPaddingBlankHTML);
+ node = splitNode(point, options);
}
- appendChildNodes(clone, listNext(node));
-
- if (!isSkipPaddingBlankHTML) {
- paddingBlankHTML(parent);
- paddingBlankHTML(clone);
- }
- return clone;
+ return splitNode({
+ node: parent,
+ offset: node ? dom.position(node) : nodeLength(parent)
+ }, options);
});
};
+ /**
+ * split point
+ *
+ * @param {Point} point
+ * @param {Boolean} isInline
+ * @return {Object}
+ */
+ var splitPoint = function (point, isInline) {
+ // find splitRoot, container
+ // - inline: splitRoot is a child of paragraph
+ // - block: splitRoot is a child of bodyContainer
+ var pred = isInline ? isPara : isBodyContainer;
+ var ancestors = listAncestor(point.node, pred);
+ var topAncestor = list.last(ancestors) || point.node;
+
+ var splitRoot, container;
+ if (pred(topAncestor)) {
+ splitRoot = ancestors[ancestors.length - 2];
+ container = topAncestor;
+ } else {
+ splitRoot = topAncestor;
+ container = splitRoot.parentNode;
+ }
+
+ // if splitRoot is exists, split with splitTree
+ var pivot = splitRoot && splitTree(splitRoot, point, {
+ isSkipPaddingBlankHTML: isInline,
+ isNotSplitEdgePoint: isInline
+ });
+
+ // if container is point.node, find pivot with point.offset
+ if (!pivot && container === point.node) {
+ pivot = point.node.childNodes[point.offset];
+ }
+
+ return {
+ rightNode: pivot,
+ container: container
+ };
+ };
+
var create = function (nodeName) {
return document.createElement(nodeName);
};
@@ -692,7 +917,10 @@ define([
};
/**
+ * @method remove
+ *
* remove node, (isRemoveChild: remove child or not)
+ *
* @param {Node} node
* @param {Boolean} isRemoveChild
*/
@@ -717,6 +945,8 @@ define([
};
/**
+ * @method removeWhile
+ *
* @param {Node} node
* @param {Function} pred
*/
@@ -733,6 +963,8 @@ define([
};
/**
+ * @method replace
+ *
* replace node with provided nodeName
*
* @param {Node} node
@@ -760,13 +992,27 @@ define([
var isTextarea = makePredByNodeName('TEXTAREA');
/**
- * get the HTML contents of node
+ * @param {jQuery} $node
+ * @param {Boolean} [stripLinebreaks] - default: false
+ */
+ var value = function ($node, stripLinebreaks) {
+ var val = isTextarea($node[0]) ? $node.val() : $node.html();
+ if (stripLinebreaks) {
+ return val.replace(/[\n\r]/g, '');
+ }
+ return val;
+ };
+
+ /**
+ * @method html
+ *
+ * get the HTML contents of node
*
* @param {jQuery} $node
* @param {Boolean} [isNewlineOnBlock]
*/
var html = function ($node, isNewlineOnBlock) {
- var markup = isTextarea($node[0]) ? $node.val() : $node.html();
+ var markup = value($node);
if (isNewlineOnBlock) {
var regexTag = /<(\/?)(\b(?!!)[^>\s]*)(.*?)(\s*\/?>)/g;
@@ -784,30 +1030,31 @@ define([
return markup;
};
- var value = function ($textarea) {
- var val = $textarea.val();
- // strip line breaks
- return val.replace(/[\n\r]/g, '');
- };
-
return {
+ /** @property {String} NBSP_CHAR */
NBSP_CHAR: NBSP_CHAR,
+ /** @property {String} ZERO_WIDTH_NBSP_CHAR */
ZERO_WIDTH_NBSP_CHAR: ZERO_WIDTH_NBSP_CHAR,
+ /** @property {String} blank */
blank: blankHTML,
+ /** @property {String} emptyPara */
emptyPara: '
' + blankHTML + '
',
+ makePredByNodeName: makePredByNodeName,
isEditable: isEditable,
isControlSizing: isControlSizing,
buildLayoutInfo: buildLayoutInfo,
+ makeLayoutInfo: makeLayoutInfo,
isText: isText,
isVoid: isVoid,
isPara: isPara,
isPurePara: isPurePara,
isInline: isInline,
+ isBlock: func.not(isInline),
isBodyInline: isBodyInline,
isBody: isBody,
isParaInline: isParaInline,
isList: isList,
- isTable: makePredByNodeName('TABLE'),
+ isTable: isTable,
isCell: isCell,
isBlockquote: isBlockquote,
isBodyContainer: isBodyContainer,
@@ -824,20 +1071,26 @@ define([
isTextarea: isTextarea,
isEmpty: isEmpty,
isEmptyAnchor: func.and(isAnchor, isEmpty),
+ isClosestSibling: isClosestSibling,
+ withClosestSiblings: withClosestSiblings,
nodeLength: nodeLength,
isLeftEdgePoint: isLeftEdgePoint,
isRightEdgePoint: isRightEdgePoint,
isEdgePoint: isEdgePoint,
isLeftEdgeOf: isLeftEdgeOf,
isRightEdgeOf: isRightEdgeOf,
+ isLeftEdgePointOf: isLeftEdgePointOf,
+ isRightEdgePointOf: isRightEdgePointOf,
prevPoint: prevPoint,
nextPoint: nextPoint,
isSamePoint: isSamePoint,
isVisiblePoint: isVisiblePoint,
prevPointUntil: prevPointUntil,
nextPointUntil: nextPointUntil,
+ isCharPoint: isCharPoint,
walkPoint: walkPoint,
ancestor: ancestor,
+ singleChildAncestor: singleChildAncestor,
listAncestor: listAncestor,
lastAncestor: lastAncestor,
listNext: listNext,
@@ -852,6 +1105,7 @@ define([
makeOffsetPath: makeOffsetPath,
fromOffsetPath: fromOffsetPath,
splitTree: splitTree,
+ splitPoint: splitPoint,
create: create,
createText: createText,
remove: remove,
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/func.js b/addons/web_editor/static/lib/summernote/src/js/core/func.js
index 1acb9f98e97..11bfdf546e0 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/func.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/func.js
@@ -1,6 +1,11 @@
define('summernote/core/func', function () {
/**
+ * @class core.func
+ *
* func utils (for high-order func's arg)
+ *
+ * @singleton
+ * @alternateClassName func
*/
var func = (function () {
var eq = function (itemA) {
@@ -93,6 +98,18 @@ define('summernote/core/func', function () {
return inverted;
};
+ /**
+ * @param {String} namespace
+ * @param {String} [prefix]
+ * @return {String}
+ */
+ var namespaceToCamel = function (namespace, prefix) {
+ prefix = prefix || '';
+ return prefix + namespace.split('.').map(function (name) {
+ return name.substring(0, 1).toUpperCase() + name.substring(1);
+ }).join('');
+ };
+
return {
eq: eq,
eq2: eq2,
@@ -104,7 +121,8 @@ define('summernote/core/func', function () {
and: and,
uniqueId: uniqueId,
rect2bnd: rect2bnd,
- invertObject: invertObject
+ invertObject: invertObject,
+ namespaceToCamel: namespaceToCamel
};
})();
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/key.js b/addons/web_editor/static/lib/summernote/src/js/core/key.js
index 80631125bfa..a17b2756328 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/key.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/key.js
@@ -1,49 +1,96 @@
define([
- 'summernote/core/list'
-], function (list) {
+ 'summernote/core/list',
+ 'summernote/core/func'
+], function (list, func) {
/**
+ * @class core.key
+ *
* Object for keycodes.
+ *
+ * @singleton
+ * @alternateClassName key
*/
- var key = {
- isEdit: function (keyCode) {
- return list.contains([8, 9, 13, 32], keyCode);
- },
- nameFromCode: {
- '8': 'BACKSPACE',
- '9': 'TAB',
- '13': 'ENTER',
- '32': 'SPACE',
+ var key = (function () {
+ var keyMap = {
+ 'BACKSPACE': 8,
+ 'TAB': 9,
+ 'ENTER': 13,
+ 'SPACE': 32,
+
+ // Arrow
+ 'LEFT': 37,
+ 'UP': 38,
+ 'RIGHT': 39,
+ 'DOWN': 40,
// Number: 0-9
- '48': 'NUM0',
- '49': 'NUM1',
- '50': 'NUM2',
- '51': 'NUM3',
- '52': 'NUM4',
- '53': 'NUM5',
- '54': 'NUM6',
- '55': 'NUM7',
- '56': 'NUM8',
+ 'NUM0': 48,
+ 'NUM1': 49,
+ 'NUM2': 50,
+ 'NUM3': 51,
+ 'NUM4': 52,
+ 'NUM5': 53,
+ 'NUM6': 54,
+ 'NUM7': 55,
+ 'NUM8': 56,
// Alphabet: a-z
- '66': 'B',
- '69': 'E',
- '73': 'I',
- '74': 'J',
- '75': 'K',
- '76': 'L',
- '82': 'R',
- '83': 'S',
- '85': 'U',
- '89': 'Y',
- '90': 'Z',
+ 'B': 66,
+ 'E': 69,
+ 'I': 73,
+ 'J': 74,
+ 'K': 75,
+ 'L': 76,
+ 'R': 82,
+ 'S': 83,
+ 'U': 85,
+ 'V': 86,
+ 'Y': 89,
+ 'Z': 90,
- '191': 'SLASH',
- '219': 'LEFTBRACKET',
- '220': 'BACKSLASH',
- '221': 'RIGHTBRACKET'
- }
- };
+ 'SLASH': 191,
+ 'LEFTBRACKET': 219,
+ 'BACKSLASH': 220,
+ 'RIGHTBRACKET': 221
+ };
+
+ return {
+ /**
+ * @method isEdit
+ *
+ * @param {Number} keyCode
+ * @return {Boolean}
+ */
+ isEdit: function (keyCode) {
+ return list.contains([
+ keyMap.BACKSPACE,
+ keyMap.TAB,
+ keyMap.ENTER,
+ keyMap.SPACe
+ ], keyCode);
+ },
+ /**
+ * @method isMove
+ *
+ * @param {Number} keyCode
+ * @return {Boolean}
+ */
+ isMove: function (keyCode) {
+ return list.contains([
+ keyMap.LEFT,
+ keyMap.UP,
+ keyMap.RIGHT,
+ keyMap.DOWN
+ ], keyCode);
+ },
+ /**
+ * @property {Object} nameFromCode
+ * @property {String} nameFromCode.8 "BACKSPACE"
+ */
+ nameFromCode: func.invertObject(keyMap),
+ code: keyMap
+ };
+ })();
return key;
});
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/list.js b/addons/web_editor/static/lib/summernote/src/js/core/list.js
index cc78781ea7f..2d6708838df 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/list.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/list.js
@@ -1,6 +1,11 @@
define(['summernote/core/func'], function (func) {
/**
+ * @class core.list
+ *
* list utils
+ *
+ * @singleton
+ * @alternateClassName list
*/
var list = (function () {
/**
@@ -63,11 +68,18 @@ define(['summernote/core/func'], function (func) {
return true;
};
+ /**
+ * returns index of item
+ */
+ var indexOf = function (array, item) {
+ return $.inArray(item, array);
+ };
+
/**
* returns true if the value is present in the list.
*/
var contains = function (array, item) {
- return $.inArray(item, array) !== -1;
+ return indexOf(array, item) !== -1;
};
/**
@@ -152,7 +164,7 @@ define(['summernote/core/func'], function (func) {
* @param {Array} array
*/
var next = function (array, item) {
- var idx = array.indexOf(item);
+ var idx = indexOf(array, item);
if (idx === -1) { return null; }
return array[idx + 1];
@@ -163,12 +175,11 @@ define(['summernote/core/func'], function (func) {
* @param {Array} array
*/
var prev = function (array, item) {
- var idx = array.indexOf(item);
+ var idx = indexOf(array, item);
if (idx === -1) { return null; }
return array[idx - 1];
};
-
return { head: head, last: last, initial: initial, tail: tail,
prev: prev, next: next, find: find, contains: contains,
diff --git a/addons/web_editor/static/lib/summernote/src/js/core/range.js b/addons/web_editor/static/lib/summernote/src/js/core/range.js
index 9611e09c72b..5c2dbe3b32c 100644
--- a/addons/web_editor/static/lib/summernote/src/js/core/range.js
+++ b/addons/web_editor/static/lib/summernote/src/js/core/range.js
@@ -5,13 +5,6 @@ define([
'summernote/core/dom'
], function (agent, func, list, dom) {
- /**
- * Data structure
- * - {BoundaryPoint}: a point of dom tree
- * - {BoundaryPoints}: two boundaryPoints corresponding to the start and the end of the Range
- *
- * @see http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html#Level-2-Range-Position
- */
var range = (function () {
/**
@@ -118,6 +111,7 @@ define([
/**
* Wrapped Range
*
+ * @constructor
* @param {Node} sc - start container
* @param {Number} so - start offset
* @param {Node} ec - end container
@@ -189,25 +183,48 @@ define([
} else {
nativeRng.select();
}
+
+ return this;
};
/**
* @return {WrappedRange}
*/
this.normalize = function () {
- var getVisiblePoint = function (point) {
- if (!dom.isVisiblePoint(point)) {
- if (dom.isLeftEdgePoint(point)) {
- point = dom.nextPointUntil(point, dom.isVisiblePoint);
- } else if (dom.isRightEdgePoint(point)) {
- point = dom.prevPointUntil(point, dom.isVisiblePoint);
- }
+
+ /**
+ * @param {BoundaryPoint} point
+ * @param {Boolean} isLeftToRight
+ * @return {BoundaryPoint}
+ */
+ var getVisiblePoint = function (point, isLeftToRight) {
+ if ((dom.isVisiblePoint(point) && !dom.isEdgePoint(point)) ||
+ (dom.isVisiblePoint(point) && dom.isRightEdgePoint(point) && !isLeftToRight) ||
+ (dom.isVisiblePoint(point) && dom.isLeftEdgePoint(point) && isLeftToRight) ||
+ (dom.isVisiblePoint(point) && dom.isBlock(point.node) && dom.isEmpty(point.node))) {
+ return point;
}
- return point;
+
+ // point on block's edge
+ var block = dom.ancestor(point.node, dom.isBlock);
+ if (((dom.isLeftEdgePointOf(point, block) || dom.isVoid(dom.prevPoint(point).node)) && !isLeftToRight) ||
+ ((dom.isRightEdgePointOf(point, block) || dom.isVoid(dom.nextPoint(point).node)) && isLeftToRight)) {
+
+ // returns point already on visible point
+ if (dom.isVisiblePoint(point)) {
+ return point;
+ }
+ // reverse direction
+ isLeftToRight = !isLeftToRight;
+ }
+
+ var nextPoint = isLeftToRight ? dom.nextPointUntil(dom.nextPoint(point), dom.isVisiblePoint) :
+ dom.prevPointUntil(dom.prevPoint(point), dom.isVisiblePoint);
+ return nextPoint || point;
};
- var startPoint = getVisiblePoint(this.getStartPoint());
- var endPoint = getVisiblePoint(this.getStartPoint());
+ var endPoint = getVisiblePoint(this.getEndPoint(), false);
+ var startPoint = this.isCollapsed() ? endPoint : getVisiblePoint(this.getStartPoint(), true);
return new WrappedRange(
startPoint.node,
@@ -353,42 +370,44 @@ define([
* delete contents on range
* @return {WrappedRange}
*/
- // this.deleteContents = function () {
- // if (this.isCollapsed()) {
- // return this;
- // }
+ if(_.isUndefined(this.deleteContents)) // ODOO: ability to override by prototype
+ this.deleteContents = function () {
+ if (this.isCollapsed()) {
+ return this;
+ }
- // var rng = this.splitText();
- // var nodes = rng.nodes(null, {
- // fullyContains: true
- // });
+ var rng = this.splitText();
+ var nodes = rng.nodes(null, {
+ fullyContains: true
+ });
- // var point = dom.prevPointUntil(rng.getStartPoint(), function (point) {
- // return !list.contains(nodes, point.node);
- // });
+ // find new cursor point
+ var point = dom.prevPointUntil(rng.getStartPoint(), function (point) {
+ return !list.contains(nodes, point.node);
+ });
- // var emptyParents = [];
- // $.each(nodes, function (idx, node) {
- // // find empty parents
- // var parent = node.parentNode;
- // if (point.node !== parent && dom.nodeLength(parent) === 1) {
- // emptyParents.push(parent);
- // }
- // dom.remove(node, false);
- // });
+ var emptyParents = [];
+ $.each(nodes, function (idx, node) {
+ // find empty parents
+ var parent = node.parentNode;
+ if (point.node !== parent && dom.nodeLength(parent) === 1) {
+ emptyParents.push(parent);
+ }
+ dom.remove(node, false);
+ });
- // // remove empty parents
- // $.each(emptyParents, function (idx, node) {
- // dom.remove(node, false);
- // });
+ // remove empty parents
+ $.each(emptyParents, function (idx, node) {
+ dom.remove(node, false);
+ });
- // return new WrappedRange(
- // point.node,
- // point.offset,
- // point.node,
- // point.offset
- // );
- // };
+ return new WrappedRange(
+ point.node,
+ point.offset,
+ point.node,
+ point.offset
+ ).normalize();
+ };
/**
* makeIsOn: return isOn(pred) function
@@ -408,36 +427,6 @@ define([
this.isOnAnchor = makeIsOn(dom.isAnchor);
// isOnAnchor: judge whether range is on cell node or not
this.isOnCell = makeIsOn(dom.isCell);
- // isOnAnchor: judge whether range is an image node or not
- this.isOnImg = function () {
- var nb = 0;
- var image;
- var startPoint = {node: sc.childNodes.length && sc.childNodes[so] || sc};
- startPoint.offset = startPoint.node === sc ? so : 0;
- var endPoint = {node: ec.childNodes.length && ec.childNodes[eo] || ec};
- endPoint.offset = endPoint.node === ec ? eo : 0;
-
- if (dom.isImg(startPoint.node)) {
- nb ++;
- image = startPoint.node;
- }
- dom.walkPoint(startPoint, endPoint, function (point) {
- if (!dom.isText(endPoint.node) && point.node === endPoint.node && point.offset === endPoint.offset) {
- return;
- }
- var node = point.node.childNodes.length && point.node.childNodes[point.offset] || point.node;
- var offset = node === point.node ? point.offset : 0;
- var isImg = dom.ancestor(node, dom.isImg);
- if (!isImg && ((!dom.isBR(node) && !dom.isText(node)) || (offset && node.textContent.length !== offset && node.textContent.match(/\S|\u00A0/)))) {
- nb++;
- }
- if (isImg && image !== isImg) {
- image = isImg;
- nb ++;
- }
- });
- return nb === 1 && image;
- };
/**
* @param {Function} pred
@@ -467,13 +456,20 @@ define([
this.wrapBodyInlineWithPara = function () {
if (dom.isBodyContainer(sc) && dom.isEmpty(sc)) {
sc.innerHTML = dom.emptyPara;
- return new WrappedRange(sc.firstChild, 0);
+ return new WrappedRange(sc.firstChild, 0, sc.firstChild, 0);
}
+ /**
+ * [workaround] firefox often create range on not visible point. so normalize here.
+ * - firefox: |text
|
+ * - chrome: |text|
+ */
+ var rng = this.normalize();
if (dom.isParaInline(sc) || dom.isPara(sc)) {
- return this.normalize();
+ return rng;
}
+ // ODOO: insert a p tag when try to insert a br with insertNode method, if the editor is inside a p, li, h1... (start_modification
// if apply the editor to a P, LI... or inside a P, LI...
if (dom.isText(sc)) {
var node = sc;
@@ -484,17 +480,18 @@ define([
}
}
}
+ // ODOO: end_modification)
// find inline top ancestor
var topAncestor;
- if (dom.isInline(sc)) {
- var ancestors = dom.listAncestor(sc, func.not(dom.isInline));
+ if (dom.isInline(rng.sc)) {
+ var ancestors = dom.listAncestor(rng.sc, func.not(dom.isInline));
topAncestor = list.last(ancestors);
if (!dom.isInline(topAncestor)) {
- topAncestor = ancestors[ancestors.length - 2] || sc.childNodes[so];
+ topAncestor = ancestors[ancestors.length - 2] || rng.sc.childNodes[rng.so];
}
} else {
- topAncestor = sc.childNodes[so - 1];
+ topAncestor = rng.sc.childNodes[rng.so > 0 ? rng.so - 1 : 0];
}
// siblings not in paragraph
@@ -514,52 +511,81 @@ define([
* insert node at current cursor
*
* @param {Node} node
- * @param {Boolean} [isInline]
* @return {Node}
*/
- this.insertNode = function (node, isInline) {
- var rng = this.wrapBodyInlineWithPara();
- var point = rng.getStartPoint();
+ this.insertNode = function (node) {
+ var rng = this.wrapBodyInlineWithPara().deleteContents();
+ // ODOO: override to not split world for inserting inline
+ // original: var info = dom.splitPoint(rng.getStartPoint(), dom.isInline(node));
+ var info = dom.splitPoint(rng.getStartPoint(), !dom.isBodyContainer(dom.ancestor(rng.sc, function(node) { return dom.isBodyContainer(node) || dom.isPara(node) })));
- var splitRoot, container, pivot;
- if (isInline) {
- container = dom.isPara(point.node) ? point.node : point.node.parentNode;
- if (dom.isPara(point.node)) {
- pivot = point.node.childNodes[point.offset];
- } else {
- pivot = dom.splitTree(point.node, point);
- }
+ if (info.rightNode) {
+ info.rightNode.parentNode.insertBefore(node, info.rightNode);
} else {
- // splitRoot will be childNode of container
- var ancestors = dom.listAncestor(point.node, dom.isBodyContainer);
- var topAncestor = list.last(ancestors) || point.node;
-
- if (dom.isBodyContainer(topAncestor)) {
- splitRoot = ancestors[ancestors.length - 2];
- container = topAncestor;
- } else {
- splitRoot = topAncestor;
- container = splitRoot.parentNode;
- }
- pivot = splitRoot && dom.splitTree(splitRoot, point);
- }
-
- if (pivot) {
- pivot.parentNode.insertBefore(node, pivot);
- } else {
- container.appendChild(node);
+ info.container.appendChild(node);
}
return node;
};
+
+ /**
+ * insert html at current cursor
+ */
+ this.pasteHTML = function (markup) {
+ var contentsContainer = $('').html(markup)[0];
+ var childNodes = list.from(contentsContainer.childNodes);
+
+ var rng = this.wrapBodyInlineWithPara().deleteContents();
+
+ return childNodes.reverse().map(function (childNode) {
+ return rng.insertNode(childNode);
+ }).reverse();
+ };
+ /**
+ * returns text in range
+ *
+ * @return {String}
+ */
this.toString = function () {
var nativeRng = nativeRange();
return agent.isW3CRangeSupport ? nativeRng.toString() : nativeRng.text;
};
+
+ /**
+ * returns range for word before cursor
+ *
+ * @param {Boolean} [findAfter] - find after cursor, default: false
+ * @return {WrappedRange}
+ */
+ this.getWordRange = function (findAfter) {
+ var endPoint = this.getEndPoint();
+
+ if (!dom.isCharPoint(endPoint)) {
+ return this;
+ }
+
+ var startPoint = dom.prevPointUntil(endPoint, function (point) {
+ return !dom.isCharPoint(point);
+ });
+
+ if (findAfter) {
+ endPoint = dom.nextPointUntil(endPoint, function (point) {
+ return !dom.isCharPoint(point);
+ });
+ }
+
+ return new WrappedRange(
+ startPoint.node,
+ startPoint.offset,
+ endPoint.node,
+ endPoint.offset
+ );
+ };
/**
* create offsetPath bookmark
+ *
* @param {Node} editable
*/
this.bookmark = function (editable) {
@@ -575,6 +601,24 @@ define([
};
};
+ /**
+ * create offsetPath bookmark base on paragraph
+ *
+ * @param {Node[]} paras
+ */
+ this.paraBookmark = function (paras) {
+ return {
+ s: {
+ path: list.tail(dom.makeOffsetPath(list.head(paras), sc)),
+ offset: so
+ },
+ e: {
+ path: list.tail(dom.makeOffsetPath(list.last(paras), ec)),
+ offset: eo
+ }
+ };
+ };
+
/**
* getClientRects
* @return {Rect[]}
@@ -584,30 +628,43 @@ define([
return nativeRng.getClientRects();
};
};
-
+
+ /**
+ * @class core.range
+ *
+ * Data structure
+ * * BoundaryPoint: a point of dom tree
+ * * BoundaryPoints: two boundaryPoints corresponding to the start and the end of the Range
+ *
+ * See to http://www.w3.org/TR/DOM-Level-2-Traversal-Range/ranges.html#Level-2-Range-Position
+ *
+ * @singleton
+ * @alternateClassName range
+ */
return {
-
- WrappedRange: WrappedRange, // odoo change for overwrite
-
+ WrappedRange: WrappedRange, // ODOO: give access to WrappedRange
/**
+ * @method
+ *
* create Range Object From arguments or Browser Selection
*
* @param {Node} sc - start container
* @param {Number} so - start offset
* @param {Node} ec - end container
* @param {Number} eo - end offset
+ * @return {WrappedRange}
*/
create : function (sc, so, ec, eo) {
if (!arguments.length) { // from Browser Selection
if (agent.isW3CRangeSupport) {
var selection = document.getSelection();
- if (selection.rangeCount === 0) {
+ if (!selection || selection.rangeCount === 0) {
return null;
} else if (dom.isBody(selection.anchorNode)) {
// Firefox: returns entire body as range on initialization. We won't never need it.
return null;
}
-
+
var nativeRng = selection.getRangeAt(0);
sc = nativeRng.startContainer;
so = nativeRng.startOffset;
@@ -635,7 +692,6 @@ define([
ec = endPoint.cont;
eo = endPoint.offset;
}
-
} else if (arguments.length === 2) { //collapsed
ec = sc;
eo = so;
@@ -644,6 +700,8 @@ define([
},
/**
+ * @method
+ *
* create WrappedRange from node
*
* @param {Node} node
@@ -657,13 +715,13 @@ define([
// browsers can't target a picture or void node
if (dom.isVoid(sc)) {
- so = dom.listPrev(sc).length-1;
+ so = dom.listPrev(sc).length - 1;
sc = sc.parentNode;
}
if (dom.isBR(ec)) {
- eo = dom.listPrev(ec).length-1;
+ eo = dom.listPrev(ec).length - 1;
ec = ec.parentNode;
- } else if (dom.isVoid(ec) || dom.isImg(sc)) {
+ } else if (dom.isVoid(ec)) {
eo = dom.listPrev(ec).length;
ec = ec.parentNode;
}
@@ -672,10 +730,32 @@ define([
},
/**
- * create WrappedRange from Bookmark
+ * create WrappedRange from node after position
+ *
+ * @param {Node} node
+ * @return {WrappedRange}
+ */
+ createFromNodeBefore: function (node) {
+ return this.createFromNode(node).collapse(true);
+ },
+
+ /**
+ * create WrappedRange from node after position
+ *
+ * @param {Node} node
+ * @return {WrappedRange}
+ */
+ createFromNodeAfter: function (node) {
+ return this.createFromNode(node).collapse();
+ },
+
+ /**
+ * @method
+ *
+ * create WrappedRange from bookmark
*
* @param {Node} editable
- * @param {Obkect} bookmark
+ * @param {Object} bookmark
* @return {WrappedRange}
*/
createFromBookmark : function (editable, bookmark) {
@@ -683,6 +763,24 @@ define([
var so = bookmark.s.offset;
var ec = dom.fromOffsetPath(editable, bookmark.e.path);
var eo = bookmark.e.offset;
+ return new WrappedRange(sc, so, ec, eo);
+ },
+
+ /**
+ * @method
+ *
+ * create WrappedRange from paraBookmark
+ *
+ * @param {Object} bookmark
+ * @param {Node[]} paras
+ * @return {WrappedRange}
+ */
+ createFromParaBookmark: function (bookmark, paras) {
+ var so = bookmark.s.offset;
+ var eo = bookmark.e.offset;
+ var sc = dom.fromOffsetPath(list.head(paras), bookmark.s.path);
+ var ec = dom.fromOffsetPath(list.last(paras), bookmark.e.path);
+
return new WrappedRange(sc, so, ec, eo);
}
};
diff --git a/addons/web_editor/static/lib/summernote/src/js/editing/Bullet.js b/addons/web_editor/static/lib/summernote/src/js/editing/Bullet.js
index d0b0f2e9169..6a115edaa90 100644
--- a/addons/web_editor/static/lib/summernote/src/js/editing/Bullet.js
+++ b/addons/web_editor/static/lib/summernote/src/js/editing/Bullet.js
@@ -5,9 +5,17 @@ define([
'summernote/core/range'
], function (list, func, dom, range) {
+ /**
+ * @class editing.Bullet
+ *
+ * @alternateClassName Bullet
+ */
var Bullet = function () {
/**
+ * @method insertOrderedList
+ *
* toggle ordered list
+ *
* @type command
*/
this.insertOrderedList = function () {
@@ -15,7 +23,10 @@ define([
};
/**
+ * @method insertUnorderedList
+ *
* toggle unordered list
+ *
* @type command
*/
this.insertUnorderedList = function () {
@@ -23,7 +34,10 @@ define([
};
/**
+ * @method indent
+ *
* indent
+ *
* @type command
*/
this.indent = function () {
@@ -50,7 +64,10 @@ define([
};
/**
+ * @method outdent
+ *
* outdent
+ *
* @type command
*/
this.outdent = function () {
@@ -78,7 +95,10 @@ define([
};
/**
+ * @method toggleList
+ *
* toggle list
+ *
* @param {String} listName - OL or UL
*/
this.toggleList = function (listName) {
@@ -86,13 +106,16 @@ define([
var rng = range.create().wrapBodyInlineWithPara();
var paras = rng.nodes(dom.isPara, { includeAncestor: true });
+ var bookmark = rng.paraBookmark(paras);
var clustereds = list.clusterBy(paras, func.peq2('parentNode'));
// paragraph to list
if (list.find(paras, dom.isPurePara)) {
+ var wrappedParas = [];
$.each(clustereds, function (idx, paras) {
- self.wrapList(paras, listName);
+ wrappedParas = wrappedParas.concat(self.wrapList(paras, listName));
});
+ paras = wrappedParas;
// list to paragraph or change list style
} else {
var diffLists = rng.nodes(dom.isList, {
@@ -106,16 +129,19 @@ define([
dom.replace(listNode, listName);
});
} else {
- this.releaseList(clustereds, true);
+ paras = this.releaseList(clustereds, true);
}
}
- rng.select();
+ range.createFromParaBookmark(bookmark, paras).select();
};
/**
+ * @method wrapList
+ *
* @param {Node[]} paras
* @param {String} listName
+ * @return {Node[]}
*/
this.wrapList = function (paras, listName) {
var head = list.head(paras);
@@ -127,7 +153,7 @@ define([
var listNode = prevList || dom.insertAfter(dom.create(listName || 'UL'), last);
// P to LI
- paras = $.map(paras, function (para) {
+ paras = paras.map(function (para) {
return dom.isPurePara(para) ? dom.replace(para, 'LI') : para;
});
@@ -138,9 +164,13 @@ define([
dom.appendChildNodes(listNode, list.from(nextList.childNodes));
dom.remove(nextList);
}
+
+ return paras;
};
/**
+ * @method releaseList
+ *
* @param {Array[]} clustereds
* @param {Boolean} isEscapseToBody
* @return {Node[]}
@@ -157,19 +187,23 @@ define([
var lastList = headList.childNodes.length > 1 ? dom.splitTree(headList, {
node: last.parentNode,
offset: dom.position(last) + 1
- }, true) : null;
+ }, {
+ isSkipPaddingBlankHTML: true
+ }) : null;
var middleList = dom.splitTree(headList, {
node: head.parentNode,
offset: dom.position(head)
- }, true);
+ }, {
+ isSkipPaddingBlankHTML: true
+ });
paras = isEscapseToBody ? dom.listDescendant(middleList, dom.isLi) :
list.from(middleList.childNodes).filter(dom.isLi);
// LI to P
if (isEscapseToBody || !dom.isList(headList.parentNode)) {
- paras = $.map(paras, function (para) {
+ paras = paras.map(function (para) {
return dom.replace(para, 'P');
});
}
diff --git a/addons/web_editor/static/lib/summernote/src/js/editing/Editor.js b/addons/web_editor/static/lib/summernote/src/js/editing/Editor.js
index 1acd957096d..732072b5d24 100644
--- a/addons/web_editor/static/lib/summernote/src/js/editing/Editor.js
+++ b/addons/web_editor/static/lib/summernote/src/js/editing/Editor.js
@@ -11,46 +11,70 @@ define([
'summernote/editing/Bullet'
], function (agent, func, list, dom, range, async,
Style, Typing, Table, Bullet) {
- /**
- * Editor
- * @class
- */
- var Editor = function () {
+ var KEY_BOGUS = 'bogus';
+
+ /**
+ * @class editing.Editor
+ *
+ * Editor
+ *
+ */
+ var Editor = function (handler) {
+
+ var self = this;
var style = new Style();
var table = new Table();
var typing = new Typing();
var bullet = new Bullet();
- this.style = style; // odoo change for overwrite
- this.table = table; // odoo change for overwrite
- this.typing = typing; // odoo change for overwrite
- this.bullet = bullet; // odoo change for overwrite
+ this.style = style; // ODOO: allow access for override
+ this.table = table; // ODOO: allow access for override
+ this.typing = typing; // ODOO: allow access for override
+ this.bullet = bullet; // ODOO: allow access for override
/**
+ * @method createRange
+ *
* create range
+ *
+ * @param {jQuery} $editable
+ * @return {WrappedRange}
*/
this.createRange = function ($editable) {
- $editable.focus();
+ this.focus($editable);
return range.create();
};
/**
+ * @method saveRange
+ *
* save current range
*
* @param {jQuery} $editable
+ * @param {Boolean} [thenCollapse=false]
*/
this.saveRange = function ($editable, thenCollapse) {
+ // ODOO: scroll to top when click on input in editable m (start_modification
+ // this.focus($editable);
var r = range.create();
if (!r || ($editable[0] !== r.sc && !$.contains($editable[0], r.sc))) {
$editable.focus();
}
+ // ODOO: end_modication)
$editable.data('range', range.create());
if (thenCollapse) {
range.create().collapse().select();
}
};
+ /**
+ * @method saveRange
+ *
+ * save current node list to $editable.data('childNodes')
+ *
+ * @param {jQuery} $editable
+ */
this.saveNode = function ($editable) {
// copy child node reference
var copy = [];
@@ -61,6 +85,8 @@ define([
};
/**
+ * @method restoreRange
+ *
* restore lately range
*
* @param {jQuery} $editable
@@ -69,10 +95,17 @@ define([
var rng = $editable.data('range');
if (rng) {
rng.select();
- $editable.focus();
+ this.focus($editable);
}
};
+ /**
+ * @method restoreNode
+ *
+ * restore lately node list
+ *
+ * @param {jQuery} $editable
+ */
this.restoreNode = function ($editable) {
$editable.html('');
var child = $editable.data('childNodes');
@@ -80,106 +113,271 @@ define([
$editable[0].appendChild(child[index]);
}
};
+
/**
+ * @method currentStyle
+ *
* current style
+ *
+ * @param {Node} target
+ * @return {Object|Boolean} unfocus
*/
- this.currentStyle = function () {
+ this.currentStyle = function (target) {
var rng = range.create();
- return rng ? rng.isOnEditable() && style.current(rng) : false;
- };
-
- var triggerOnChange = this.triggerOnChange = function ($editable) {
- var onChange = $editable.data('callbacks').onChange;
- if (onChange) {
- onChange($editable.html(), $editable);
+ var styleInfo = rng && rng.isOnEditable() ? style.current(rng.normalize()) : {};
+ if (dom.isImg(target)) {
+ styleInfo.image = target;
}
+ return styleInfo;
};
/**
+ * style from node
+ *
+ * @param {jQuery} $node
+ * @return {Object}
+ */
+ this.styleFromNode = function ($node) {
+ return style.fromNode($node);
+ };
+
+ var triggerOnBeforeChange = function ($editable) {
+ var $holder = dom.makeLayoutInfo($editable).holder();
+ handler.bindCustomEvent(
+ $holder, $editable.data('callbacks'), 'before.command'
+ )($editable.html(), $editable);
+ };
+
+ var triggerOnChange = function ($editable) {
+ var $holder = dom.makeLayoutInfo($editable).holder();
+ handler.bindCustomEvent(
+ $holder, $editable.data('callbacks'), 'change'
+ )($editable.html(), $editable);
+ };
+
+ /**
+ * @method undo
* undo
* @param {jQuery} $editable
*/
this.undo = function ($editable) {
+ triggerOnBeforeChange($editable);
$editable.data('NoteHistory').undo();
triggerOnChange($editable);
};
/**
+ * @method redo
* redo
* @param {jQuery} $editable
*/
this.redo = function ($editable) {
+ triggerOnBeforeChange($editable);
$editable.data('NoteHistory').redo();
triggerOnChange($editable);
};
/**
- * after command
+ * @method beforeCommand
+ * before command
* @param {jQuery} $editable
*/
- var afterCommand = this.afterCommand = function ($editable) {
- $editable.data('NoteHistory').recordUndo();
- triggerOnChange($editable);
+ var beforeCommand = this.beforeCommand = function ($editable) {
+ triggerOnBeforeChange($editable);
+ // keep focus on editable before command execution
+ self.focus($editable);
};
+ /**
+ * @method afterCommand
+ * after command
+ * @param {jQuery} $editable
+ * @param {Boolean} isPreventTrigger
+ */
+ var afterCommand = this.afterCommand = function ($editable, isPreventTrigger) {
+ $editable.data('NoteHistory').recordUndo();
+ if (!isPreventTrigger) {
+ triggerOnChange($editable);
+ }
+ };
+
+ /**
+ * @method bold
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method italic
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method underline
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method strikethrough
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method formatBlock
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method superscript
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method subscript
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method justifyLeft
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method justifyCenter
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method justifyRight
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method justifyFull
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method formatBlock
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method removeFormat
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method backColor
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method foreColor
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method insertHorizontalRule
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
+ /**
+ * @method fontName
+ *
+ * change font name
+ *
+ * @param {jQuery} $editable
+ * @param {Mixed} value
+ */
+
/* jshint ignore:start */
// native commands(with execCommand), generate function for execCommand
var commands = ['bold', 'italic', 'underline', 'strikethrough', 'superscript', 'subscript',
'justifyLeft', 'justifyCenter', 'justifyRight', 'justifyFull',
'formatBlock', 'removeFormat',
- 'backColor', 'foreColor', 'insertHorizontalRule', 'fontName'];
+ 'backColor', 'foreColor', 'fontName'];
for (var idx = 0, len = commands.length; idx < len; idx ++) {
this[commands[idx]] = (function (sCmd) {
return function ($editable, value) {
+ beforeCommand($editable);
+
document.execCommand(sCmd, false, value);
- afterCommand($editable);
+ afterCommand($editable, true);
};
})(commands[idx]);
}
/* jshint ignore:end */
/**
+ * @method tab
+ *
* handle tab key
*
* @param {jQuery} $editable
* @param {Object} options
*/
this.tab = function ($editable, options) {
- var rng = range.create();
+ var rng = this.createRange($editable);
if (rng.isCollapsed() && rng.isOnCell()) {
table.tab(rng);
} else {
+ beforeCommand($editable);
typing.insertTab($editable, rng, options.tabsize);
afterCommand($editable);
}
};
/**
+ * @method untab
+ *
* handle shift+tab key
+ *
*/
- this.untab = function () {
- var rng = range.create();
+ this.untab = function ($editable) {
+ var rng = this.createRange($editable);
if (rng.isCollapsed() && rng.isOnCell()) {
table.tab(rng, true);
}
};
/**
+ * @method insertParagraph
+ *
* insert paragraph
*
* @param {Node} $editable
*/
this.insertParagraph = function ($editable) {
+ beforeCommand($editable);
typing.insertParagraph($editable);
afterCommand($editable);
};
/**
+ * @method insertOrderedList
+ *
* @param {jQuery} $editable
*/
this.insertOrderedList = function ($editable) {
+ beforeCommand($editable);
bullet.insertOrderedList($editable);
afterCommand($editable);
};
@@ -188,6 +386,7 @@ define([
* @param {jQuery} $editable
*/
this.insertUnorderedList = function ($editable) {
+ beforeCommand($editable);
bullet.insertUnorderedList($editable);
afterCommand($editable);
};
@@ -196,6 +395,7 @@ define([
* @param {jQuery} $editable
*/
this.indent = function ($editable) {
+ beforeCommand($editable);
bullet.indent($editable);
afterCommand($editable);
};
@@ -204,6 +404,7 @@ define([
* @param {jQuery} $editable
*/
this.outdent = function ($editable) {
+ beforeCommand($editable);
bullet.outdent($editable);
afterCommand($editable);
};
@@ -216,28 +417,32 @@ define([
*/
this.insertImage = function ($editable, sUrl, filename) {
async.createImage(sUrl, filename).then(function ($image) {
+ beforeCommand($editable);
$image.css({
display: '',
width: Math.min($editable.width(), $image.width())
});
range.create().insertNode($image[0]);
+ range.createFromNodeAfter($image[0]).select();
afterCommand($editable);
}).fail(function () {
- var callbacks = $editable.data('callbacks');
- if (callbacks.onImageUploadError) {
- callbacks.onImageUploadError();
- }
+ var $holder = dom.makeLayoutInfo($editable).holder();
+ handler.bindCustomEvent(
+ $holder, $editable.data('callbacks'), 'image.upload.error'
+ )();
});
};
/**
+ * @method insertNode
* insert node
* @param {Node} $editable
* @param {Node} node
- * @param {Boolean} [isInline]
*/
- this.insertNode = function ($editable, node, isInline) {
- range.create().insertNode(node, isInline);
+ this.insertNode = function ($editable, node) {
+ beforeCommand($editable);
+ range.create().insertNode(node);
+ range.createFromNodeAfter(node).select();
afterCommand($editable);
};
@@ -247,11 +452,24 @@ define([
* @param {String} text
*/
this.insertText = function ($editable, text) {
- var textNode = this.createRange($editable).insertNode(dom.createText(text), true);
+ beforeCommand($editable);
+ var textNode = range.create().insertNode(dom.createText(text));
range.create(textNode, dom.nodeLength(textNode)).select();
afterCommand($editable);
};
+ /**
+ * paste HTML
+ * @param {Node} $editable
+ * @param {String} markup
+ */
+ this.pasteHTML = function ($editable, markup) {
+ beforeCommand($editable);
+ var contents = range.create().pasteHTML(markup);
+ range.createFromNodeAfter(list.last(contents)).select();
+ afterCommand($editable);
+ };
+
/**
* formatBlock
*
@@ -259,12 +477,15 @@ define([
* @param {String} tagName
*/
this.formatBlock = function ($editable, tagName) {
+ beforeCommand($editable);
+ // [workaround] for MSIE, IE need `<`
tagName = agent.isMSIE ? '<' + tagName + '>' : tagName;
document.execCommand('FormatBlock', false, tagName);
afterCommand($editable);
};
this.formatPara = function ($editable) {
+ beforeCommand($editable);
this.formatBlock($editable, 'P');
afterCommand($editable);
};
@@ -280,33 +501,84 @@ define([
/* jshint ignore:end */
/**
- * fontsize
- * FIXME: Still buggy
+ * fontSize
*
* @param {jQuery} $editable
* @param {String} value - px
*/
this.fontSize = function ($editable, value) {
- document.execCommand('fontSize', false, 3);
- if (agent.isFF) {
- // firefox: to , buggy
- $editable.find('font[size=3]').removeAttr('size').css('font-size', value + 'px');
+ var rng = range.create();
+
+ if (rng.isCollapsed()) {
+ var spans = style.styleNodes(rng);
+ var firstSpan = list.head(spans);
+
+ $(spans).css({
+ 'font-size': value + 'px'
+ });
+
+ // [workaround] added styled bogus span for style
+ // - also bogus character needed for cursor position
+ if (firstSpan && !dom.nodeLength(firstSpan)) {
+ firstSpan.innerHTML = dom.ZERO_WIDTH_NBSP_CHAR;
+ range.createFromNodeAfter(firstSpan.firstChild).select();
+ $editable.data(KEY_BOGUS, firstSpan);
+ }
} else {
- // chrome: to
- $editable.find('span').filter(function () {
- return this.style.fontSize === 'medium';
- }).css('font-size', value + 'px');
+ beforeCommand($editable);
+ $(style.styleNodes(rng)).css({
+ 'font-size': value + 'px'
+ });
+ afterCommand($editable);
+ }
+ };
+
+ /**
+ * insert horizontal rule
+ * @param {jQuery} $editable
+ */
+ this.insertHorizontalRule = function ($editable) {
+ beforeCommand($editable);
+
+ var rng = range.create();
+ var hrNode = rng.insertNode($('
')[0]);
+ if (hrNode.nextSibling) {
+ range.create(hrNode.nextSibling, 0).normalize().select();
}
afterCommand($editable);
};
+ /**
+ * remove bogus node and character
+ */
+ this.removeBogus = function ($editable) {
+ var bogusNode = $editable.data(KEY_BOGUS);
+ if (!bogusNode) {
+ return;
+ }
+
+ var textNode = list.find(list.from(bogusNode.childNodes), dom.isText);
+
+ var bogusCharIdx = textNode.nodeValue.indexOf(dom.ZERO_WIDTH_NBSP_CHAR);
+ if (bogusCharIdx !== -1) {
+ textNode.deleteData(bogusCharIdx, 1);
+ }
+
+ if (dom.isEmpty(bogusNode)) {
+ dom.remove(bogusNode);
+ }
+
+ $editable.removeData(KEY_BOGUS);
+ };
+
/**
* lineHeight
* @param {jQuery} $editable
* @param {String} value
*/
this.lineHeight = function ($editable, value) {
+ beforeCommand($editable);
style.stylePara(range.create(), {
lineHeight: value
});
@@ -321,21 +593,20 @@ define([
* @param {jQuery} $editable
*/
this.unlink = function ($editable) {
- var rng = range.create();
+ var rng = this.createRange($editable);
if (rng.isOnAnchor()) {
var anchor = dom.ancestor(rng.sc, dom.isAnchor);
rng = range.createFromNode(anchor);
rng.select();
- document.execCommand('unlink');
+ beforeCommand($editable);
+ document.execCommand('unlink');
afterCommand($editable);
}
};
/**
- * create link
- *
- * @type command
+ * create link (command)
*
* @param {jQuery} $editable
* @param {Object} linkInfo
@@ -344,28 +615,54 @@ define([
this.createLink = function ($editable, linkInfo, options) {
var linkUrl = linkInfo.url;
var linkText = linkInfo.text;
- var isNewWindow = linkInfo.newWindow;
- var className = linkInfo.className || null;
- var rng = linkInfo.range;
+ var isNewWindow = linkInfo.isNewWindow;
+ var className = linkInfo.className || null; // ODOO: addition
+ var rng = linkInfo.range || this.createRange($editable);
+ var isTextChanged = rng.toString() !== linkText;
+
+ options = options || dom.makeLayoutInfo($editable).editor().data('options');
+
+ beforeCommand($editable);
if (options.onCreateLink) {
linkUrl = options.onCreateLink(linkUrl);
}
- rng = rng.deleteContents(true);
- var anchor = dom.ancestor(rng.sc, dom.isAnchor);
-
- // Create a new link when there is no anchor on range.
- if (!anchor) {
- anchor = rng.insertNode($('' + linkText + '')[0], true);
+ var anchors = [];
+ if (isTextChanged) {
+ // Create a new link when text changed.
+ var anchor = rng.insertNode($('' + linkText + '')[0]);
+ anchors.push(anchor);
+ } else {
+ anchors = style.styleNodes(rng, {
+ nodeName: 'A',
+ expandClosestSibling: true,
+ onlyPartialContains: true
+ });
}
- $(anchor).html(linkText).attr({
- 'href': linkUrl,
- 'target': isNewWindow ? '_blank' : null,
- 'class': className
+
+ $.each(anchors, function (idx, anchor) {
+ $(anchor).attr('href', linkUrl);
+ $(anchor).attr('class', className); // ODOO: addition
+ if (isNewWindow) {
+ $(anchor).attr('target', '_blank');
+ } else {
+ $(anchor).removeAttr('target');
+ }
});
- range.createFromNode(anchor).select();
+ var startRange = range.createFromNodeBefore(list.head(anchors));
+ var startPoint = startRange.getStartPoint();
+ var endRange = range.createFromNodeAfter(list.last(anchors));
+ var endPoint = endRange.getEndPoint();
+
+ range.create(
+ startPoint.node,
+ startPoint.offset,
+ endPoint.node,
+ endPoint.offset
+ ).select();
+
afterCommand($editable);
};
@@ -373,9 +670,13 @@ define([
* returns link info
*
* @return {Object}
+ * @return {WrappedRange} return.range
+ * @return {String} return.text
+ * @return {Boolean} [return.isNewWindow=true]
+ * @return {String} [return.url=""]
*/
this.getLinkInfo = function ($editable) {
- $editable.focus();
+ this.focus($editable);
var rng = range.create().expand(dom.isAnchor);
@@ -385,50 +686,76 @@ define([
return {
range: rng,
text: rng.toString(),
- isNewWindow: $anchor.length ? $anchor.attr('target') === '_blank' : true,
+ isNewWindow: $anchor.length ? $anchor.attr('target') === '_blank' : false,
url: $anchor.length ? $anchor.attr('href') : ''
};
};
+ /**
+ * setting color
+ *
+ * @param {Node} $editable
+ * @param {Object} sObjColor color code
+ * @param {String} sObjColor.foreColor foreground color
+ * @param {String} sObjColor.backColor background color
+ */
this.color = function ($editable, sObjColor) {
var oColor = JSON.parse(sObjColor);
var foreColor = oColor.foreColor, backColor = oColor.backColor;
+ beforeCommand($editable);
+
if (foreColor) { document.execCommand('foreColor', false, foreColor); }
if (backColor) { document.execCommand('backColor', false, backColor); }
afterCommand($editable);
};
+ /**
+ * insert Table
+ *
+ * @param {Node} $editable
+ * @param {String} sDim dimension of table (ex : "5x5")
+ */
this.insertTable = function ($editable, sDim) {
var dimension = sDim.split('x');
- var rng = range.create();
- rng = rng.deleteContents();
+ beforeCommand($editable);
+
+ var rng = range.create().deleteContents();
rng.insertNode(table.createTable(dimension[0], dimension[1]));
afterCommand($editable);
};
/**
- * @return {Node} image from the current range selection
- */
- function getImgTarget () {
- var rng = range.create();
- var target = rng.sc.childNodes.length && rng.sc.childNodes[rng.so] || rng.sc;
- return target;
- }
-
- /**
+ * float me
+ *
* @param {jQuery} $editable
* @param {String} value
+ * @param {jQuery} $target
*/
- this.floatMe = function ($editable, value) {
- var $target = $( getImgTarget() );
+ this.floatMe = function ($editable, value, $target) {
+ beforeCommand($editable);
+ // bootstrap
+ $target.removeClass('pull-left pull-right');
+ if (value && value !== 'none') {
+ $target.addClass('pull-' + value);
+ }
+
+ // fallback for non-bootstrap
$target.css('float', value);
afterCommand($editable);
};
- this.imageShape = function ($editable, value) {
- var $target = $( getImgTarget() );
+ /**
+ * change image shape
+ *
+ * @param {jQuery} $editable
+ * @param {String} value css class
+ * @param {Node} $target
+ */
+ this.imageShape = function ($editable, value, $target) {
+ beforeCommand($editable);
+
$target.removeClass('img-rounded img-circle img-thumbnail');
if (value) {
@@ -442,9 +769,11 @@ define([
* resize overlay element
* @param {jQuery} $editable
* @param {String} value
+ * @param {jQuery} $target - target element
*/
- this.resize = function ($editable, value) {
- var $target = $( getImgTarget() );
+ this.resize = function ($editable, value, $target) {
+ beforeCommand($editable);
+
$target.css({
width: value * 100 + '%',
height: ''
@@ -482,13 +811,50 @@ define([
*
* @param {jQuery} $editable
* @param {String} value - dummy argument (for keep interface)
+ * @param {jQuery} $target - target element
*/
- this.removeMedia = function ($editable, value) {
- var $target = $( getImgTarget() );
+ this.removeMedia = function ($editable, value, $target) {
+ beforeCommand($editable);
$target.detach();
+ handler.bindCustomEvent(
+ $(), $editable.data('callbacks'), 'media.delete'
+ )($target, $editable);
+
afterCommand($editable);
};
+
+ /**
+ * set focus
+ *
+ * @param $editable
+ */
+ this.focus = function ($editable) {
+ $editable.focus();
+
+ // [workaround] for firefox bug http://goo.gl/lVfAaI
+ if (agent.isFF) {
+ var rng = range.create();
+ if (!rng || rng.isOnEditable()) {
+ return;
+ }
+
+ range.createFromNode($editable[0])
+ .normalize()
+ .collapse()
+ .select();
+ }
+ };
+
+ /**
+ * returns whether contents is empty or not.
+ *
+ * @param {jQuery} $editable
+ * @return {Boolean}
+ */
+ this.isEmpty = function ($editable) {
+ return dom.isEmpty($editable[0]) || dom.emptyPara === $editable.html();
+ };
};
return Editor;
diff --git a/addons/web_editor/static/lib/summernote/src/js/editing/History.js b/addons/web_editor/static/lib/summernote/src/js/editing/History.js
index dc301bf957b..2cc946488c2 100644
--- a/addons/web_editor/static/lib/summernote/src/js/editing/History.js
+++ b/addons/web_editor/static/lib/summernote/src/js/editing/History.js
@@ -1,10 +1,12 @@
-define(['summernote/core/range', 'summernote/core/dom'], function (range, dom) {
+define(['summernote/core/range', 'summernote/core/dom'], function (range, dom) { // ODOO: suggest upstream
/**
- * History
- * @class
+ * @class editing.History
+ *
+ * Editor History
+ *
*/
var History = function ($editable) {
- var stack = [], stackOffset = -1, hasUndo = false;
+ var stack = [], stackOffset = -1;
var editable = $editable[0];
var makeSnapshot = function () {
@@ -14,6 +16,7 @@ define(['summernote/core/range', 'summernote/core/dom'], function (range, dom) {
return {
contents: $editable.html(),
bookmark: (rng && dom.ancestor(rng.sc, dom.isEditable) ? rng.bookmark(editable) : emptyBookmark)
+ // ODOO: suggest upstream added " && dom.ancestor(rng.sc, dom.isEditable) "
};
};
@@ -26,21 +29,29 @@ define(['summernote/core/range', 'summernote/core/dom'], function (range, dom) {
}
};
+ /**
+ * undo
+ */
this.undo = function () {
- if (0 < stackOffset || (stack.length - 1 === stackOffset && hasUndo)) {
- if (stack.length - 1 === stackOffset) {
- this.recordUndo();
- }
+ // Create snap shot if not yet recorded
+ if ($editable.html() !== stack[stackOffset].contents) {
+ this.recordUndo();
+ }
+
+ if (0 < stackOffset) {
stackOffset--;
applySnapshot(stack[stackOffset]);
- hasUndo = !!stackOffset;
}
};
+ /* ODOO: to suggest upstream */
this.hasUndo = function () {
- return 0 < stackOffset || hasUndo;
+ return 0 < stackOffset;
};
+ /**
+ * redo
+ */
this.redo = function () {
if (stack.length - 1 > stackOffset) {
stackOffset++;
@@ -48,12 +59,17 @@ define(['summernote/core/range', 'summernote/core/dom'], function (range, dom) {
}
};
+ /* ODOO: to suggest upstream */
this.hasRedo = function () {
return stack.length - 1 > stackOffset;
};
- var last;
+ var last; // ODOO: to suggest upstream (since we may have several editor)
+ /**
+ * recorded undo
+ */
this.recordUndo = function () {
+ // ODOO: method totally rewritten
// test event for firefox: remove stack of history because event doesn't exists
var key = typeof event !== 'undefined' ? event : false;
if (key && !event.metaKey && !event.ctrlKey && !event.altKey && event.type === "keydown") {
@@ -79,13 +95,14 @@ define(['summernote/core/range', 'summernote/core/dom'], function (range, dom) {
// Create new snapshot and push it to the end
stack.push(makeSnapshot());
- return true;
};
+ /* ODOO: to suggest upstream */
this.splitNext = function () {
last = false;
};
+ /* ODOO: to suggest upstream */
this.reset = function () {
last = false;
stack = [];
diff --git a/addons/web_editor/static/lib/summernote/src/js/editing/Style.js b/addons/web_editor/static/lib/summernote/src/js/editing/Style.js
index 835d575be1b..bf749cd817b 100644
--- a/addons/web_editor/static/lib/summernote/src/js/editing/Style.js
+++ b/addons/web_editor/static/lib/summernote/src/js/editing/Style.js
@@ -1,20 +1,28 @@
define([
'summernote/core/agent',
+ 'summernote/core/func',
+ 'summernote/core/list',
'summernote/core/dom'
-], function (agent, dom) {
+], function (agent, func, list, dom) {
/**
+ * @class editing.Style
+ *
* Style
- * @class
+ *
*/
var Style = function () {
/**
+ * @method jQueryCSS
+ *
+ * [workaround] for old jQuery
* passing an array of style properties to .css()
* will result in an object of property-value pairs.
* (compability with version < 1.9)
*
+ * @private
* @param {jQuery} $obj
* @param {Array} propertyNames - An array of one or more CSS properties.
- * @returns {Object}
+ * @return {Object}
*/
var jQueryCSS = function ($obj, propertyNames) {
if (agent.jqueryVersion < 1.9) {
@@ -27,6 +35,19 @@ define([
return $obj.css.call($obj, propertyNames);
};
+ /**
+ * returns style object from node
+ *
+ * @param {jQuery} $node
+ * @return {Object}
+ */
+ this.fromNode = function ($node) {
+ var properties = ['font-family', 'font-size', 'text-align', 'list-style-type', 'line-height'];
+ var styleInfo = jQueryCSS($node, properties) || {};
+ styleInfo['font-size'] = parseInt(styleInfo['font-size'], 10);
+ return styleInfo;
+ };
+
/**
* paragraph level style
*
@@ -41,6 +62,58 @@ define([
});
};
+ /**
+ * insert and returns styleNodes on range.
+ *
+ * @param {WrappedRange} rng
+ * @param {Object} [options] - options for styleNodes
+ * @param {String} [options.nodeName] - default: `SPAN`
+ * @param {Boolean} [options.expandClosestSibling] - default: `false`
+ * @param {Boolean} [options.onlyPartialContains] - default: `false`
+ * @return {Node[]}
+ */
+ this.styleNodes = function (rng, options) {
+ rng = rng.splitText();
+
+ var nodeName = options && options.nodeName || 'SPAN';
+ var expandClosestSibling = !!(options && options.expandClosestSibling);
+ var onlyPartialContains = !!(options && options.onlyPartialContains);
+
+ if (rng.isCollapsed()) {
+ return [rng.insertNode(dom.create(nodeName))];
+ }
+
+ var pred = dom.makePredByNodeName(nodeName);
+ var nodes = rng.nodes(dom.isText, {
+ fullyContains: true
+ }).map(function (text) {
+ return dom.singleChildAncestor(text, pred) || dom.wrap(text, nodeName);
+ });
+
+ if (expandClosestSibling) {
+ if (onlyPartialContains) {
+ var nodesInRange = rng.nodes();
+ // compose with partial contains predication
+ pred = func.and(pred, function (node) {
+ return list.contains(nodesInRange, node);
+ });
+ }
+
+ return nodes.map(function (node) {
+ var siblings = dom.withClosestSiblings(node, pred);
+ var head = list.head(siblings);
+ var tails = list.tail(siblings);
+ $.each(tails, function (idx, elem) {
+ dom.appendChildNodes(head, elem.childNodes);
+ dom.remove(elem);
+ });
+ return list.head(siblings);
+ });
+ } else {
+ return nodes;
+ }
+ };
+
/**
* get current style on cursor
*
@@ -49,10 +122,7 @@ define([
*/
this.current = function (rng) {
var $cont = $(dom.isText(rng.sc) ? rng.sc.parentNode : rng.sc);
- var properties = ['font-family', 'font-size', 'text-align', 'list-style-type', 'line-height'];
- var styleInfo = jQueryCSS($cont, properties) || {};
-
- styleInfo['font-size'] = parseInt(styleInfo['font-size'], 10);
+ var styleInfo = this.fromNode($cont);
// document.queryCommandState for toggle state
styleInfo['font-bold'] = document.queryCommandState('bold') ? 'bold' : 'normal';
@@ -79,7 +149,6 @@ define([
styleInfo['line-height'] = lineHeight.toFixed(1);
}
- styleInfo.image = rng.isOnImg();
styleInfo.anchor = rng.isOnAnchor() && dom.ancestor(rng.sc, dom.isAnchor);
styleInfo.ancestors = dom.listAncestor(rng.sc, dom.isEditable);
styleInfo.range = rng;
diff --git a/addons/web_editor/static/lib/summernote/src/js/editing/Table.js b/addons/web_editor/static/lib/summernote/src/js/editing/Table.js
index 291f85128e5..634d5a79d7e 100644
--- a/addons/web_editor/static/lib/summernote/src/js/editing/Table.js
+++ b/addons/web_editor/static/lib/summernote/src/js/editing/Table.js
@@ -2,8 +2,10 @@ define([
'summernote/core/dom', 'summernote/core/range', 'summernote/core/list'
], function (dom, range, list) {
/**
+ * @class editing.Table
+ *
* Table
- * @class
+ *
*/
var Table = function () {
/**
diff --git a/addons/web_editor/static/lib/summernote/src/js/editing/Typing.js b/addons/web_editor/static/lib/summernote/src/js/editing/Typing.js
index 2a094cafa22..f95eba9e9f3 100644
--- a/addons/web_editor/static/lib/summernote/src/js/editing/Typing.js
+++ b/addons/web_editor/static/lib/summernote/src/js/editing/Typing.js
@@ -1,12 +1,24 @@
define([
'summernote/core/dom',
- 'summernote/core/range'
-], function (dom, range) {
+ 'summernote/core/range',
+ 'summernote/editing/Bullet'
+], function (dom, range, Bullet) {
+ /**
+ * @class editing.Typing
+ *
+ * Typing
+ *
+ */
var Typing = function () {
+ // a Bullet instance to toggle lists off
+ var bullet = new Bullet();
+
/**
- * @param {jQuery} $editable
+ * insert tab
+ *
+ * @param {jQuery} $editable
* @param {WrappedRange} rng
* @param {Number} tabsize
*/
@@ -37,14 +49,22 @@ define([
var nextPara;
// on paragraph: split paragraph
if (splitRoot) {
- nextPara = dom.splitTree(splitRoot, rng.getStartPoint());
+ // if it is an empty line with li
+ if (dom.isEmpty(splitRoot) && dom.isLi(splitRoot)) {
+ // disable UL/OL and escape!
+ bullet.toggleList(splitRoot.parentNode.nodeName);
+ return;
+ // if new line has content (not a line break)
+ } else {
+ nextPara = dom.splitTree(splitRoot, rng.getStartPoint());
- var emptyAnchors = dom.listDescendant(splitRoot, dom.isEmptyAnchor);
- emptyAnchors = emptyAnchors.concat(dom.listDescendant(nextPara, dom.isEmptyAnchor));
+ var emptyAnchors = dom.listDescendant(splitRoot, dom.isEmptyAnchor);
+ emptyAnchors = emptyAnchors.concat(dom.listDescendant(nextPara, dom.isEmptyAnchor));
- $.each(emptyAnchors, function (idx, anchor) {
- dom.remove(anchor);
- });
+ $.each(emptyAnchors, function (idx, anchor) {
+ dom.remove(anchor);
+ });
+ }
// no paragraph: insert empty paragraph
} else {
var next = rng.sc.childNodes[rng.so];
@@ -57,6 +77,7 @@ define([
}
range.create(nextPara, 0).normalize().select();
+
};
};
diff --git a/addons/web_editor/static/lib/summernote/src/js/intro.js b/addons/web_editor/static/lib/summernote/src/js/intro.js
index dd5e9763077..357132eb110 100644
--- a/addons/web_editor/static/lib/summernote/src/js/intro.js
+++ b/addons/web_editor/static/lib/summernote/src/js/intro.js
@@ -1,9 +1,9 @@
/**
* Super simple wysiwyg editor on Bootstrap v@VERSION
- * http://hackerwins.github.io/summernote/
+ * http://summernote.org/
*
* summernote.js
- * Copyright 2013-2014 Alan Hong. and other contributors
+ * Copyright 2013-2015 Alan Hong. and other contributors
* summernote may be freely distributed under the MIT license./
*
* Date: @DATE
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Button.js b/addons/web_editor/static/lib/summernote/src/js/module/Button.js
index 512822aeba8..b7a1614d4db 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Button.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Button.js
@@ -1,7 +1,10 @@
define([
- 'summernote/core/list'
-], function (list) {
+ 'summernote/core/list',
+ 'summernote/core/agent'
+], function (list, agent) {
/**
+ * @class module.Button
+ *
* Button
*/
var Button = function () {
@@ -28,6 +31,7 @@ define([
/**
* update button state(active or not).
*
+ * @private
* @param {String} selector
* @param {Function} pred
*/
@@ -40,30 +44,30 @@ define([
var $img = $(styleInfo.image);
btnState('button[data-event="imageShape"][data-value="img-rounded"]', function () {
- return $img.hasClass("img-rounded");
+ return $img.hasClass('img-rounded');
});
btnState('button[data-event="imageShape"][data-value="img-circle"]', function () {
- return $img.hasClass("img-circle");
+ return $img.hasClass('img-circle');
});
btnState('button[data-event="imageShape"][data-value="img-thumbnail"]', function () {
- return $img.hasClass("img-thumbnail");
+ return $img.hasClass('img-thumbnail');
});
btnState('button[data-event="imageShape"]:not([data-value])', function () {
- return !$img.is(".img-rounded, .img-circle, .img-thumbnail");
+ return !$img.is('.img-rounded, .img-circle, .img-thumbnail');
});
- var imgFloat = $img.css("float");
+ var imgFloat = $img.css('float');
btnState('button[data-event="floatMe"][data-value="left"]', function () {
- return imgFloat === "left";
+ return imgFloat === 'left';
});
btnState('button[data-event="floatMe"][data-value="right"]', function () {
- return imgFloat === "right";
+ return imgFloat === 'right';
});
btnState('button[data-event="floatMe"][data-value="none"]', function () {
- return imgFloat !== "left" && imgFloat !== "right";
+ return imgFloat !== 'left' && imgFloat !== 'right';
});
- var style = $img.attr("style");
+ var style = $img.attr('style');
btnState('button[data-event="resize"][data-value="1"]', function () {
return !!/(^|\s)(max-)?width\s*:\s*100%/.test(style);
});
@@ -81,10 +85,18 @@ define([
if ($fontname.length) {
var selectedFont = styleInfo['font-family'];
if (!!selectedFont) {
- selectedFont = list.head(selectedFont.split(','));
- selectedFont = selectedFont.replace(/\'/g, '');
+
+ var list = selectedFont.split(',');
+ for (var i = 0, len = list.length; i < len; i++) {
+ selectedFont = list[i].replace(/[\'\"]/g, '').replace(/\s+$/, '').replace(/^\s+/, '');
+ if (agent.isFontInstalled(selectedFont)) {
+ break;
+ }
+ }
+
$fontname.find('.note-current-fontname').text(selectedFont);
checkDropdownMenu($fontname, selectedFont);
+
}
}
@@ -140,7 +152,7 @@ define([
*
* @param {Node} button
* @param {String} eventName
- * @param {value} value
+ * @param {Mixed} value
*/
this.updateRecentColor = function (button, eventName, value) {
var $color = $(button).closest('.note-color');
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
new file mode 100644
index 00000000000..e2d234c9dbb
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Clipboard.js
@@ -0,0 +1,90 @@
+define([
+ 'summernote/core/list',
+ 'summernote/core/dom',
+ 'summernote/core/key',
+ 'summernote/core/agent'
+], function (list, dom, key, agent) {
+ var Clipboard = function (handler) {
+ var $paste;
+
+ this.attach = function (layoutInfo) {
+ // [workaround] getting image from clipboard
+ // - IE11 and Firefox: CTRL+v hook
+ // - Webkit: event.clipboardData
+ if ((agent.isMSIE && agent.browserVersion > 10) || agent.isFF) {
+ $paste = $('').attr('contenteditable', true).css({
+ position : 'absolute',
+ left : -100000,
+ opacity : 0
+ });
+
+ layoutInfo.editable().on('keydown', function (e) {
+ if (e.ctrlKey && e.keyCode === key.code.V) {
+ handler.invoke('saveRange', layoutInfo.editable());
+ $paste.focus();
+
+ setTimeout(function () {
+ pasteByHook(layoutInfo);
+ }, 0);
+ }
+ });
+
+ layoutInfo.editable().before($paste);
+ } else {
+ layoutInfo.editable().on('paste', pasteByEvent);
+ }
+ };
+
+ var pasteByHook = function (layoutInfo) {
+ var $editable = layoutInfo.editable();
+ var node = $paste[0].firstChild;
+
+ if (dom.isImg(node)) {
+ var dataURI = node.src;
+ var decodedData = atob(dataURI.split(',')[1]);
+ var array = new Uint8Array(decodedData.length);
+ for (var i = 0; i < decodedData.length; i++) {
+ array[i] = decodedData.charCodeAt(i);
+ }
+
+ var blob = new Blob([array], { type : 'image/png' });
+ blob.name = 'clipboard.png';
+
+ handler.invoke('restoreRange', $editable);
+ handler.invoke('focus', $editable);
+ handler.insertImages(layoutInfo, [blob]);
+ } else {
+ var pasteContent = $('').html($paste.html()).html();
+ handler.invoke('restoreRange', $editable);
+ handler.invoke('focus', $editable);
+
+ if (pasteContent) {
+ handler.invoke('pasteHTML', $editable, pasteContent);
+ }
+ }
+
+ $paste.empty();
+ };
+
+ /**
+ * paste by clipboard event
+ *
+ * @param {Event} event
+ */
+ var pasteByEvent = function (event) {
+ var clipboardData = event.originalEvent.clipboardData;
+ var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
+ var $editable = layoutInfo.editable();
+
+ if (clipboardData && clipboardData.items && clipboardData.items.length) {
+ var item = list.head(clipboardData.items);
+ if (item.kind === 'file' && item.type.indexOf('image/') !== -1) {
+ handler.insertImages(layoutInfo, [item.getAsFile()]);
+ }
+ handler.invoke('editor.afterCommand', $editable);
+ }
+ };
+ };
+
+ return Clipboard;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Codeview.js b/addons/web_editor/static/lib/summernote/src/js/module/Codeview.js
new file mode 100644
index 00000000000..46f3d96ab12
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Codeview.js
@@ -0,0 +1,137 @@
+define([
+ 'summernote/core/agent',
+ 'summernote/core/dom'
+], function (agent, dom) {
+
+ var CodeMirror;
+ if (agent.hasCodeMirror) {
+ if (agent.isSupportAmd) {
+ require(['CodeMirror'], function (cm) {
+ CodeMirror = cm;
+ });
+ } else {
+ CodeMirror = window.CodeMirror;
+ }
+ }
+
+ /**
+ * @class Codeview
+ */
+ var Codeview = function (handler) {
+
+ this.sync = function (layoutInfo) {
+ var isCodeview = handler.invoke('codeview.isActivated', layoutInfo);
+ if (isCodeview && agent.hasCodeMirror) {
+ layoutInfo.codable().data('cmEditor').save();
+ }
+ };
+
+ /**
+ * @param {Object} layoutInfo
+ * @return {Boolean}
+ */
+ this.isActivated = function (layoutInfo) {
+ var $editor = layoutInfo.editor();
+ return $editor.hasClass('codeview');
+ };
+
+ /**
+ * toggle codeview
+ *
+ * @param {Object} layoutInfo
+ */
+ this.toggle = function (layoutInfo) {
+ if (this.isActivated(layoutInfo)) {
+ this.deactivate(layoutInfo);
+ } else {
+ this.activate(layoutInfo);
+ }
+ };
+
+ /**
+ * activate code view
+ *
+ * @param {Object} layoutInfo
+ */
+ this.activate = function (layoutInfo) {
+ var $editor = layoutInfo.editor(),
+ $toolbar = layoutInfo.toolbar(),
+ $editable = layoutInfo.editable(),
+ $codable = layoutInfo.codable(),
+ $popover = layoutInfo.popover(),
+ $handle = layoutInfo.handle();
+
+ var options = $editor.data('options');
+
+ $codable.val(dom.html($editable, options.prettifyHtml));
+ $codable.height($editable.height());
+
+ handler.invoke('toolbar.updateCodeview', $toolbar, true);
+ handler.invoke('popover.hide', $popover);
+ handler.invoke('handle.hide', $handle);
+
+ $editor.addClass('codeview');
+
+ $codable.focus();
+
+ // activate CodeMirror as codable
+ if (agent.hasCodeMirror) {
+ var cmEditor = CodeMirror.fromTextArea($codable[0], options.codemirror);
+
+ // CodeMirror TernServer
+ if (options.codemirror.tern) {
+ var server = new CodeMirror.TernServer(options.codemirror.tern);
+ cmEditor.ternServer = server;
+ cmEditor.on('cursorActivity', function (cm) {
+ server.updateArgHints(cm);
+ });
+ }
+
+ // CodeMirror hasn't Padding.
+ cmEditor.setSize(null, $editable.outerHeight());
+ $codable.data('cmEditor', cmEditor);
+ }
+ };
+
+ /**
+ * deactivate code view
+ *
+ * @param {Object} layoutInfo
+ */
+ this.deactivate = function (layoutInfo) {
+ var $holder = layoutInfo.holder(),
+ $editor = layoutInfo.editor(),
+ $toolbar = layoutInfo.toolbar(),
+ $editable = layoutInfo.editable(),
+ $codable = layoutInfo.codable();
+
+ var options = $editor.data('options');
+
+ // deactivate CodeMirror as codable
+ if (agent.hasCodeMirror) {
+ var cmEditor = $codable.data('cmEditor');
+ $codable.val(cmEditor.getValue());
+ cmEditor.toTextArea();
+ }
+
+ var value = dom.value($codable, options.prettifyHtml) || dom.emptyPara;
+ var isChange = $editable.html() !== value;
+
+ $editable.html(value);
+ $editable.height(options.height ? $codable.height() : 'auto');
+ $editor.removeClass('codeview');
+
+ if (isChange) {
+ handler.bindCustomEvent(
+ $holder, $editable.data('callbacks'), 'change'
+ )($editable.html(), $editable);
+ }
+
+ $editable.focus();
+
+ handler.invoke('toolbar.updateCodeview', $toolbar, false);
+ };
+ };
+
+ return Codeview;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Dialog.js b/addons/web_editor/static/lib/summernote/src/js/module/Dialog.js
index 8e7cf07b323..d4f4d700218 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Dialog.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Dialog.js
@@ -1,158 +1 @@
-define('summernote/module/Dialog', function () {
- /**
- * Dialog
- *
- * @class
- */
- var Dialog = function () {
-
- /**
- * toggle button status
- *
- * @param {jQuery} $btn
- * @param {Boolean} isEnable
- */
- var toggleBtn = function ($btn, isEnable) {
- $btn.toggleClass('disabled', !isEnable);
- $btn.attr('disabled', !isEnable);
- };
-
- /**
- * show image dialog
- *
- * @param {jQuery} $editable
- * @param {jQuery} $dialog
- * @return {Promise}
- */
- this.showImageDialog = function ($editable, $dialog) {
- return $.Deferred(function (deferred) {
- var $imageDialog = $dialog.find('.note-image-dialog');
-
- var $imageInput = $dialog.find('.note-image-input'),
- $imageUrl = $dialog.find('.note-image-url'),
- $imageBtn = $dialog.find('.note-image-btn');
-
- $imageDialog.one('shown.bs.modal', function () {
- // Cloning imageInput to clear element.
- $imageInput.replaceWith($imageInput.clone()
- .on('change', function () {
- deferred.resolve(this.files || this.value);
- $imageDialog.modal('hide');
- })
- .val('')
- );
-
- $imageBtn.click(function (event) {
- event.preventDefault();
-
- deferred.resolve($imageUrl.val());
- $imageDialog.modal('hide');
- });
-
- $imageUrl.on('keyup paste', function (event) {
- var url;
-
- if (event.type === 'paste') {
- url = event.originalEvent.clipboardData.getData('text');
- } else {
- url = $imageUrl.val();
- }
-
- toggleBtn($imageBtn, url);
- }).val('').trigger('focus');
- }).one('hidden.bs.modal', function () {
- $imageInput.off('change');
- $imageUrl.off('keyup paste');
- $imageBtn.off('click');
-
- if (deferred.state() === 'pending') {
- deferred.reject();
- }
- }).modal('show');
- });
- };
-
- /**
- * Show link dialog and set event handlers on dialog controls.
- *
- * @param {jQuery} $dialog
- * @param {Object} linkInfo
- * @return {Promise}
- */
- this.showLinkDialog = function ($editable, $dialog, linkInfo) {
- return $.Deferred(function (deferred) {
- var $linkDialog = $dialog.find('.note-link-dialog');
-
- var $linkText = $linkDialog.find('.note-link-text'),
- $linkUrl = $linkDialog.find('.note-link-url'),
- $linkBtn = $linkDialog.find('.note-link-btn'),
- $openInNewWindow = $linkDialog.find('input[type=checkbox]');
-
- $linkDialog.one('shown.bs.modal', function () {
- $linkText.val(linkInfo.text);
-
- $linkText.on('input', function () {
- // if linktext was modified by keyup,
- // stop cloning text from linkUrl
- linkInfo.text = $linkText.val();
- });
-
- // if no url was given, copy text to url
- if (!linkInfo.url) {
- linkInfo.url = linkInfo.text;
- toggleBtn($linkBtn, linkInfo.text);
- }
-
- $linkUrl.on('input', function () {
- toggleBtn($linkBtn, $linkUrl.val());
- // display same link on `Text to display` input
- // when create a new link
- if (!linkInfo.text) {
- $linkText.val($linkUrl.val());
- }
- }).val(linkInfo.url).trigger('focus').trigger('select');
-
- $openInNewWindow.prop('checked', linkInfo.newWindow);
-
- $linkBtn.one('click', function (event) {
- event.preventDefault();
-
- deferred.resolve({
- range: linkInfo.range,
- url: $linkUrl.val(),
- text: $linkText.val(),
- newWindow: $openInNewWindow.is(':checked')
- });
- $linkDialog.modal('hide');
- });
- }).one('hidden.bs.modal', function () {
- // detach events
- $linkText.off('input');
- $linkUrl.off('input');
- $linkBtn.off('click');
-
- if (deferred.state() === 'pending') {
- deferred.reject();
- }
- }).modal('show');
- }).promise();
- };
-
- /**
- * show help dialog
- *
- * @param {jQuery} $dialog
- */
- this.showHelpDialog = function ($editable, $dialog) {
- return $.Deferred(function (deferred) {
- var $helpDialog = $dialog.find('.note-help-dialog');
-
- $helpDialog.one('hidden.bs.modal', function () {
- deferred.resolve();
- }).modal('show');
- }).promise();
- };
- };
-
- return Dialog;
-});
+/** TODO master: drop this file (splitted in several files) */
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/DragAndDrop.js b/addons/web_editor/static/lib/summernote/src/js/module/DragAndDrop.js
new file mode 100644
index 00000000000..b8871599c6f
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/DragAndDrop.js
@@ -0,0 +1,98 @@
+define([
+ 'summernote/core/dom'
+], function (dom) {
+ var DragAndDrop = function (handler) {
+ var $document = $(document);
+
+ /**
+ * attach Drag and Drop Events
+ *
+ * @param {Object} layoutInfo - layout Informations
+ * @param {Object} options
+ */
+ this.attach = function (layoutInfo, options) {
+ if (options.airMode || options.disableDragAndDrop) {
+ // prevent default drop event
+ $document.on('drop', function (e) {
+ e.preventDefault();
+ });
+ } else {
+ this.attachDragAndDropEvent(layoutInfo, options);
+ }
+ };
+
+ /**
+ * attach Drag and Drop Events
+ *
+ * @param {Object} layoutInfo - layout Informations
+ * @param {Object} options
+ */
+ this.attachDragAndDropEvent = function (layoutInfo, options) {
+ var collection = $(),
+ $editor = layoutInfo.editor(),
+ $dropzone = layoutInfo.dropzone(),
+ $dropzoneMessage = $dropzone.find('.note-dropzone-message');
+
+ // show dropzone on dragenter when dragging a object to document
+ // -but only if the editor is visible, i.e. has a positive width and height
+ $document.on('dragenter', function (e) {
+ var isCodeview = handler.invoke('codeview.isActivated', layoutInfo);
+ var hasEditorSize = $editor.width() > 0 && $editor.height() > 0;
+ if (!isCodeview && !collection.length && hasEditorSize) {
+ $editor.addClass('dragover');
+ $dropzone.width($editor.width());
+ $dropzone.height($editor.height());
+ $dropzoneMessage.text(options.langInfo.image.dragImageHere);
+ }
+ collection = collection.add(e.target);
+ }).on('dragleave', function (e) {
+ collection = collection.not(e.target);
+ if (!collection.length) {
+ $editor.removeClass('dragover');
+ }
+ }).on('drop', function () {
+ collection = $();
+ $editor.removeClass('dragover');
+ });
+
+ // change dropzone's message on hover.
+ $dropzone.on('dragenter', function () {
+ $dropzone.addClass('hover');
+ $dropzoneMessage.text(options.langInfo.image.dropImage);
+ }).on('dragleave', function () {
+ $dropzone.removeClass('hover');
+ $dropzoneMessage.text(options.langInfo.image.dragImageHere);
+ });
+
+ // attach dropImage
+ $dropzone.on('drop', function (event) {
+
+ var dataTransfer = event.originalEvent.dataTransfer;
+ var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
+
+ if (dataTransfer && dataTransfer.files && dataTransfer.files.length) {
+ event.preventDefault();
+ layoutInfo.editable().focus();
+ handler.insertImages(layoutInfo, dataTransfer.files);
+ } else {
+ var insertNodefunc = function () {
+ layoutInfo.holder().summernote('insertNode', this);
+ };
+
+ for (var i = 0, len = dataTransfer.types.length; i < len; i++) {
+ var type = dataTransfer.types[i];
+ var content = dataTransfer.getData(type);
+
+ if (type.toLowerCase().indexOf('text') > -1) {
+ layoutInfo.holder().summernote('pasteHTML', content);
+ } else {
+ $(content).each(insertNodefunc);
+ }
+ }
+ }
+ }).on('dragover', false); // prevent default dragover event
+ };
+ };
+
+ return DragAndDrop;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Fullscreen.js b/addons/web_editor/static/lib/summernote/src/js/module/Fullscreen.js
new file mode 100644
index 00000000000..fd837483b3b
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Fullscreen.js
@@ -0,0 +1,51 @@
+define([], function () { // ODOO: remove error from Odoo define
+ var Fullscreen = function (handler) {
+ var $window = $(window);
+ var $scrollbar = $('html, body');
+
+ /**
+ * toggle fullscreen
+ *
+ * @param {Object} layoutInfo
+ */
+ this.toggle = function (layoutInfo) {
+
+ var $editor = layoutInfo.editor(),
+ $toolbar = layoutInfo.toolbar(),
+ $editable = layoutInfo.editable(),
+ $codable = layoutInfo.codable();
+
+ var resize = function (size) {
+ $editable.css('height', size.h);
+ $codable.css('height', size.h);
+ if ($codable.data('cmeditor')) {
+ $codable.data('cmeditor').setsize(null, size.h);
+ }
+ };
+
+ $editor.toggleClass('fullscreen');
+ var isFullscreen = $editor.hasClass('fullscreen');
+ if (isFullscreen) {
+ $editable.data('orgheight', $editable.css('height'));
+
+ $window.on('resize', function () {
+ resize({
+ h: $window.height() - $toolbar.outerHeight()
+ });
+ }).trigger('resize');
+
+ $scrollbar.css('overflow', 'hidden');
+ } else {
+ $window.off('resize');
+ resize({
+ h: $editable.data('orgheight')
+ });
+ $scrollbar.css('overflow', 'visible');
+ }
+
+ handler.invoke('toolbar.updateFullscreen', $toolbar, isFullscreen);
+ };
+ };
+
+ return Fullscreen;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Handle.js b/addons/web_editor/static/lib/summernote/src/js/module/Handle.js
index 375428faa32..3b62304d706 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Handle.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Handle.js
@@ -1,8 +1,60 @@
-define('summernote/module/Handle', function () {
+define([
+ 'summernote/core/dom'
+], function (dom) {
/**
+ * @class module.Handle
+ *
* Handle
*/
- var Handle = function () {
+ var Handle = function (handler) {
+ var $document = $(document);
+
+ /**
+ * `mousedown` event handler on $handle
+ * - controlSizing: resize image
+ *
+ * @param {MouseEvent} event
+ */
+ var hHandleMousedown = function (event) {
+ if (dom.isControlSizing(event.target)) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ var layoutInfo = dom.makeLayoutInfo(event.target),
+ $handle = layoutInfo.handle(),
+ $popover = layoutInfo.popover(),
+ $editable = layoutInfo.editable(),
+ $editor = layoutInfo.editor();
+
+ var target = $handle.find('.note-control-selection').data('target'),
+ $target = $(target), posStart = $target.offset(),
+ scrollTop = $document.scrollTop();
+
+ var isAirMode = $editor.data('options').airMode;
+
+ $document.on('mousemove', function (event) {
+ handler.invoke('editor.resizeTo', {
+ x: event.clientX - posStart.left,
+ y: event.clientY - (posStart.top - scrollTop)
+ }, $target, !event.shiftKey);
+
+ handler.invoke('handle.update', $handle, {image: target}, isAirMode);
+ handler.invoke('popover.update', $popover, {image: target}, isAirMode);
+ }).one('mouseup', function () {
+ $document.off('mousemove');
+ handler.invoke('editor.afterCommand', $editable);
+ });
+
+ if (!$target.data('ratio')) { // original ratio.
+ $target.data('ratio', $target.height() / $target.width());
+ }
+ }
+ };
+
+ this.attach = function (layoutInfo) {
+ layoutInfo.handle().on('mousedown', hHandleMousedown);
+ };
+
/**
* update handle
* @param {jQuery} $handle
@@ -35,6 +87,11 @@ define('summernote/module/Handle', function () {
}
};
+ /**
+ * hide
+ *
+ * @param {jQuery} $handle
+ */
this.hide = function ($handle) {
$handle.children().hide();
};
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/HelpDialog.js b/addons/web_editor/static/lib/summernote/src/js/module/HelpDialog.js
new file mode 100644
index 00000000000..e4ff7b775ed
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/HelpDialog.js
@@ -0,0 +1,35 @@
+define([], function () { // ODOO: remove error from Odoo define
+ var HelpDialog = function (handler) {
+ /**
+ * show help dialog
+ *
+ * @param {jQuery} $editable
+ * @param {jQuery} $dialog
+ * @return {Promise}
+ */
+ this.showHelpDialog = function ($editable, $dialog) {
+ return $.Deferred(function (deferred) {
+ var $helpDialog = $dialog.find('.note-help-dialog');
+
+ $helpDialog.one('hidden.bs.modal', function () {
+ deferred.resolve();
+ }).modal('show');
+ }).promise();
+ };
+
+ /**
+ * @param {Object} layoutInfo
+ */
+ this.show = function (layoutInfo) {
+ var $dialog = layoutInfo.dialog(),
+ $editable = layoutInfo.editable();
+
+ handler.invoke('editor.saveRange', $editable, true);
+ this.showHelpDialog($editable, $dialog).then(function () {
+ handler.invoke('editor.restoreRange', $editable);
+ });
+ };
+ };
+
+ return HelpDialog;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/ImageDialog.js b/addons/web_editor/static/lib/summernote/src/js/module/ImageDialog.js
new file mode 100644
index 00000000000..042921183cc
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/ImageDialog.js
@@ -0,0 +1,110 @@
+define([
+ 'summernote/core/key'
+], function (key) {
+ var ImageDialog = function (handler) {
+ /**
+ * toggle button status
+ *
+ * @private
+ * @param {jQuery} $btn
+ * @param {Boolean} isEnable
+ */
+ var toggleBtn = function ($btn, isEnable) {
+ $btn.toggleClass('disabled', !isEnable);
+ $btn.attr('disabled', !isEnable);
+ };
+
+ /**
+ * bind enter key
+ *
+ * @private
+ * @param {jQuery} $input
+ * @param {jQuery} $btn
+ */
+ var bindEnterKey = function ($input, $btn) {
+ $input.on('keypress', function (event) {
+ if (event.keyCode === key.code.ENTER) {
+ $btn.trigger('click');
+ }
+ });
+ };
+
+ this.show = function (layoutInfo) {
+ var $dialog = layoutInfo.dialog(),
+ $editable = layoutInfo.editable();
+
+ handler.invoke('editor.saveRange', $editable);
+ this.showImageDialog($editable, $dialog).then(function (data) {
+ handler.invoke('editor.restoreRange', $editable);
+
+ if (typeof data === 'string') {
+ // image url
+ handler.invoke('editor.insertImage', $editable, data);
+ } else {
+ // array of files
+ handler.insertImages(layoutInfo, data);
+ }
+ }).fail(function () {
+ handler.invoke('editor.restoreRange', $editable);
+ });
+ };
+
+ /**
+ * show image dialog
+ *
+ * @param {jQuery} $editable
+ * @param {jQuery} $dialog
+ * @return {Promise}
+ */
+ this.showImageDialog = function ($editable, $dialog) {
+ return $.Deferred(function (deferred) {
+ var $imageDialog = $dialog.find('.note-image-dialog');
+
+ var $imageInput = $dialog.find('.note-image-input'),
+ $imageUrl = $dialog.find('.note-image-url'),
+ $imageBtn = $dialog.find('.note-image-btn');
+
+ $imageDialog.one('shown.bs.modal', function () {
+ // Cloning imageInput to clear element.
+ $imageInput.replaceWith($imageInput.clone()
+ .on('change', function () {
+ deferred.resolve(this.files || this.value);
+ $imageDialog.modal('hide');
+ })
+ .val('')
+ );
+
+ $imageBtn.click(function (event) {
+ event.preventDefault();
+
+ deferred.resolve($imageUrl.val());
+ $imageDialog.modal('hide');
+ });
+
+ $imageUrl.on('keyup paste', function (event) {
+ var url;
+
+ if (event.type === 'paste') {
+ url = event.originalEvent.clipboardData.getData('text');
+ } else {
+ url = $imageUrl.val();
+ }
+
+ toggleBtn($imageBtn, url);
+ }).val('').trigger('focus');
+ bindEnterKey($imageUrl, $imageBtn);
+ }).one('hidden.bs.modal', function () {
+ $imageInput.off('change');
+ $imageUrl.off('keyup paste keypress');
+ $imageBtn.off('click');
+
+ if (deferred.state() === 'pending') {
+ deferred.reject();
+ }
+ }).modal('show');
+ });
+ };
+ };
+
+ return ImageDialog;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/LinkDialog.js b/addons/web_editor/static/lib/summernote/src/js/module/LinkDialog.js
new file mode 100644
index 00000000000..045119ee68a
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/LinkDialog.js
@@ -0,0 +1,129 @@
+define([
+ 'summernote/core/key'
+], function (key) {
+ var LinkDialog = function (handler) {
+
+ /**
+ * toggle button status
+ *
+ * @private
+ * @param {jQuery} $btn
+ * @param {Boolean} isEnable
+ */
+ var toggleBtn = function ($btn, isEnable) {
+ $btn.toggleClass('disabled', !isEnable);
+ $btn.attr('disabled', !isEnable);
+ };
+
+ /**
+ * bind enter key
+ *
+ * @private
+ * @param {jQuery} $input
+ * @param {jQuery} $btn
+ */
+ var bindEnterKey = function ($input, $btn) {
+ $input.on('keypress', function (event) {
+ if (event.keyCode === key.code.ENTER) {
+ $btn.trigger('click');
+ }
+ });
+ };
+
+ /**
+ * Show link dialog and set event handlers on dialog controls.
+ *
+ * @param {jQuery} $editable
+ * @param {jQuery} $dialog
+ * @param {Object} linkInfo
+ * @return {Promise}
+ */
+ this.showLinkDialog = function ($editable, $dialog, linkInfo) {
+ return $.Deferred(function (deferred) {
+ var $linkDialog = $dialog.find('.note-link-dialog');
+
+ var $linkText = $linkDialog.find('.note-link-text'),
+ $linkUrl = $linkDialog.find('.note-link-url'),
+ $linkBtn = $linkDialog.find('.note-link-btn'),
+ $openInNewWindow = $linkDialog.find('input[type=checkbox]');
+
+ $linkDialog.one('shown.bs.modal', function () {
+ $linkText.val(linkInfo.text);
+
+ $linkText.on('input', function () {
+ toggleBtn($linkBtn, $linkText.val() && $linkUrl.val());
+ // if linktext was modified by keyup,
+ // stop cloning text from linkUrl
+ linkInfo.text = $linkText.val();
+ });
+
+ // if no url was given, copy text to url
+ if (!linkInfo.url) {
+ linkInfo.url = linkInfo.text || 'http://';
+ toggleBtn($linkBtn, linkInfo.text);
+ }
+
+ $linkUrl.on('input', function () {
+ toggleBtn($linkBtn, $linkText.val() && $linkUrl.val());
+ // display same link on `Text to display` input
+ // when create a new link
+ if (!linkInfo.text) {
+ $linkText.val($linkUrl.val());
+ }
+ }).val(linkInfo.url).trigger('focus').trigger('select');
+
+ bindEnterKey($linkUrl, $linkBtn);
+ bindEnterKey($linkText, $linkBtn);
+
+ $openInNewWindow.prop('checked', linkInfo.isNewWindow);
+
+ $linkBtn.one('click', function (event) {
+ event.preventDefault();
+
+ deferred.resolve({
+ range: linkInfo.range,
+ url: $linkUrl.val(),
+ text: $linkText.val(),
+ isNewWindow: $openInNewWindow.is(':checked')
+ });
+ $linkDialog.modal('hide');
+ });
+ }).one('hidden.bs.modal', function () {
+ // detach events
+ $linkText.off('input keypress');
+ $linkUrl.off('input keypress');
+ $linkBtn.off('click');
+
+ if (deferred.state() === 'pending') {
+ deferred.reject();
+ }
+ }).modal('show');
+ }).promise();
+ };
+
+ /**
+ * @param {Object} layoutInfo
+ */
+ this.show = function (layoutInfo) {
+ var $editor = layoutInfo.editor(),
+ $dialog = layoutInfo.dialog(),
+ $editable = layoutInfo.editable(),
+ $popover = layoutInfo.popover(),
+ linkInfo = handler.invoke('editor.getLinkInfo', $editable);
+
+ var options = $editor.data('options');
+
+ handler.invoke('editor.saveRange', $editable);
+ this.showLinkDialog($editable, $dialog, linkInfo).then(function (linkInfo) {
+ handler.invoke('editor.restoreRange', $editable);
+ handler.invoke('editor.createLink', $editable, linkInfo, options);
+ // hide popover after creating link
+ handler.invoke('popover.hide', $popover);
+ }).fail(function () {
+ handler.invoke('editor.restoreRange', $editable);
+ });
+ };
+ };
+
+ return LinkDialog;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Popover.js b/addons/web_editor/static/lib/summernote/src/js/module/Popover.js
index e0531f06c45..f669569f6ba 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Popover.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Popover.js
@@ -4,22 +4,32 @@ define([
'summernote/module/Button'
], function (func, list, Button) {
/**
+ * @class module.Popover
+ *
* Popover (http://getbootstrap.com/javascript/#popovers)
+ *
*/
var Popover = function () {
var button = new Button();
- this.button = button; // odoo change for overwrite
+ this.button = button; // ODOO: allow access for override
/**
* returns position from placeholder
+ *
+ * @private
* @param {Node} placeholder
- * @param {Boolean} isAirMode
+ * @param {Object} options
+ * @param {Boolean} options.isAirMode
+ * @return {Position}
*/
- var posFromPlaceholder = function (placeholder, isAirMode) {
+ var posFromPlaceholder = function (placeholder, options) {
+ var isAirMode = options && options.isAirMode;
+ var isLeftTop = options && options.isLeftTop;
+
var $placeholder = $(placeholder);
var pos = isAirMode ? $placeholder.offset() : $placeholder.position();
- var height = $placeholder.outerHeight(true); // include margin
+ var height = isLeftTop ? 0 : $placeholder.outerHeight(true); // include margin
// popover below placeholder.
return {
@@ -30,6 +40,8 @@ define([
/**
* show popover
+ *
+ * @private
* @param {jQuery} popover
* @param {Position} pos
*/
@@ -56,21 +68,32 @@ define([
if (styleInfo.anchor) {
var $anchor = $linkPopover.find('a');
var href = $(styleInfo.anchor).attr('href');
+ var target = $(styleInfo.anchor).attr('target');
$anchor.attr('href', href).html(href);
- showPopover($linkPopover, posFromPlaceholder(styleInfo.anchor, isAirMode));
+ if (!target) {
+ $anchor.removeAttr('target');
+ } else {
+ $anchor.attr('target', '_blank');
+ }
+ showPopover($linkPopover, posFromPlaceholder(styleInfo.anchor, {
+ isAirMode: isAirMode
+ }));
} else {
$linkPopover.hide();
}
var $imagePopover = $popover.find('.note-image-popover');
if (styleInfo.image) {
- showPopover($imagePopover, posFromPlaceholder(styleInfo.image, isAirMode));
+ showPopover($imagePopover, posFromPlaceholder(styleInfo.image, {
+ isAirMode: isAirMode,
+ isLeftTop: true
+ }));
} else {
$imagePopover.hide();
}
var $airPopover = $popover.find('.note-air-popover');
- if (isAirMode && !styleInfo.range.isCollapsed()) {
+ if (isAirMode && styleInfo.range && !styleInfo.range.isCollapsed()) {
var rect = list.last(styleInfo.range.getClientRects());
if (rect) {
var bnd = func.rect2bnd(rect);
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Statusbar.js b/addons/web_editor/static/lib/summernote/src/js/module/Statusbar.js
new file mode 100644
index 00000000000..b50fce458eb
--- /dev/null
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Statusbar.js
@@ -0,0 +1,44 @@
+define([
+ 'summernote/core/dom'
+], function (dom) {
+ var EDITABLE_PADDING = 24;
+
+ var Statusbar = function () {
+ var $document = $(document);
+
+ this.attach = function (layoutInfo, options) {
+ if (!options.disableResizeEditor) {
+ layoutInfo.statusbar().on('mousedown', hStatusbarMousedown);
+ }
+ };
+
+ /**
+ * `mousedown` event handler on statusbar
+ *
+ * @param {MouseEvent} event
+ */
+ var hStatusbarMousedown = function (event) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ var $editable = dom.makeLayoutInfo(event.target).editable();
+ var editableTop = $editable.offset().top - $document.scrollTop();
+
+ var layoutInfo = dom.makeLayoutInfo(event.currentTarget || event.target);
+ var options = layoutInfo.editor().data('options');
+
+ $document.on('mousemove', function (event) {
+ var nHeight = event.clientY - (editableTop + EDITABLE_PADDING);
+
+ nHeight = (options.minHeight > 0) ? Math.max(nHeight, options.minHeight) : nHeight;
+ nHeight = (options.maxHeight > 0) ? Math.min(nHeight, options.maxHeight) : nHeight;
+
+ $editable.height(nHeight);
+ }).one('mouseup', function () {
+ $document.off('mousemove');
+ });
+ };
+ };
+
+ return Statusbar;
+});
diff --git a/addons/web_editor/static/lib/summernote/src/js/module/Toolbar.js b/addons/web_editor/static/lib/summernote/src/js/module/Toolbar.js
index 832b7c4c561..5e5e5721b63 100644
--- a/addons/web_editor/static/lib/summernote/src/js/module/Toolbar.js
+++ b/addons/web_editor/static/lib/summernote/src/js/module/Toolbar.js
@@ -1,14 +1,17 @@
define([
'summernote/core/list',
+ 'summernote/core/dom',
'summernote/module/Button'
-], function (list, Button) {
+], function (list, dom, Button) {
/**
+ * @class module.Toolbar
+ *
* Toolbar
*/
var Toolbar = function () {
var button = new Button();
- this.button = button; // odoo change for overwrite
+ this.button = button; // ODOO: allow access for override
this.update = function ($toolbar, styleInfo) {
button.update($toolbar, styleInfo);
@@ -43,14 +46,54 @@ define([
.addClass('disabled');
};
+ /**
+ * @param {jQuery} $container
+ * @param {Boolean} [bFullscreen=false]
+ */
this.updateFullscreen = function ($container, bFullscreen) {
var $btn = $container.find('button[data-event="fullscreen"]');
$btn.toggleClass('active', bFullscreen);
};
+ /**
+ * @param {jQuery} $container
+ * @param {Boolean} [isCodeview=false]
+ */
this.updateCodeview = function ($container, isCodeview) {
var $btn = $container.find('button[data-event="codeview"]');
$btn.toggleClass('active', isCodeview);
+
+ if (isCodeview) {
+ this.deactivate($container);
+ } else {
+ this.activate($container);
+ }
+ };
+
+ /**
+ * get button in toolbar
+ *
+ * @param {jQuery} $editable
+ * @param {String} name
+ * @return {jQuery}
+ */
+ this.get = function ($editable, name) {
+ var $toolbar = dom.makeLayoutInfo($editable).toolbar();
+
+ return $toolbar.find('[data-name=' + name + ']');
+ };
+
+ /**
+ * set button state
+ * @param {jQuery} $editable
+ * @param {String} name
+ * @param {Boolean} [isActive=true]
+ */
+ this.setButtonState = function ($editable, name, isActive) {
+ isActive = (isActive === false) ? false : true;
+
+ var $button = this.get($editable, name);
+ $button.toggleClass('active', isActive);
};
};
diff --git a/addons/web_editor/static/lib/summernote/src/js/settings.js b/addons/web_editor/static/lib/summernote/src/js/settings.js
index 25d1bdf809a..f7b0c0c6379 100644
--- a/addons/web_editor/static/lib/summernote/src/js/settings.js
+++ b/addons/web_editor/static/lib/summernote/src/js/settings.js
@@ -1,10 +1,36 @@
-define('summernote/settings', function () {
- var settings = {
- // version
+define('summernote/defaults', function () {
+ /**
+ * @class defaults
+ *
+ * @singleton
+ */
+ var defaults = {
+ /** @property */
version: '@VERSION',
/**
- * options
+ *
+ * for event options, reference to EventHandler.attach
+ *
+ * @property {Object} options
+ * @property {String/Number} [options.width=null] set editor width
+ * @property {String/Number} [options.height=null] set editor height, ex) 300
+ * @property {String/Number} options.minHeight set minimum height of editor
+ * @property {String/Number} options.maxHeight
+ * @property {String/Number} options.focus
+ * @property {Number} options.tabsize
+ * @property {Boolean} options.styleWithSpan
+ * @property {Object} options.codemirror
+ * @property {Object} [options.codemirror.mode='text/html']
+ * @property {Object} [options.codemirror.htmlMode=true]
+ * @property {Object} [options.codemirror.lineNumbers=true]
+ * @property {String} [options.lang=en-US] language 'en-US', 'ko-KR', ...
+ * @property {String} [options.direction=null] text direction, ex) 'rtl'
+ * @property {Array} [options.toolbar]
+ * @property {Boolean} [options.airMode=false]
+ * @property {Array} [options.airPopover]
+ * @property {Fucntion} [options.onInit] initialize
+ * @property {Fucntion} [options.onsubmit]
*/
options: {
width: null, // set editor width
@@ -21,10 +47,84 @@ define('summernote/settings', function () {
disableLinkTarget: false, // hide link Target Checkbox
disableDragAndDrop: false, // disable drag and drop event
disableResizeEditor: false, // disable resizing editor
+ disableResizeImage: false, // disable resizing image
shortcuts: true, // enable keyboard shortcuts
+ textareaAutoSync: true, // enable textarea auto sync
+
placeholder: false, // enable placeholder text
+ prettifyHtml: true, // enable prettifying html while toggling codeview
+
+ iconPrefix: 'fa fa-', // prefix for css icon classes
+
+ icons: {
+ font: {
+ bold: 'bold',
+ italic: 'italic',
+ underline: 'underline',
+ clear: 'eraser',
+ height: 'text-height',
+ strikethrough: 'strikethrough',
+ superscript: 'superscript',
+ subscript: 'subscript'
+ },
+ image: {
+ image: 'picture-o',
+ floatLeft: 'align-left',
+ floatRight: 'align-right',
+ floatNone: 'align-justify',
+ shapeRounded: 'square',
+ shapeCircle: 'circle-o',
+ shapeThumbnail: 'picture-o',
+ shapeNone: 'times',
+ remove: 'trash-o'
+ },
+ link: {
+ link: 'link',
+ unlink: 'unlink',
+ edit: 'edit'
+ },
+ table: {
+ table: 'table'
+ },
+ hr: {
+ insert: 'minus'
+ },
+ style: {
+ style: 'magic'
+ },
+ lists: {
+ unordered: 'list-ul',
+ ordered: 'list-ol'
+ },
+ options: {
+ help: 'question',
+ fullscreen: 'arrows-alt',
+ codeview: 'code'
+ },
+ paragraph: {
+ paragraph: 'align-left',
+ outdent: 'outdent',
+ indent: 'indent',
+ left: 'align-left',
+ center: 'align-center',
+ right: 'align-right',
+ justify: 'align-justify'
+ },
+ color: {
+ recent: 'font'
+ },
+ history: {
+ undo: 'undo',
+ redo: 'repeat'
+ },
+ misc: {
+ check: 'check'
+ }
+ },
+
+ dialogsInBody: false, // false will add dialogs into editor
codemirror: { // codemirror options
mode: 'text/html',
@@ -40,7 +140,9 @@ define('summernote/settings', function () {
toolbar: [
['style', ['style']],
['font', ['bold', 'italic', 'underline', 'clear']],
+ // ['font', ['bold', 'italic', 'underline', 'strikethrough', 'superscript', 'subscript', 'clear']],
['fontname', ['fontname']],
+ ['fontsize', ['fontsize']],
['color', ['color']],
['para', ['ul', 'ol', 'paragraph']],
['height', ['height']],
@@ -50,6 +152,8 @@ define('summernote/settings', function () {
['help', ['help']]
],
+ plugin : { },
+
// air mode: inline editor
airMode: false,
// airPopover: [
@@ -80,9 +184,12 @@ define('summernote/settings', function () {
// fontName
fontNames: [
'Arial', 'Arial Black', 'Comic Sans MS', 'Courier New',
- 'Helvetica Neue', 'Impact', 'Lucida Grande',
+ 'Helvetica Neue', 'Helvetica', 'Impact', 'Lucida Grande',
'Tahoma', 'Times New Roman', 'Verdana'
],
+ fontNamesIgnoreCheck: [],
+
+ fontSizes: ['8', '9', '10', '11', '12', '14', '18', '24', '36'],
// pallete colors(n x n)
colors: [
@@ -117,6 +224,7 @@ define('summernote/settings', function () {
onkeydown: null, // keydown
onImageUpload: null, // imageUpload
onImageUploadError: null, // imageUploadError
+ onMediaDelete: null, // media delete
onToolbarClick: null,
onsubmit: null,
@@ -128,8 +236,6 @@ define('summernote/settings', function () {
onCreateLink: function (sLinkUrl) {
if (sLinkUrl.indexOf('@') !== -1 && sLinkUrl.indexOf(':') === -1) {
sLinkUrl = 'mailto:' + sLinkUrl;
- } else if (sLinkUrl.indexOf('://') === -1) {
- sLinkUrl = 'http://' + sLinkUrl;
}
return sLinkUrl;
@@ -207,7 +313,11 @@ define('summernote/settings', function () {
underline: 'Underline',
clear: 'Remove Font Style',
height: 'Line Height',
- name: 'Font Family'
+ name: 'Font Family',
+ strikethrough: 'Strikethrough',
+ subscript: 'Subscript',
+ superscript: 'Superscript',
+ size: 'Font Size'
},
image: {
image: 'Picture',
@@ -291,7 +401,8 @@ define('summernote/settings', function () {
textFormatting: 'Text formatting',
action: 'Action',
paragraphFormatting: 'Paragraph formatting',
- documentStyle: 'Document Style'
+ documentStyle: 'Document Style',
+ extraKeys: 'Extra keys'
},
history: {
undo: 'Undo',
@@ -301,5 +412,5 @@ define('summernote/settings', function () {
}
};
- return settings;
+ return defaults;
});
diff --git a/addons/web_editor/static/lib/summernote/src/js/summernote.js b/addons/web_editor/static/lib/summernote/src/js/summernote.js
index 791a9452e85..329ba7fa126 100644
--- a/addons/web_editor/static/lib/summernote/src/js/summernote.js
+++ b/addons/web_editor/static/lib/summernote/src/js/summernote.js
@@ -1,39 +1,140 @@
define([
- 'summernote/core/agent', 'summernote/core/dom',
+ 'summernote/core/agent',
+ 'summernote/core/list',
+ 'summernote/core/dom',
'summernote/core/range',
- 'summernote/settings',
- 'summernote/EventHandler', 'summernote/Renderer',
- 'summernote/core/list', // odoo change for overwrite
- 'summernote/core/key' // odoo change for overwrite
-], function (agent, dom, range, settings, EventHandler, Renderer, list, key) { // odoo change for overwrite
+ 'summernote/defaults',
+ 'summernote/EventHandler',
+ 'summernote/Renderer',
+ 'summernote/core/key' // ODOO: change for override
+], function (agent, list, dom, range,
+ defaults, EventHandler, Renderer, key) {
+
// jQuery namespace for summernote
+ /**
+ * @class $.summernote
+ *
+ * summernote attribute
+ *
+ * @mixin defaults
+ * @singleton
+ *
+ */
$.summernote = $.summernote || {};
- // extends default `settings`
- $.extend($.summernote, settings);
+ // extends default settings
+ // - $.summernote.version
+ // - $.summernote.options
+ // - $.summernote.lang
+ $.extend($.summernote, defaults);
var renderer = new Renderer();
var eventHandler = new EventHandler();
$.extend($.summernote, {
+ /** @property {Renderer} */
renderer: renderer,
+ /** @property {EventHandler} */
eventHandler: eventHandler,
+ /**
+ * @property {Object} core
+ * @property {core.agent} core.agent
+ * @property {core.dom} core.dom
+ * @property {core.range} core.range
+ */
core: {
agent: agent,
+ list : list,
dom: dom,
range: range,
- list: list, // odoo change for overwrite
- key: key // odoo change for overwrite
+ key: key // ODOO: change for override
},
- pluginEvents: {}
+ /**
+ * @property {Object}
+ * pluginEvents event list for plugins
+ * event has name and callback function.
+ *
+ * ```
+ * $.summernote.addPlugin({
+ * events : {
+ * 'hello' : function(layoutInfo, value, $target) {
+ * console.log('event name is hello, value is ' + value );
+ * }
+ * }
+ * })
+ * ```
+ *
+ * * event name is data-event property.
+ * * layoutInfo is a summernote layout information.
+ * * value is data-value property.
+ */
+ pluginEvents: {},
+
+ plugins : []
});
/**
- * addPlugin
+ * @method addPlugin
*
+ * add Plugin in Summernote
+ *
+ * Summernote can make a own plugin.
+ *
+ * ### Define plugin
+ * ```
+ * // get template function
+ * var tmpl = $.summernote.renderer.getTemplate();
+ *
+ * // add a button
+ * $.summernote.addPlugin({
+ * buttons : {
+ * // "hello" is button's namespace.
+ * "hello" : function(lang, options) {
+ * // make icon button by template function
+ * return tmpl.iconButton(options.iconPrefix + 'header', {
+ * // callback function name when button clicked
+ * event : 'hello',
+ * // set data-value property
+ * value : 'hello',
+ * hide : true
+ * });
+ * }
+ *
+ * },
+ *
+ * events : {
+ * "hello" : function(layoutInfo, value) {
+ * // here is event code
+ * }
+ * }
+ * });
+ * ```
+ * ### Use a plugin in toolbar
+ *
+ * ```
+ * $("#editor").summernote({
+ * ...
+ * toolbar : [
+ * // display hello plugin in toolbar
+ * ['group', [ 'hello' ]]
+ * ]
+ * ...
+ * });
+ * ```
+ *
+ *
* @param {Object} plugin
+ * @param {Object} [plugin.buttons] define plugin button. for detail, see to Renderer.addButtonInfo
+ * @param {Object} [plugin.dialogs] define plugin dialog. for detail, see to Renderer.addDialogInfo
+ * @param {Object} [plugin.events] add event in $.summernote.pluginEvents
+ * @param {Object} [plugin.langs] update $.summernote.lang
+ * @param {Object} [plugin.options] update $.summernote.options
*/
$.summernote.addPlugin = function (plugin) {
+
+ // save plugin list
+ $.summernote.plugins.push(plugin);
+
if (plugin.buttons) {
$.each(plugin.buttons, function (name, button) {
renderer.addButtonInfo(name, button);
@@ -65,107 +166,157 @@ define([
}
};
- /**
- * extend jquery fn
+ /*
+ * extend $.fn
*/
$.fn.extend({
/**
- * initialize summernote
+ * @method
+ * Initialize summernote
* - create editor layout and attach Mouse and keyboard events.
- *
- * @param {Object} options
- * @returns {this}
+ *
+ * ```
+ * $("#summernote").summernote( { options ..} );
+ * ```
+ *
+ * @member $.fn
+ * @param {Object|String} options reference to $.summernote.options
+ * @return {this}
*/
- summernote: function (options) {
- // extend default options
+ summernote: function () {
+ // check first argument's type
+ // - {String}: External API call {{module}}.{{method}}
+ // - {Object}: init options
+ var type = $.type(list.head(arguments));
+ var isExternalAPICalled = type === 'string';
+ var hasInitOptions = type === 'object';
+
+ // extend default options with custom user options
+ var options = hasInitOptions ? list.head(arguments) : {};
+
options = $.extend({}, $.summernote.options, options);
+ options.icons = $.extend({}, $.summernote.options.icons, options.icons);
// Include langInfo in options for later use, e.g. for image drag-n-drop
// Setup language info with en-US as default
options.langInfo = $.extend(true, {}, $.summernote.lang['en-US'], $.summernote.lang[options.lang]);
+ // override plugin options
+ if (!isExternalAPICalled && hasInitOptions) {
+ for (var i = 0, len = $.summernote.plugins.length; i < len; i++) {
+ var plugin = $.summernote.plugins[i];
+
+ if (options.plugin[plugin.name]) {
+ $.summernote.plugins[i] = $.extend(true, plugin, options.plugin[plugin.name]);
+ }
+ }
+ }
+
this.each(function (idx, holder) {
var $holder = $(holder);
- // createLayout with options
- renderer.createLayout($holder, options);
+ // if layout isn't created yet, createLayout and attach events
+ if (!renderer.hasNoteEditor($holder)) {
+ renderer.createLayout($holder, options);
- var info = renderer.layoutInfoFromHolder($holder);
- eventHandler.attach(info, options);
+ var layoutInfo = renderer.layoutInfoFromHolder($holder);
+ $holder.data('layoutInfo', layoutInfo);
- // Textarea: auto filling the code before form submit.
- if (dom.isTextarea($holder[0])) {
- $holder.closest('form').submit(function () {
- var contents = $holder.code();
- $holder.val(contents);
-
- // callback on submit
- if (options.onsubmit) {
- options.onsubmit(contents);
- }
- });
+ eventHandler.attach(layoutInfo, options);
+ eventHandler.attachCustomEvent(layoutInfo, options);
}
});
- // focus on first editable element
- if (this.first().length && options.focus) {
- var info = renderer.layoutInfoFromHolder(this.first());
- info.editable.focus();
- }
+ var $first = this.first();
+ if ($first.length) {
+ var layoutInfo = renderer.layoutInfoFromHolder($first);
- // callback on init
- if (this.length && options.oninit) {
- options.oninit();
+ // external API
+ if (isExternalAPICalled) {
+ var moduleAndMethod = list.head(list.from(arguments));
+ var args = list.tail(list.from(arguments));
+
+ // TODO now external API only works for editor
+ var params = [moduleAndMethod, layoutInfo.editable()].concat(args);
+ return eventHandler.invoke.apply(eventHandler, params);
+ } else if (options.focus) {
+ // focus on first editable element for initialize editor
+ layoutInfo.editable().focus();
+ }
}
return this;
},
- //
/**
+ * @method
+ *
* get the HTML contents of note or set the HTML contents of note.
*
- * @param {String} [sHTML] - HTML contents(optional, set)
- * @returns {this|String} - context(set) or HTML contents of note(get).
+ * * get contents
+ * ```
+ * var content = $("#summernote").code();
+ * ```
+ * * set contents
+ *
+ * ```
+ * $("#summernote").code(html);
+ * ```
+ *
+ * @member $.fn
+ * @param {String} [html] - HTML contents(optional, set)
+ * @return {this|String} - context(set) or HTML contents of note(get).
*/
- code: function (sHTML) {
+ code: function (html) {
// get the HTML contents of note
- if (sHTML === undefined) {
+ if (html === undefined) {
var $holder = this.first();
- if (!$holder.length) { return; }
- var info = renderer.layoutInfoFromHolder($holder);
- if (!!(info && info.editable)) {
- var isCodeview = info.editor.hasClass('codeview');
- if (isCodeview && agent.hasCodeMirror) {
- info.codable.data('cmEditor').save();
- }
- return isCodeview ? info.codable.val() : info.editable.html();
+ if (!$holder.length) {
+ return;
}
- return dom.isTextarea($holder[0]) ? $holder.val() : $holder.html();
+
+ var layoutInfo = renderer.layoutInfoFromHolder($holder);
+ var $editable = layoutInfo && layoutInfo.editable();
+
+ if ($editable && $editable.length) {
+ var isCodeview = eventHandler.invoke('codeview.isActivated', layoutInfo);
+ eventHandler.invoke('codeview.sync', layoutInfo);
+ return isCodeview ? layoutInfo.codable().val() :
+ layoutInfo.editable().html();
+ }
+ return dom.value($holder);
}
// set the HTML contents of note
this.each(function (i, holder) {
- var info = renderer.layoutInfoFromHolder($(holder));
- if (info && info.editable) { info.editable.html(sHTML); }
+ var layoutInfo = renderer.layoutInfoFromHolder($(holder));
+ var $editable = layoutInfo && layoutInfo.editable();
+ if ($editable) {
+ $editable.html(html);
+ }
});
return this;
},
/**
+ * @method
+ *
* destroy Editor Layout and detach Key and Mouse Event
*
- * @returns {this}
+ * @member $.fn
+ * @return {this}
*/
destroy: function () {
this.each(function (idx, holder) {
var $holder = $(holder);
- var info = renderer.layoutInfoFromHolder($holder);
- if (!info || !info.editable) { return; }
+ if (!renderer.hasNoteEditor($holder)) {
+ return;
+ }
- var options = info.editor.data('options');
+ var info = renderer.layoutInfoFromHolder($holder);
+ var options = info.editor().data('options');
eventHandler.detach(info, options);
renderer.removeLayout($holder, info, options);
diff --git a/addons/web_editor/static/lib/summernote/src/less/summernote.less b/addons/web_editor/static/lib/summernote/src/less/summernote.less
index c9c538e940d..806d1860ed7 100644
--- a/addons/web_editor/static/lib/summernote/src/less/summernote.less
+++ b/addons/web_editor/static/lib/summernote/src/less/summernote.less
@@ -1,4 +1,4 @@
-/* @_import "elements.less"; */
+/* @_import "elements.less"; ODOO: removed call directly */
/* Theme Variables
------------------------------------------*/
@@ -10,6 +10,7 @@
.note-editor {
border: 1px solid @border-color;
position: relative;
+ /* overflow: hidden; ODOO: removed for embedded editor */
/* dropzone */
@dropzone-color: lightskyblue;
@@ -17,8 +18,7 @@
.note-dropzone {
position: absolute;
display: none;
- z-index: 1;
- border: 2px dashed @dropzone-color;
+ z-index: 100;
color: @dropzone-color;
background-color: white;
opacity: 0.95;
@@ -33,7 +33,6 @@
}
&.hover {
- border: 2px dashed @dropzone-active-color;
color: @dropzone-active-color;
}
}
@@ -42,9 +41,16 @@
display: table;
}
- .note-toolbar {
- background-color: @background-color;
- border-bottom: 1px solid @border-color;
+ /* codeview mode */
+ &.codeview {
+ .note-editing-area {
+ .note-editable {
+ display: none;
+ }
+ .note-codable {
+ display: block;
+ }
+ }
}
/* fullscreen mode */
@@ -62,13 +68,43 @@
}
}
- /* codeview mode */
- &.codeview {
+ .note-editing-area {
+ position: relative;
+ overflow: hidden;
+
+ /* editable */
.note-editable {
- display: none;
+ background-color: #fff;
+ color: #000;
+ padding: 10px;
+ overflow: auto;
+ outline: none;
+
+ &[contenteditable=true]:empty:not(:focus):before {
+ content:attr(data-placeholder);
+ }
+ &[contenteditable="false"] {
+ background-color: #e5e5e5;
+ }
}
+
+ /* codeable */
.note-codable {
- display: block;
+ display: none;
+ width: 100%;
+ padding: 10px;
+ border: none;
+ box-shadow: none;
+ font-family: Menlo, Monaco, monospace, sans-serif;
+ font-size: 14px;
+ color: #ccc;
+ background-color: #222;
+ resize: none;
+
+ /* override BS2 default style */
+ .box-sizing(border-box);
+ .rounded(0);
+ margin-bottom: 0;
}
}
@@ -76,9 +112,9 @@
.note-statusbar {
background-color: @background-color;
.note-resizebar {
+ padding-top: 1px;
height: 8px;
width: 100%;
- border-top: 1px solid @border-color;
cursor: ns-resize;
.note-icon-bar {
width: 20px;
@@ -87,50 +123,16 @@
}
}
}
-
- /* editable */
- .note-editable[contenteditable=true]:empty:not(:focus):before {
- content:attr(data-placeholder);
- color: #a9a9a9;
- }
-
- .note-editable {
- padding: 10px;
- overflow: auto;
- outline: none;
- }
- .note-editable[contenteditable="false"] {
- background-color: #e5e5e5;
- }
-
- /* codeable */
- .note-codable {
- display: none;
- width: 100%;
- padding: 10px;
- border: none;
- box-shadow: none;
- font-family: Menlo, Monaco, monospace, sans-serif;
- font-size: 14px;
- color: #ccc;
- background-color: #222;
- resize: none;
-
- /* override BS2 default style */
- .box-sizing(border-box);
- .rounded(0);
- margin-bottom: 0;
- }
}
/* Air Mode Layout
- ------------------------------------------*/
+------------------------------------------*/
.note-air-editor {
outline: none;
}
/* Popover
- ------------------------------------------*/
+------------------------------------------*/
.note-popover .popover {
max-width: none;
.popover-content {
@@ -149,8 +151,8 @@
}
/* Popover and Toolbar (Button container)
- ------------------------------------------*/
-.note-popover .popover .popover-content, .note-toolbar {
+------------------------------------------*/
+.note-popover .popover .popover-content, .panel-heading.note-toolbar {
margin: 0;
padding: 0 0 5px 5px;
@@ -258,15 +260,17 @@
&::before { right: 9px; left: auto !important; }
&::after { right: 10px; left: auto !important; }
}
-
/* dropdown-menu for selectbox */
- li a i {
- color: deepskyblue;
- visibility: hidden;
- }
- li a.checked i {
- visibility: visible;
+ &.note-check {
+ li a i {
+ color: deepskyblue;
+ visibility: hidden;
+ }
+ li a.checked i {
+ visibility: visible;
+ }
}
+
}
.note-fontsize-10 {
@@ -292,7 +296,7 @@
}
/* Dialog
- ------------------------------------------*/
+------------------------------------------*/
.note-dialog {
&>div {
display: none; /* BS2's hide pacth. */
@@ -386,7 +390,7 @@
}
/* Handle
- ------------------------------------------*/
+------------------------------------------*/
.note-handle {
/* control selection */
.note-control-selection {
@@ -444,6 +448,12 @@
cursor: se-resize;
}
+ .note-control-se.note-control-holder {
+ cursor: default;
+ border-top: none;
+ border-left: none;
+ }
+
.note-control-selection-info {
right: 0;
bottom: 0;
diff --git a/addons/web_editor/static/src/js/rte.js b/addons/web_editor/static/src/js/rte.js
index 39f52c8c66b..6f210e005ee 100644
--- a/addons/web_editor/static/src/js/rte.js
+++ b/addons/web_editor/static/src/js/rte.js
@@ -144,7 +144,9 @@ var History = function History ($editable) {
this.recordUndo = function ($editable, event, internal_history) {
var self = this;
if (!$editable) {
- $editable = $(range.create().sc).closest(".o_editable");
+ var rng = range.create();
+ if(!rng) return;
+ $editable = $(rng.sc).closest(".o_editable");
}
if (aUndo[pos] && (event === "applySnap" || event === "activate")) {
diff --git a/addons/web_editor/static/src/js/rte.summernote.js b/addons/web_editor/static/src/js/rte.summernote.js
index dbce1a3757c..07af745e88c 100644
--- a/addons/web_editor/static/src/js/rte.summernote.js
+++ b/addons/web_editor/static/src/js/rte.summernote.js
@@ -31,6 +31,8 @@ var options = $.summernote.options;
var tplButton = renderer.getTemplate().button;
var tplIconButton = renderer.getTemplate().iconButton;
+var tplIconButton = renderer.getTemplate().iconButton;
+var tplDropdown = renderer.getTemplate().dropdown;
//////////////////////////////////////////////////////////////////////////////////////////////////////////
/* update and change the popovers content, and add history button */
@@ -83,16 +85,17 @@ renderer.tplPopovers = function (lang, options) {
// padding button
var $padding = $('');
$padding.insertBefore($imagePopover.find('.btn-group:first'));
+ var dropdown_content = [
+ ''+_t('None')+'',
+ ''+_t('Small')+'',
+ ''+_t('Medium')+'',
+ ''+_t('Large')+'',
+ ''+_t('Xl')+'',
+ ];
var $button = $(tplIconButton('fa fa-plus-square-o', {
title: _t('Padding'),
- dropdown: true
+ dropdown: tplDropdown(dropdown_content)
})).appendTo($padding);
- var $ul = $('').insertAfter($button);
- $ul.append(''+_t('None')+'');
- $ul.append(''+_t('Small')+'');
- $ul.append(''+_t('Medium')+'');
- $ul.append(''+_t('Large')+'');
- $ul.append(''+_t('Xl')+'');
// circle, boxed... options became toggled
$imagePopover.find('[data-event="imageShape"]:not([data-value])').remove();
@@ -178,8 +181,8 @@ renderer.tplPopovers = function (lang, options) {
return $popover;
};
-var fn_boutton_update = eventHandler.popover.button.update;
-eventHandler.popover.button.update = function ($container, oStyle) {
+var fn_boutton_update = eventHandler.modules.popover.button.update;
+eventHandler.modules.popover.button.update = function ($container, oStyle) {
// stop animation when edit content
var previous = $(".note-control-selection").data('target');
if (previous) {
@@ -247,15 +250,15 @@ eventHandler.popover.button.update = function ($container, oStyle) {
}
};
-var fn_popover_update = eventHandler.popover.update;
-eventHandler.popover.update = function ($popover, oStyle, isAirMode) {
+var fn_popover_update = eventHandler.modules.popover.update;
+eventHandler.modules.popover.update = function ($popover, oStyle, isAirMode) {
var $imagePopover = $popover.find('.note-image-popover');
var $linkPopover = $popover.find('.note-link-popover');
var $airPopover = $popover.find('.note-air-popover');
fn_popover_update.call(this, $popover, oStyle, isAirMode);
- if (!isAirMode || $(oStyle.range.sc).closest('[data-oe-model]:not([data-oe-model="ir.ui.view"]):not([data-oe-type="html"])').length) {
+ if (!isAirMode || (oStyle.range && $(oStyle.range.sc).closest('[data-oe-model]:not([data-oe-model="ir.ui.view"]):not([data-oe-type="html"])').length)) {
$imagePopover.hide();
$linkPopover.hide();
$airPopover.hide();
@@ -276,19 +279,22 @@ eventHandler.popover.update = function ($popover, oStyle, isAirMode) {
$(".note-control-selection").hide();
}
- if (oStyle.image || (!oStyle.range.isCollapsed() || (oStyle.range.sc.tagName && !dom.isAnchor(oStyle.range.sc)) || (oStyle.image && !$(oStyle.image).closest('a').length))) {
+ if (oStyle.image || (oStyle.range && (!oStyle.range.isCollapsed() || (oStyle.range.sc.tagName && !dom.isAnchor(oStyle.range.sc)))) || (oStyle.image && !$(oStyle.image).closest('a').length)) {
$linkPopover.hide();
oStyle.anchor = false;
}
- if (oStyle.image || oStyle.anchor || !$(oStyle.range.sc).closest('.note-editable').length) {
+ if (oStyle.image || oStyle.anchor || (oStyle.range && !$(oStyle.range.sc).closest('.note-editable').length)) {
$airPopover.hide();
} else {
$airPopover.show();
}
};
-eventHandler.handle.update = function ($handle, oStyle, isAirMode) {
+/* TODO: remove (original method seems enough now (only border-top,left is not done) */
+/*
+eventHandler.modules.handle.update = function ($handle, oStyle, isAirMode) {
+
$handle.toggle(!!oStyle.image);
if (oStyle.image) {
var $selection = $handle.find('.note-control-selection');
@@ -307,6 +313,7 @@ eventHandler.handle.update = function ($handle, oStyle, isAirMode) {
});
}
};
+*/
//////////////////////////////////////////////////////////////////////////////////////////////////////////
/* hack for image and link editor */
@@ -314,7 +321,7 @@ eventHandler.handle.update = function ($handle, oStyle, isAirMode) {
function getImgTarget () {
return $(".note-control-selection").data('target');
}
-eventHandler.editor.padding = function ($editable, sValue) {
+eventHandler.modules.editor.padding = function ($editable, sValue) {
var $target = $(getImgTarget());
var paddings = "small medium large xl".split(/\s+/);
$editable.data('NoteHistory').recordUndo();
@@ -324,7 +331,7 @@ eventHandler.editor.padding = function ($editable, sValue) {
}
$target.removeClass("padding-" + paddings.join(" padding-"));
};
-eventHandler.editor.resize = function ($editable, sValue) {
+eventHandler.modules.editor.resize = function ($editable, sValue) {
var $target = $(getImgTarget());
$editable.data('NoteHistory').recordUndo();
var width = ($target.attr('style') || '').match(/(^|;|\s)width:\s*([0-9]+)%/);
@@ -333,7 +340,7 @@ eventHandler.editor.resize = function ($editable, sValue) {
}
$(getImgTarget()).css('width', width != sValue ? (sValue * 100) + '%' : '');
};
-eventHandler.editor.resizefa = function ($editable, sValue) {
+eventHandler.modules.editor.resizefa = function ($editable, sValue) {
var $target = $(getImgTarget());
$editable.data('NoteHistory').recordUndo();
$target.attr('class', $target.attr('class').replace(/\s*fa-[0-9]+x/g, ''));
@@ -341,7 +348,7 @@ eventHandler.editor.resizefa = function ($editable, sValue) {
$target.addClass('fa-'+sValue+'x');
}
};
-eventHandler.editor.floatMe = function ($editable, sValue) {
+eventHandler.modules.editor.floatMe = function ($editable, sValue) {
var $target = $(getImgTarget());
$editable.data('NoteHistory').recordUndo();
switch (sValue) {
@@ -350,13 +357,13 @@ eventHandler.editor.floatMe = function ($editable, sValue) {
case 'right': $target.toggleClass('pull-right').removeClass('pull-left center-block'); break;
}
};
-eventHandler.editor.imageShape = function ($editable, sValue) {
+eventHandler.modules.editor.imageShape = function ($editable, sValue) {
var $target = $(getImgTarget());
$editable.data('NoteHistory').recordUndo();
$target.toggleClass(sValue);
};
-eventHandler.dialog.showLinkDialog = function ($editable, $dialog, linkInfo) {
+eventHandler.modules.linkDialog.showLinkDialog = function ($editable, $dialog, linkInfo) {
$editable.data('range').select();
$editable.data('NoteHistory').recordUndo();
@@ -376,7 +383,7 @@ eventHandler.dialog.showLinkDialog = function ($editable, $dialog, linkInfo) {
});
return def;
};
-eventHandler.dialog.showImageDialog = function ($editable) {
+eventHandler.modules.imageDialog.showImageDialog = function ($editable) {
var r = $editable.data('range');
if (r.sc.tagName && r.sc.childNodes.length) {
r.sc = r.sc.childNodes[r.so];
@@ -394,8 +401,9 @@ $.summernote.pluginEvents.alt = function (event, editor, layoutInfo, sorted) {
//////////////////////////////////////////////////////////////////////////////////////////////////////////
+var fn_is_void = dom.isVoid;
dom.isVoid = function (node) {
- return node && /^BR|^IMG|^HR/.test(node.nodeName.toUpperCase()) || dom.isImg(node);
+ return fn_is_void(node) || dom.isImgFont(node) || (node && node.className && node.className.match(/(^|\s)media_iframe_video(\s|$)/i));
};
dom.isImg = function (node) {
return dom.isImgFont(node) || (node && (node.nodeName === "IMG" || (node.className && node.className.match(/(^|\s)(media_iframe_video|o_image)(\s|$)/i)) ));
@@ -428,7 +436,9 @@ dom.isFont = function (node) {
var fn_visible = $.summernote.pluginEvents.visible;
$.summernote.pluginEvents.visible = function (event, editor, layoutInfo) {
var res = fn_visible.call(this, event, editor, layoutInfo);
- var $node = $(dom.node(range.create().sc));
+ var rng = range.create();
+ if(!rng) return res;
+ var $node = $(dom.node(rng.sc));
if (($node.is('[data-oe-type="html"]') || $node.is('[data-oe-field="arch"]')) &&
$node.hasClass("o_editable") &&
!$node[0].children.length &&
@@ -517,11 +527,11 @@ function summernote_mousedown (event) {
// remember_selection when click on non editable area
var r = range.create();
if ($(r ? dom.node(r.sc) : event.srcElement || event.target).closest('#web_editor-top-navbar, #oe_main_menu_navbar, .note-popover, .note-toolbar, .modal').length) {
- if (!$(event.target).is('input, select, label, button, a')) {
+ if (!$(event.target).is('input, select, label, button:not(.note-color-btn), a')) {
if (!remember_selection && $editable[0]) {
remember_selection = range.create(dom.firstChild($editable[0]), 0);
}
- if (!remember_selection && $editable[0]) {
+ if (remember_selection) {
try {
remember_selection.select();
} catch (e) {
@@ -605,19 +615,23 @@ function summernote_ie_fix (event, pred) {
var fn_attach = eventHandler.attach;
eventHandler.attach = function (oLayoutInfo, options) {
fn_attach.call(this, oLayoutInfo, options);
- oLayoutInfo.editor.on('dragstart', 'img', function (e) { e.preventDefault(); });
+ oLayoutInfo.editor().on('dragstart', 'img', function (e) { e.preventDefault(); });
$(document).on('mousedown', summernote_mousedown);
$(document).on('mouseup', summernote_mouseup);
- oLayoutInfo.editor.off('click').on('click', function (e) {e.preventDefault();}); // if the content editable is a link
- oLayoutInfo.editor.on('dblclick', 'img, .media_iframe_video, span.fa, i.fa, span.fa, a.o_image', function (event) {
+ oLayoutInfo.editor().off('click').on('click', function (e) {e.preventDefault();}); // if the content editable is a link
+ oLayoutInfo.editor().on('dblclick', 'img, .media_iframe_video, span.fa, i.fa, span.fa, a.o_image', function (event) {
if (!$(event.target).closest(".note-toolbar").length) { // prevent icon edition of top bar for default summernote
- new widgets.MediaDialog(oLayoutInfo.editor, event.target).appendTo(document.body);
+ new widgets.MediaDialog(oLayoutInfo.editor(), event.target).appendTo(document.body);
+ }
+ });
+ oLayoutInfo.editable().on('mousedown', function(e) {
+ if(dom.isImg(e.target)) {
+ range.createFromNode(e.target).select();
}
});
$(document).on("keyup", reRangeSelectKey);
-
var clone_data = false;
- var $node = oLayoutInfo.editor;
+ var $node = oLayoutInfo.editor();
if ($node.data('oe-model') || $node.data('oe-translation-id')) {
$node.on('content_changed', function () {
var $nodes = $('[data-oe-model], [data-oe-translation-id]')
@@ -658,25 +672,26 @@ eventHandler.attach = function (oLayoutInfo, options) {
});
}
- var $toolbar = $(oLayoutInfo.popover).add(oLayoutInfo.toolbar);
+ var custom_toolbar = oLayoutInfo.toolbar ? oLayoutInfo.toolbar() : undefined;
+ var $toolbar = $(oLayoutInfo.popover()).add(custom_toolbar);
$('button[data-event="undo"], button[data-event="redo"]', $toolbar).attr('disabled', true);
- $(oLayoutInfo.editor)
- .add(oLayoutInfo.handle)
- .add(oLayoutInfo.popover)
- .add(oLayoutInfo.toolbar)
+ $(oLayoutInfo.editor())
+ .add(oLayoutInfo.handle())
+ .add(oLayoutInfo.popover())
+ .add(custom_toolbar)
.on('click keyup', function () {
- $('button[data-event="undo"]', $toolbar).attr('disabled', !oLayoutInfo.editable.data('NoteHistory').hasUndo());
- $('button[data-event="redo"]', $toolbar).attr('disabled', !oLayoutInfo.editable.data('NoteHistory').hasRedo());
+ $('button[data-event="undo"]', $toolbar).attr('disabled', !oLayoutInfo.editable().data('NoteHistory').hasUndo());
+ $('button[data-event="redo"]', $toolbar).attr('disabled', !oLayoutInfo.editable().data('NoteHistory').hasRedo());
});
};
var fn_detach = eventHandler.detach;
-eventHandler.dettach = function (oLayoutInfo, options) {
+eventHandler.detach = function (oLayoutInfo, options) {
fn_detach.call(this, oLayoutInfo, options);
- oLayoutInfo.editor.off("dragstart");
+ oLayoutInfo.editor().off("dragstart");
$(document).off('mousedown', summernote_mousedown);
$(document).off('mouseup', summernote_mouseup);
- oLayoutInfo.editor.off("dblclick");
+ oLayoutInfo.editor().off("dblclick");
$(document).off("keyup", reRangeSelectKey);
};
diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js
index 59186188881..280a91cd1fd 100644
--- a/addons/web_editor/static/src/js/summernote.js
+++ b/addons/web_editor/static/src/js/summernote.js
@@ -554,7 +554,7 @@ dom.removeBetween = function (sc, so, ec, eo, towrite) {
var node = dom.node(sc);
- if (!dom.isNotBreakable(node)) {
+ if (!dom.isNotBreakable(node) && !dom.isVoid(sc)) {
sc = dom.splitTree(ancestor_sc, {'node': sc, 'offset': so});
}
var before = dom.hasContentBefore(dom.ancestorHavePreviousSibling(sc));
@@ -586,7 +586,9 @@ dom.removeBetween = function (sc, so, ec, eo, towrite) {
so = 0;
}
- if (towrite && !node.firstChild && node.parentNode && !dom.isNotBreakable(node)) {
+ if (dom.isVoid(node)) {
+ // we don't need to append a br
+ } else if (towrite && !node.firstChild && node.parentNode && !dom.isNotBreakable(node)) {
var br = $("
")[0];
node.appendChild(sc);
sc = br;
@@ -892,6 +894,47 @@ range.WrappedRange.prototype.deleteContents = function (towrite) {
prevBP.eo
);
};
+// isOnImg: judge whether range is an image node or not
+range.WrappedRange.prototype.isOnImg = function () {
+ var nb = 0;
+ var image;
+ var startPoint = {node: this.sc.childNodes.length && this.sc.childNodes[this.so] || this.sc};
+ startPoint.offset = startPoint.node === this.sc ? this.so : 0;
+ var endPoint = {node: this.ec.childNodes.length && this.ec.childNodes[this.eo] || this.ec};
+ endPoint.offset = endPoint.node === this.ec ? this.eo : 0;
+
+ if (dom.isImg(startPoint.node)) {
+ nb ++;
+ image = startPoint.node;
+ }
+ dom.walkPoint(startPoint, endPoint, function (point) {
+ if (!dom.isText(endPoint.node) && point.node === endPoint.node && point.offset === endPoint.offset) {
+ return;
+ }
+ var node = point.node.childNodes.length && point.node.childNodes[point.offset] || point.node;
+ var offset = node === point.node ? point.offset : 0;
+ var isImg = dom.ancestor(node, dom.isImg);
+ if (!isImg && ((!dom.isBR(node) && !dom.isText(node)) || (offset && node.textContent.length !== offset && node.textContent.match(/\S|\u00A0/)))) {
+ nb++;
+ }
+ if (isImg && image !== isImg) {
+ image = isImg;
+ nb ++;
+ }
+ });
+ return nb === 1 && image;
+};
+range.WrappedRange.prototype.deleteContents = function (towrite) {
+ var prevBP = dom.removeBetween(this.sc, this.so, this.ec, this.eo, towrite);
+
+ $(dom.node(prevBP.sc)).trigger("click"); // trigger click to disable and reanable editor and image handler
+ return new range.WrappedRange(
+ prevBP.sc,
+ prevBP.so,
+ prevBP.ec,
+ prevBP.eo
+ );
+};
range.WrappedRange.prototype.clean = function (mergeFilter, all) {
var node = dom.node(this.sc === this.ec ? this.sc : this.commonAncestor());
node = node || $(this.sc).closest('[contenteditable]')[0];
@@ -1142,7 +1185,7 @@ $.summernote.pluginEvents.visible = function (event, editor, layoutInfo) {
}
// don't write in forbidden tag (like span for font awsome)
- var node = dom.firstChild(r.sc.tagName && r.so ? r.sc.childNodes[r.so] : r.sc);
+ var node = dom.firstChild(r.sc.tagName && r.so ? r.sc.childNodes[r.so] || r.sc : r.sc);
while (node.parentNode) {
if (dom.isForbiddenNode(node)) {
var text = node.previousSibling;
@@ -1292,7 +1335,12 @@ $.summernote.pluginEvents.delete = function (event, editor, layoutInfo) {
dom.autoMerge(target, false);
var next = dom.firstChild(dom.hasContentAfter(dom.ancestorHaveNextSibling(target)));
if (dom.isBR(next)) {
- range.create(next.previousSibling, next.previousSibling.textContent.length).select();
+ if(dom.position(next) == 0) {
+ range.create(next.parentNode, 0).select();
+ }
+ else {
+ range.create(next.previousSibling, next.previousSibling.textContent.length).select();
+ }
next.parentNode.removeChild(next);
} else {
range.create(next, 0).select();
@@ -1383,10 +1431,16 @@ $.summernote.pluginEvents.backspace = function (event, editor, layoutInfo) {
var prevTr = dom.previousElementSibling(tr);
if (!$(temp.parentNode).text().match(/\S|\u00A0/)) {
if (prevTr) {
- tr.parentNode.removeChild(tr);
node = (dom.lastElementChild(prevTr).lastChild && dom.lastElementChild(prevTr).lastChild.tagName ? dom.lastElementChild(prevTr).lastChild.previousSibling : dom.lastElementChild(prevTr).lastChild) || dom.lastElementChild(prevTr);
- range.create(node, node.textContent.length, node, node.textContent.length).select();
+ } else {
+ node = dom.lastChild(dom.hasContentBefore(dom.ancestorHavePreviousSibling(tr)));
}
+ $(tr).empty();
+ if(!$(tr).closest('table').has('td, th').length) {
+ $(tr).closest('table').remove();
+ }
+ $(tr).remove();
+ range.create(node, node.textContent.length, node, node.textContent.length).select();
} else {
node = dom.lastElementChild(prevTr).lastChild || dom.lastElementChild(prevTr);
}
@@ -1793,8 +1847,8 @@ $.summernote.pluginEvents.removeFormat = function (event, editor, layoutInfo, va
event.preventDefault();
return false;
};
-var fn_boutton_updateRecentColor = eventHandler.toolbar.button.updateRecentColor;
-eventHandler.toolbar.button.updateRecentColor = function (elBtn, sEvent, sValue) {
+var fn_boutton_updateRecentColor = eventHandler.modules.toolbar.button.updateRecentColor;
+eventHandler.modules.toolbar.button.updateRecentColor = function (elBtn, sEvent, sValue) {
fn_boutton_updateRecentColor.call(this, elBtn, sEvent, sValue);
var font = $(elBtn).closest('.note-color').find('.note-recent-color i')[0];
@@ -1827,16 +1881,31 @@ $(document).on('click keyup', function () {
$('button[data-event="redo"]', editor).attr('disabled', !popover_history.hasRedo());
});
-eventHandler.editor.undo = function ($popover) {
+eventHandler.modules.editor.undo = function ($popover) {
if(!$popover.attr('disabled')) $popover.data('NoteHistory').undo();
};
-eventHandler.editor.redo = function ($popover) {
+eventHandler.modules.editor.redo = function ($popover) {
if(!$popover.attr('disabled')) $popover.data('NoteHistory').redo();
};
+// use image toolbar if current range is on image
+var fn_editor_currentstyle = eventHandler.modules.editor.currentStyle;
+eventHandler.modules.editor.currentStyle = function(target) {
+ var styleInfo = fn_editor_currentstyle.apply(this, arguments);
+ // with our changes for inline editor, the targeted element could be a button of the editor
+ if(!styleInfo.image || !dom.isEditable(styleInfo.image)) {
+ styleInfo.image = undefined;
+ var rng = range.create();
+ if(rng)
+ styleInfo.image = rng.isOnImg();
+ }
+ return styleInfo;
+}
+
options.fontSizes = [_t('Default'), 8, 9, 10, 11, 12, 14, 18, 24, 36, 48, 62];
$.summernote.pluginEvents.applyFont = function (event, editor, layoutInfo, color, bgcolor, size) {
var rng = range.create();
+ if(!rng) return;
var startPoint = rng.getStartPoint();
var endPoint = rng.getEndPoint();
@@ -2208,8 +2277,8 @@ function summernote_table_update (oStyle) {
'color': '#00ff00'
});
}
-var fn_popover_update = eventHandler.popover.update;
-eventHandler.popover.update = function ($popover, oStyle, isAirMode) {
+var fn_popover_update = eventHandler.modules.popover.update;
+eventHandler.modules.popover.update = function ($popover, oStyle, isAirMode) {
fn_popover_update.call(this, $popover, oStyle, isAirMode);
if(!!(isAirMode ? $popover : $popover.parent()).find('.note-table').length) {
summernote_table_update(oStyle);
@@ -2249,16 +2318,16 @@ function summernote_paste (event) {
var fn_attach = eventHandler.attach;
eventHandler.attach = function (oLayoutInfo, options) {
- var $editable = oLayoutInfo.editor.hasClass('note-editable') ? oLayoutInfo.editor : oLayoutInfo.editor.find('.note-editable');
+ var $editable = oLayoutInfo.editor().hasClass('note-editable') ? oLayoutInfo.editor() : oLayoutInfo.editor().find('.note-editable');
fn_attach.call(this, oLayoutInfo, options);
- oLayoutInfo.editor.on("paste", summernote_paste);
+ oLayoutInfo.editor().on("paste", summernote_paste);
$editable.on("scroll", summernote_table_scroll);
};
var fn_detach = eventHandler.detach;
eventHandler.detach = function (oLayoutInfo, options) {
- var $editable = oLayoutInfo.editor.hasClass('note-editable') ? oLayoutInfo.editor : oLayoutInfo.editor.find('.note-editable');
+ var $editable = oLayoutInfo.editor().hasClass('note-editable') ? oLayoutInfo.editor() : oLayoutInfo.editor().find('.note-editable');
fn_detach.call(this, oLayoutInfo, options);
- oLayoutInfo.editor.off("paste", summernote_paste);
+ oLayoutInfo.editor().off("paste", summernote_paste);
$editable.off("scroll", summernote_table_scroll);
$('.o_table_handler').remove();
};
diff --git a/addons/web_editor/views/editor.xml b/addons/web_editor/views/editor.xml
index 571e1747f67..4daca69cb2e 100644
--- a/addons/web_editor/views/editor.xml
+++ b/addons/web_editor/views/editor.xml
@@ -34,56 +34,16 @@
};
})();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+