parent
9fcdebac44
commit
1be01bc89a
|
@ -79,7 +79,7 @@ var svgEditorExtension_imagelib = (function () {
|
|||
browser = $('#imgbrowse');
|
||||
var allLibs = imagelibStrings.select_lib;
|
||||
var libOpts = $('<ul id=imglib_opts>').appendTo(browser);
|
||||
var frame = $('<iframe/>').prependTo(browser).hide().wrap('<div id=lib_framewrap>');
|
||||
var frame = $('<iframe src="javascript:0"/>').prependTo(browser).hide().wrap('<div id=lib_framewrap>');
|
||||
var header = $('<h1>').prependTo(browser).text(allLibs).css({
|
||||
position: 'absolute',
|
||||
top: 0,
|
||||
|
|
|
@ -4903,7 +4903,7 @@ var svgEditorExtension_server_moinsave = (function () {
|
|||
|
||||
/* const target = */
|
||||
|
||||
$("<iframe name=\"output_frame\" title=\"".concat(strings.hiddenframe, "\"\n style=\"width: 0; height: 0;\" src=\"#\"/>")).appendTo('body');
|
||||
$("<iframe name=\"output_frame\" title=\"".concat(strings.hiddenframe, "\"\n style=\"width: 0; height: 0;\" src=\"data:text/html;base64,PGh0bWw+PC9odG1sPg==\"/>")).appendTo('body');
|
||||
svgEditor.setCustomHandlers({
|
||||
save: function () {
|
||||
var _save = _asyncToGenerator(
|
||||
|
|
|
@ -5038,7 +5038,7 @@ var svgEditorExtension_server_opensave = (function () {
|
|||
cancelled = false; // Hiding by size instead of display to avoid FF console errors
|
||||
// with `getBBox` in browser.js `supportsPathBBox_`)
|
||||
|
||||
$("<iframe name=\"output_frame\" title=\"".concat(strings.hiddenframe, "\"\n style=\"width: 0; height: 0;\" src=\"#\"/>")).appendTo('body');
|
||||
$("<iframe name=\"output_frame\" title=\"".concat(strings.hiddenframe, "\"\n style=\"width: 0; height: 0;\" src=\"data:text/html;base64,PGh0bWw+\"/>")).appendTo('body');
|
||||
svgEditor.setCustomHandlers({
|
||||
save: function save(win, data) {
|
||||
var svg = '<?xml version="1.0" encoding="UTF-8"?>\n' + data,
|
||||
|
|
|
@ -322,13 +322,13 @@
|
|||
var source = arguments[i] != null ? arguments[i] : {};
|
||||
|
||||
if (i % 2) {
|
||||
ownKeys(source, true).forEach(function (key) {
|
||||
ownKeys(Object(source), true).forEach(function (key) {
|
||||
_defineProperty(target, key, source[key]);
|
||||
});
|
||||
} else if (Object.getOwnPropertyDescriptors) {
|
||||
Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
|
||||
} else {
|
||||
ownKeys(source).forEach(function (key) {
|
||||
ownKeys(Object(source)).forEach(function (key) {
|
||||
Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
|
||||
});
|
||||
}
|
||||
|
@ -939,7 +939,10 @@
|
|||
/**
|
||||
* @private
|
||||
* @static
|
||||
function _DOMfromJMLOrString (childNodeJML) {
|
||||
*/
|
||||
|
||||
/**
|
||||
* function _DOMfromJMLOrString (childNodeJML) {
|
||||
if (typeof childNodeJML === 'string') {
|
||||
return doc.createTextNode(childNodeJML);
|
||||
}
|
||||
|
|
|
@ -15717,6 +15717,14 @@ function SvgCanvas(container, config) {
|
|||
case 'fhpath':
|
||||
start.x = realX;
|
||||
start.y = realY;
|
||||
controllPoint1 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
controllPoint2 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
started = true;
|
||||
dAttr = realX + ',' + realY + ' '; // Commented out as doing nothing now:
|
||||
// strokeW = parseFloat(curShape.stroke_width) === 0 ? 1 : curShape.stroke_width;
|
||||
|
@ -21746,7 +21754,29 @@ function SvgCanvas(container, config) {
|
|||
var bg = getElem('canvasBackground');
|
||||
var border = $$9(bg).find('rect')[0];
|
||||
var bgImg = getElem('background_image');
|
||||
border.setAttribute('fill', color);
|
||||
var bgPattern = getElem('background_pattern');
|
||||
border.setAttribute('fill', color === 'chessboard' ? '#fff' : color);
|
||||
|
||||
if (color === 'chessboard') {
|
||||
if (!bgPattern) {
|
||||
bgPattern = svgdoc.createElementNS(NS.SVG, 'foreignObject');
|
||||
assignAttributes(bgPattern, {
|
||||
id: 'background_pattern',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
preserveAspectRatio: 'xMinYMin',
|
||||
style: 'pointer-events:none'
|
||||
});
|
||||
var div = document.createElement('div');
|
||||
assignAttributes(div, {
|
||||
style: 'pointer-events:none;width:100%;height:100%;background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);'
|
||||
});
|
||||
bgPattern.appendChild(div);
|
||||
bg.append(bgPattern);
|
||||
}
|
||||
} else if (bgPattern) {
|
||||
bgPattern.remove();
|
||||
}
|
||||
|
||||
if (url) {
|
||||
if (!bgImg) {
|
||||
|
@ -27513,7 +27543,7 @@ var jPicker = function jPicker($) {
|
|||
* @property {"left"|"center"|"right"|"screenCenter"|Float} window.position.x Relative px value
|
||||
* @property {"top"|"bottom"|"center"|Float} window.position.y Relative px value
|
||||
* @property {boolean} window.expandable Defaults to large static picker - set to `true` to make an expandable
|
||||
* picker (small icon with popup) - set automatically when binded to input element
|
||||
* picker (small icon with popup) - set automatically when binded to input element; added by `$.fn.jPicker`
|
||||
* @property {boolean} window.liveUpdate Set `false` if you want the user to have to click "OK" before the
|
||||
* binded input box updates values (always `true` for expandable picker)
|
||||
* @property {boolean} window.alphaSupport Set to `true` to enable alpha picking
|
||||
|
@ -27521,7 +27551,6 @@ var jPicker = function jPicker($) {
|
|||
* not map directly to percentage integers - range 0-2
|
||||
* @property {boolean} window.updateInputColor Set to `false` to prevent binded input colors from changing
|
||||
* @property {boolean} [window.bindToInput] Added by `$.fn.jPicker`
|
||||
* @property {boolean} [window.expandable] Added by `$.fn.jPicker`
|
||||
* @property {external:jQuery} [window.input] Added by `$.fn.jPicker`
|
||||
* @property {PlainObject} color
|
||||
* @property {"h"|"s"|"v"|"r"|"g"|"b"|"a"} color.mode Symbols stand for "h" (hue), "s" (saturation), "v" (value), "r" (red), "g" (green), "b" (blue), "a" (alpha)
|
||||
|
@ -27994,6 +28023,8 @@ var setStrings = function setStrings(type, obj, ids) {
|
|||
|
||||
if (!val) {
|
||||
console.log(sel); // eslint-disable-line no-console
|
||||
|
||||
return; // keep old text when has no translation
|
||||
}
|
||||
|
||||
if (ids) {
|
||||
|
@ -31788,8 +31819,7 @@ editor.init = function () {
|
|||
shower.attr('data-curopt', btnOpts[0].sel);
|
||||
}
|
||||
|
||||
var timer;
|
||||
var pos = $$b(showSel).position(); // Clicking the "show" icon should set the current mode
|
||||
var timer; // Clicking the "show" icon should set the current mode
|
||||
|
||||
shower.mousedown(function (evt) {
|
||||
if (shower.hasClass('disabled')) {
|
||||
|
@ -31797,6 +31827,7 @@ editor.init = function () {
|
|||
}
|
||||
|
||||
var holder = $$b(holdSel);
|
||||
var pos = $$b(showSel).position();
|
||||
var l = pos.left + 34;
|
||||
var w = holder.width() * -1;
|
||||
var time = holder.data('shown_popop') ? 200 : 0;
|
||||
|
@ -32513,13 +32544,15 @@ editor.init = function () {
|
|||
str += '<div class="palette_item" style="background-color: ' + item + ';" data-rgb="' + item + '"></div>';
|
||||
});
|
||||
$$b('#palette').append(str); // Set up editor background functionality
|
||||
// TODO add checkerboard as "pattern"
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000']; // ,'url(data:image/gif;base64,R0lGODlhEAAQAIAAAP%2F%2F%2F9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG%2Bgq4jM3IFLJgpswNly%2FXkcBpIiVaInlLJr9FZWAQA7)'];
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000', 'chessboard'];
|
||||
str = '';
|
||||
$$b.each(colorBlocks, function () {
|
||||
str += '<div class="color_block" style="background-color:' + this + ';"></div>';
|
||||
$$b.each(colorBlocks, function (i, e) {
|
||||
if (e === 'chessboard') {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);"></div>';
|
||||
} else {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-color:' + e + ';"></div>';
|
||||
}
|
||||
});
|
||||
$$b('#bg_blocks').append(str);
|
||||
var blocks = $$b('#bg_blocks div');
|
||||
|
@ -33885,12 +33918,8 @@ editor.init = function () {
|
|||
var url = editor.pref('bkgd_url');
|
||||
blocks.each(function () {
|
||||
var blk = $$b(this);
|
||||
var isBg = blk.css('background-color') === canvasBg;
|
||||
var isBg = blk.data('bgcolor') === canvasBg;
|
||||
blk.toggleClass(curBg, isBg);
|
||||
|
||||
if (isBg) {
|
||||
$$b('#canvas_bg_url').removeClass(curBg);
|
||||
}
|
||||
});
|
||||
|
||||
if (!canvasBg) {
|
||||
|
@ -34089,7 +34118,7 @@ editor.init = function () {
|
|||
switch (_context11.prev = _context11.next) {
|
||||
case 0:
|
||||
// Set background
|
||||
color = $$b('#bg_blocks div.cur_background').css('background-color') || '#FFF';
|
||||
color = $$b('#bg_blocks div.cur_background').data('bgcolor') || '#FFF';
|
||||
setBackground(color, $$b('#canvas_bg_url').val()); // set language
|
||||
|
||||
lang = $$b('#lang_select').val();
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -15723,6 +15723,14 @@
|
|||
case 'fhpath':
|
||||
start.x = realX;
|
||||
start.y = realY;
|
||||
controllPoint1 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
controllPoint2 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
started = true;
|
||||
dAttr = realX + ',' + realY + ' '; // Commented out as doing nothing now:
|
||||
// strokeW = parseFloat(curShape.stroke_width) === 0 ? 1 : curShape.stroke_width;
|
||||
|
@ -21752,7 +21760,29 @@
|
|||
var bg = getElem('canvasBackground');
|
||||
var border = $$9(bg).find('rect')[0];
|
||||
var bgImg = getElem('background_image');
|
||||
border.setAttribute('fill', color);
|
||||
var bgPattern = getElem('background_pattern');
|
||||
border.setAttribute('fill', color === 'chessboard' ? '#fff' : color);
|
||||
|
||||
if (color === 'chessboard') {
|
||||
if (!bgPattern) {
|
||||
bgPattern = svgdoc.createElementNS(NS.SVG, 'foreignObject');
|
||||
assignAttributes(bgPattern, {
|
||||
id: 'background_pattern',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
preserveAspectRatio: 'xMinYMin',
|
||||
style: 'pointer-events:none'
|
||||
});
|
||||
var div = document.createElement('div');
|
||||
assignAttributes(div, {
|
||||
style: 'pointer-events:none;width:100%;height:100%;background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);'
|
||||
});
|
||||
bgPattern.appendChild(div);
|
||||
bg.append(bgPattern);
|
||||
}
|
||||
} else if (bgPattern) {
|
||||
bgPattern.remove();
|
||||
}
|
||||
|
||||
if (url) {
|
||||
if (!bgImg) {
|
||||
|
@ -27519,7 +27549,7 @@
|
|||
* @property {"left"|"center"|"right"|"screenCenter"|Float} window.position.x Relative px value
|
||||
* @property {"top"|"bottom"|"center"|Float} window.position.y Relative px value
|
||||
* @property {boolean} window.expandable Defaults to large static picker - set to `true` to make an expandable
|
||||
* picker (small icon with popup) - set automatically when binded to input element
|
||||
* picker (small icon with popup) - set automatically when binded to input element; added by `$.fn.jPicker`
|
||||
* @property {boolean} window.liveUpdate Set `false` if you want the user to have to click "OK" before the
|
||||
* binded input box updates values (always `true` for expandable picker)
|
||||
* @property {boolean} window.alphaSupport Set to `true` to enable alpha picking
|
||||
|
@ -27527,7 +27557,6 @@
|
|||
* not map directly to percentage integers - range 0-2
|
||||
* @property {boolean} window.updateInputColor Set to `false` to prevent binded input colors from changing
|
||||
* @property {boolean} [window.bindToInput] Added by `$.fn.jPicker`
|
||||
* @property {boolean} [window.expandable] Added by `$.fn.jPicker`
|
||||
* @property {external:jQuery} [window.input] Added by `$.fn.jPicker`
|
||||
* @property {PlainObject} color
|
||||
* @property {"h"|"s"|"v"|"r"|"g"|"b"|"a"} color.mode Symbols stand for "h" (hue), "s" (saturation), "v" (value), "r" (red), "g" (green), "b" (blue), "a" (alpha)
|
||||
|
@ -28000,6 +28029,8 @@
|
|||
|
||||
if (!val) {
|
||||
console.log(sel); // eslint-disable-line no-console
|
||||
|
||||
return; // keep old text when has no translation
|
||||
}
|
||||
|
||||
if (ids) {
|
||||
|
@ -31794,8 +31825,7 @@
|
|||
shower.attr('data-curopt', btnOpts[0].sel);
|
||||
}
|
||||
|
||||
var timer;
|
||||
var pos = $$b(showSel).position(); // Clicking the "show" icon should set the current mode
|
||||
var timer; // Clicking the "show" icon should set the current mode
|
||||
|
||||
shower.mousedown(function (evt) {
|
||||
if (shower.hasClass('disabled')) {
|
||||
|
@ -31803,6 +31833,7 @@
|
|||
}
|
||||
|
||||
var holder = $$b(holdSel);
|
||||
var pos = $$b(showSel).position();
|
||||
var l = pos.left + 34;
|
||||
var w = holder.width() * -1;
|
||||
var time = holder.data('shown_popop') ? 200 : 0;
|
||||
|
@ -32519,13 +32550,15 @@
|
|||
str += '<div class="palette_item" style="background-color: ' + item + ';" data-rgb="' + item + '"></div>';
|
||||
});
|
||||
$$b('#palette').append(str); // Set up editor background functionality
|
||||
// TODO add checkerboard as "pattern"
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000']; // ,'url(data:image/gif;base64,R0lGODlhEAAQAIAAAP%2F%2F%2F9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG%2Bgq4jM3IFLJgpswNly%2FXkcBpIiVaInlLJr9FZWAQA7)'];
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000', 'chessboard'];
|
||||
str = '';
|
||||
$$b.each(colorBlocks, function () {
|
||||
str += '<div class="color_block" style="background-color:' + this + ';"></div>';
|
||||
$$b.each(colorBlocks, function (i, e) {
|
||||
if (e === 'chessboard') {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);"></div>';
|
||||
} else {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-color:' + e + ';"></div>';
|
||||
}
|
||||
});
|
||||
$$b('#bg_blocks').append(str);
|
||||
var blocks = $$b('#bg_blocks div');
|
||||
|
@ -33891,12 +33924,8 @@
|
|||
var url = editor.pref('bkgd_url');
|
||||
blocks.each(function () {
|
||||
var blk = $$b(this);
|
||||
var isBg = blk.css('background-color') === canvasBg;
|
||||
var isBg = blk.data('bgcolor') === canvasBg;
|
||||
blk.toggleClass(curBg, isBg);
|
||||
|
||||
if (isBg) {
|
||||
$$b('#canvas_bg_url').removeClass(curBg);
|
||||
}
|
||||
});
|
||||
|
||||
if (!canvasBg) {
|
||||
|
@ -34095,7 +34124,7 @@
|
|||
switch (_context11.prev = _context11.next) {
|
||||
case 0:
|
||||
// Set background
|
||||
color = $$b('#bg_blocks div.cur_background').css('background-color') || '#FFF';
|
||||
color = $$b('#bg_blocks div.cur_background').data('bgcolor') || '#FFF';
|
||||
setBackground(color, $$b('#canvas_bg_url').val()); // set language
|
||||
|
||||
lang = $$b('#lang_select').val();
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -591,6 +591,18 @@
|
|||
pdf.setFont('courier');
|
||||
break;
|
||||
|
||||
case 'times':
|
||||
pdf.setFont('times');
|
||||
break;
|
||||
|
||||
case 'courier':
|
||||
pdf.setFont('courier');
|
||||
break;
|
||||
|
||||
case 'helvetica':
|
||||
pdf.setFont('helvetica');
|
||||
break;
|
||||
|
||||
default:
|
||||
node.setAttribute('font-family', 'sans-serif');
|
||||
pdf.setFont('helvetica');
|
||||
|
|
|
@ -15407,6 +15407,14 @@ var SvgCanvas = (function () {
|
|||
case 'fhpath':
|
||||
start.x = realX;
|
||||
start.y = realY;
|
||||
controllPoint1 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
controllPoint2 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
started = true;
|
||||
dAttr = realX + ',' + realY + ' '; // Commented out as doing nothing now:
|
||||
// strokeW = parseFloat(curShape.stroke_width) === 0 ? 1 : curShape.stroke_width;
|
||||
|
@ -21436,7 +21444,29 @@ var SvgCanvas = (function () {
|
|||
var bg = getElem('canvasBackground');
|
||||
var border = $$8(bg).find('rect')[0];
|
||||
var bgImg = getElem('background_image');
|
||||
border.setAttribute('fill', color);
|
||||
var bgPattern = getElem('background_pattern');
|
||||
border.setAttribute('fill', color === 'chessboard' ? '#fff' : color);
|
||||
|
||||
if (color === 'chessboard') {
|
||||
if (!bgPattern) {
|
||||
bgPattern = svgdoc.createElementNS(NS.SVG, 'foreignObject');
|
||||
assignAttributes(bgPattern, {
|
||||
id: 'background_pattern',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
preserveAspectRatio: 'xMinYMin',
|
||||
style: 'pointer-events:none'
|
||||
});
|
||||
var div = document.createElement('div');
|
||||
assignAttributes(div, {
|
||||
style: 'pointer-events:none;width:100%;height:100%;background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);'
|
||||
});
|
||||
bgPattern.appendChild(div);
|
||||
bg.append(bgPattern);
|
||||
}
|
||||
} else if (bgPattern) {
|
||||
bgPattern.remove();
|
||||
}
|
||||
|
||||
if (url) {
|
||||
if (!bgImg) {
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -363,6 +363,9 @@
|
|||
<li style="font-family:cursive">Cursive</li>
|
||||
<li style="font-family:fantasy">Fantasy</li>
|
||||
<li style="font-family:monospace">Monospace</li>
|
||||
<li style="font-family:courier">Courier</li>
|
||||
<li style="font-family:helvetica">Helvetica</li>
|
||||
<li style="font-family:times">Times</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -363,6 +363,9 @@
|
|||
<li style="font-family:cursive">Cursive</li>
|
||||
<li style="font-family:fantasy">Fantasy</li>
|
||||
<li style="font-family:monospace">Monospace</li>
|
||||
<li style="font-family:courier">Courier</li>
|
||||
<li style="font-family:helvetica">Helvetica</li>
|
||||
<li style="font-family:times">Times</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -363,6 +363,9 @@
|
|||
<li style="font-family:cursive">Cursive</li>
|
||||
<li style="font-family:fantasy">Fantasy</li>
|
||||
<li style="font-family:monospace">Monospace</li>
|
||||
<li style="font-family:courier">Courier</li>
|
||||
<li style="font-family:helvetica">Helvetica</li>
|
||||
<li style="font-family:times">Times</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -15720,6 +15720,14 @@
|
|||
case 'fhpath':
|
||||
start.x = realX;
|
||||
start.y = realY;
|
||||
controllPoint1 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
controllPoint2 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
started = true;
|
||||
dAttr = realX + ',' + realY + ' '; // Commented out as doing nothing now:
|
||||
// strokeW = parseFloat(curShape.stroke_width) === 0 ? 1 : curShape.stroke_width;
|
||||
|
@ -21749,7 +21757,29 @@
|
|||
var bg = getElem('canvasBackground');
|
||||
var border = $$9(bg).find('rect')[0];
|
||||
var bgImg = getElem('background_image');
|
||||
border.setAttribute('fill', color);
|
||||
var bgPattern = getElem('background_pattern');
|
||||
border.setAttribute('fill', color === 'chessboard' ? '#fff' : color);
|
||||
|
||||
if (color === 'chessboard') {
|
||||
if (!bgPattern) {
|
||||
bgPattern = svgdoc.createElementNS(NS.SVG, 'foreignObject');
|
||||
assignAttributes(bgPattern, {
|
||||
id: 'background_pattern',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
preserveAspectRatio: 'xMinYMin',
|
||||
style: 'pointer-events:none'
|
||||
});
|
||||
var div = document.createElement('div');
|
||||
assignAttributes(div, {
|
||||
style: 'pointer-events:none;width:100%;height:100%;background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);'
|
||||
});
|
||||
bgPattern.appendChild(div);
|
||||
bg.append(bgPattern);
|
||||
}
|
||||
} else if (bgPattern) {
|
||||
bgPattern.remove();
|
||||
}
|
||||
|
||||
if (url) {
|
||||
if (!bgImg) {
|
||||
|
@ -27516,7 +27546,7 @@
|
|||
* @property {"left"|"center"|"right"|"screenCenter"|Float} window.position.x Relative px value
|
||||
* @property {"top"|"bottom"|"center"|Float} window.position.y Relative px value
|
||||
* @property {boolean} window.expandable Defaults to large static picker - set to `true` to make an expandable
|
||||
* picker (small icon with popup) - set automatically when binded to input element
|
||||
* picker (small icon with popup) - set automatically when binded to input element; added by `$.fn.jPicker`
|
||||
* @property {boolean} window.liveUpdate Set `false` if you want the user to have to click "OK" before the
|
||||
* binded input box updates values (always `true` for expandable picker)
|
||||
* @property {boolean} window.alphaSupport Set to `true` to enable alpha picking
|
||||
|
@ -27524,7 +27554,6 @@
|
|||
* not map directly to percentage integers - range 0-2
|
||||
* @property {boolean} window.updateInputColor Set to `false` to prevent binded input colors from changing
|
||||
* @property {boolean} [window.bindToInput] Added by `$.fn.jPicker`
|
||||
* @property {boolean} [window.expandable] Added by `$.fn.jPicker`
|
||||
* @property {external:jQuery} [window.input] Added by `$.fn.jPicker`
|
||||
* @property {PlainObject} color
|
||||
* @property {"h"|"s"|"v"|"r"|"g"|"b"|"a"} color.mode Symbols stand for "h" (hue), "s" (saturation), "v" (value), "r" (red), "g" (green), "b" (blue), "a" (alpha)
|
||||
|
@ -27997,6 +28026,8 @@
|
|||
|
||||
if (!val) {
|
||||
console.log(sel); // eslint-disable-line no-console
|
||||
|
||||
return; // keep old text when has no translation
|
||||
}
|
||||
|
||||
if (ids) {
|
||||
|
@ -31791,8 +31822,7 @@
|
|||
shower.attr('data-curopt', btnOpts[0].sel);
|
||||
}
|
||||
|
||||
var timer;
|
||||
var pos = $$b(showSel).position(); // Clicking the "show" icon should set the current mode
|
||||
var timer; // Clicking the "show" icon should set the current mode
|
||||
|
||||
shower.mousedown(function (evt) {
|
||||
if (shower.hasClass('disabled')) {
|
||||
|
@ -31800,6 +31830,7 @@
|
|||
}
|
||||
|
||||
var holder = $$b(holdSel);
|
||||
var pos = $$b(showSel).position();
|
||||
var l = pos.left + 34;
|
||||
var w = holder.width() * -1;
|
||||
var time = holder.data('shown_popop') ? 200 : 0;
|
||||
|
@ -32516,13 +32547,15 @@
|
|||
str += '<div class="palette_item" style="background-color: ' + item + ';" data-rgb="' + item + '"></div>';
|
||||
});
|
||||
$$b('#palette').append(str); // Set up editor background functionality
|
||||
// TODO add checkerboard as "pattern"
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000']; // ,'url(data:image/gif;base64,R0lGODlhEAAQAIAAAP%2F%2F%2F9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG%2Bgq4jM3IFLJgpswNly%2FXkcBpIiVaInlLJr9FZWAQA7)'];
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000', 'chessboard'];
|
||||
str = '';
|
||||
$$b.each(colorBlocks, function () {
|
||||
str += '<div class="color_block" style="background-color:' + this + ';"></div>';
|
||||
$$b.each(colorBlocks, function (i, e) {
|
||||
if (e === 'chessboard') {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);"></div>';
|
||||
} else {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-color:' + e + ';"></div>';
|
||||
}
|
||||
});
|
||||
$$b('#bg_blocks').append(str);
|
||||
var blocks = $$b('#bg_blocks div');
|
||||
|
@ -33888,12 +33921,8 @@
|
|||
var url = editor.pref('bkgd_url');
|
||||
blocks.each(function () {
|
||||
var blk = $$b(this);
|
||||
var isBg = blk.css('background-color') === canvasBg;
|
||||
var isBg = blk.data('bgcolor') === canvasBg;
|
||||
blk.toggleClass(curBg, isBg);
|
||||
|
||||
if (isBg) {
|
||||
$$b('#canvas_bg_url').removeClass(curBg);
|
||||
}
|
||||
});
|
||||
|
||||
if (!canvasBg) {
|
||||
|
@ -34092,7 +34121,7 @@
|
|||
switch (_context11.prev = _context11.next) {
|
||||
case 0:
|
||||
// Set background
|
||||
color = $$b('#bg_blocks div.cur_background').css('background-color') || '#FFF';
|
||||
color = $$b('#bg_blocks div.cur_background').data('bgcolor') || '#FFF';
|
||||
setBackground(color, $$b('#canvas_bg_url').val()); // set language
|
||||
|
||||
lang = $$b('#lang_select').val();
|
||||
|
|
|
@ -4468,9 +4468,9 @@
|
|||
}
|
||||
},
|
||||
"eslint-plugin-jsdoc": {
|
||||
"version": "20.0.3",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-20.0.3.tgz",
|
||||
"integrity": "sha512-h/f9skf8oFmYg7jJfV2P43ciBV78q0dxkpnL++zPJrbuV4ZRCSlFmQWjjlNgNfYLGfAl166SNjGg7veEEVX9oA==",
|
||||
"version": "20.0.5",
|
||||
"resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-20.0.5.tgz",
|
||||
"integrity": "sha512-hSGCKkrydrwfwlSo+6BEHZ8tUm4SwJ+96dINdDGn5jYwmiQOkAq+aYVOusVjVGWSJ/kKqDJCWVp99jt8K6Prkw==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"comment-parser": "^0.7.2",
|
||||
|
@ -11260,9 +11260,9 @@
|
|||
}
|
||||
},
|
||||
"rollup": {
|
||||
"version": "1.28.0",
|
||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.28.0.tgz",
|
||||
"integrity": "sha512-v2J/DmQi9+Nf6frGqzwZRvbiuTTrqH0yzoUF4Eybf8sONT4UpLZzJYnYzW96Zm9X1+4SJmijfnFBWCzHDAXYnQ==",
|
||||
"version": "1.29.0",
|
||||
"resolved": "https://registry.npmjs.org/rollup/-/rollup-1.29.0.tgz",
|
||||
"integrity": "sha512-V63Iz0dSdI5qPPN5HmCN6OBRzBFhMqNWcvwgq863JtSCTU6Vdvqq6S2fYle/dSCyoPrBkIP3EIr1RVs3HTRqqg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"@types/estree": "*",
|
||||
|
|
|
@ -149,7 +149,7 @@
|
|||
"eslint-plugin-eslint-comments": "^3.1.2",
|
||||
"eslint-plugin-html": "^6.0.0",
|
||||
"eslint-plugin-import": "^2.19.1",
|
||||
"eslint-plugin-jsdoc": "^20.0.3",
|
||||
"eslint-plugin-jsdoc": "^20.0.5",
|
||||
"eslint-plugin-markdown": "^1.0.1",
|
||||
"eslint-plugin-no-unsanitized": "^3.0.2",
|
||||
"eslint-plugin-no-use-extend-native": "^0.4.1",
|
||||
|
@ -181,7 +181,7 @@
|
|||
"remark-cli": "^7.0.1",
|
||||
"remark-lint-ordered-list-marker-value": "^1.0.4",
|
||||
"rimraf": "^3.0.0",
|
||||
"rollup": "1.28.0",
|
||||
"rollup": "1.29.0",
|
||||
"rollup-plugin-babel": "^4.3.3",
|
||||
"rollup-plugin-re": "^1.0.7",
|
||||
"rollup-plugin-terser": "^5.1.3",
|
||||
|
|
|
@ -15720,6 +15720,14 @@
|
|||
case 'fhpath':
|
||||
start.x = realX;
|
||||
start.y = realY;
|
||||
controllPoint1 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
controllPoint2 = {
|
||||
x: 0,
|
||||
y: 0
|
||||
};
|
||||
started = true;
|
||||
dAttr = realX + ',' + realY + ' '; // Commented out as doing nothing now:
|
||||
// strokeW = parseFloat(curShape.stroke_width) === 0 ? 1 : curShape.stroke_width;
|
||||
|
@ -21749,7 +21757,29 @@
|
|||
var bg = getElem('canvasBackground');
|
||||
var border = $$9(bg).find('rect')[0];
|
||||
var bgImg = getElem('background_image');
|
||||
border.setAttribute('fill', color);
|
||||
var bgPattern = getElem('background_pattern');
|
||||
border.setAttribute('fill', color === 'chessboard' ? '#fff' : color);
|
||||
|
||||
if (color === 'chessboard') {
|
||||
if (!bgPattern) {
|
||||
bgPattern = svgdoc.createElementNS(NS.SVG, 'foreignObject');
|
||||
assignAttributes(bgPattern, {
|
||||
id: 'background_pattern',
|
||||
width: '100%',
|
||||
height: '100%',
|
||||
preserveAspectRatio: 'xMinYMin',
|
||||
style: 'pointer-events:none'
|
||||
});
|
||||
var div = document.createElement('div');
|
||||
assignAttributes(div, {
|
||||
style: 'pointer-events:none;width:100%;height:100%;background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);'
|
||||
});
|
||||
bgPattern.appendChild(div);
|
||||
bg.append(bgPattern);
|
||||
}
|
||||
} else if (bgPattern) {
|
||||
bgPattern.remove();
|
||||
}
|
||||
|
||||
if (url) {
|
||||
if (!bgImg) {
|
||||
|
@ -27516,7 +27546,7 @@
|
|||
* @property {"left"|"center"|"right"|"screenCenter"|Float} window.position.x Relative px value
|
||||
* @property {"top"|"bottom"|"center"|Float} window.position.y Relative px value
|
||||
* @property {boolean} window.expandable Defaults to large static picker - set to `true` to make an expandable
|
||||
* picker (small icon with popup) - set automatically when binded to input element
|
||||
* picker (small icon with popup) - set automatically when binded to input element; added by `$.fn.jPicker`
|
||||
* @property {boolean} window.liveUpdate Set `false` if you want the user to have to click "OK" before the
|
||||
* binded input box updates values (always `true` for expandable picker)
|
||||
* @property {boolean} window.alphaSupport Set to `true` to enable alpha picking
|
||||
|
@ -27524,7 +27554,6 @@
|
|||
* not map directly to percentage integers - range 0-2
|
||||
* @property {boolean} window.updateInputColor Set to `false` to prevent binded input colors from changing
|
||||
* @property {boolean} [window.bindToInput] Added by `$.fn.jPicker`
|
||||
* @property {boolean} [window.expandable] Added by `$.fn.jPicker`
|
||||
* @property {external:jQuery} [window.input] Added by `$.fn.jPicker`
|
||||
* @property {PlainObject} color
|
||||
* @property {"h"|"s"|"v"|"r"|"g"|"b"|"a"} color.mode Symbols stand for "h" (hue), "s" (saturation), "v" (value), "r" (red), "g" (green), "b" (blue), "a" (alpha)
|
||||
|
@ -27997,6 +28026,8 @@
|
|||
|
||||
if (!val) {
|
||||
console.log(sel); // eslint-disable-line no-console
|
||||
|
||||
return; // keep old text when has no translation
|
||||
}
|
||||
|
||||
if (ids) {
|
||||
|
@ -31791,8 +31822,7 @@
|
|||
shower.attr('data-curopt', btnOpts[0].sel);
|
||||
}
|
||||
|
||||
var timer;
|
||||
var pos = $$b(showSel).position(); // Clicking the "show" icon should set the current mode
|
||||
var timer; // Clicking the "show" icon should set the current mode
|
||||
|
||||
shower.mousedown(function (evt) {
|
||||
if (shower.hasClass('disabled')) {
|
||||
|
@ -31800,6 +31830,7 @@
|
|||
}
|
||||
|
||||
var holder = $$b(holdSel);
|
||||
var pos = $$b(showSel).position();
|
||||
var l = pos.left + 34;
|
||||
var w = holder.width() * -1;
|
||||
var time = holder.data('shown_popop') ? 200 : 0;
|
||||
|
@ -32516,13 +32547,15 @@
|
|||
str += '<div class="palette_item" style="background-color: ' + item + ';" data-rgb="' + item + '"></div>';
|
||||
});
|
||||
$$b('#palette').append(str); // Set up editor background functionality
|
||||
// TODO add checkerboard as "pattern"
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000']; // ,'url(data:image/gif;base64,R0lGODlhEAAQAIAAAP%2F%2F%2F9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG%2Bgq4jM3IFLJgpswNly%2FXkcBpIiVaInlLJr9FZWAQA7)'];
|
||||
|
||||
var colorBlocks = ['#FFF', '#888', '#000', 'chessboard'];
|
||||
str = '';
|
||||
$$b.each(colorBlocks, function () {
|
||||
str += '<div class="color_block" style="background-color:' + this + ';"></div>';
|
||||
$$b.each(colorBlocks, function (i, e) {
|
||||
if (e === 'chessboard') {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-image:url(data:image/gif;base64,R0lGODlhEAAQAIAAAP///9bW1iH5BAAAAAAALAAAAAAQABAAAAIfjG+gq4jM3IFLJgpswNly/XkcBpIiVaInlLJr9FZWAQA7);"></div>';
|
||||
} else {
|
||||
str += '<div class="color_block" data-bgcolor="' + e + '" style="background-color:' + e + ';"></div>';
|
||||
}
|
||||
});
|
||||
$$b('#bg_blocks').append(str);
|
||||
var blocks = $$b('#bg_blocks div');
|
||||
|
@ -33888,12 +33921,8 @@
|
|||
var url = editor.pref('bkgd_url');
|
||||
blocks.each(function () {
|
||||
var blk = $$b(this);
|
||||
var isBg = blk.css('background-color') === canvasBg;
|
||||
var isBg = blk.data('bgcolor') === canvasBg;
|
||||
blk.toggleClass(curBg, isBg);
|
||||
|
||||
if (isBg) {
|
||||
$$b('#canvas_bg_url').removeClass(curBg);
|
||||
}
|
||||
});
|
||||
|
||||
if (!canvasBg) {
|
||||
|
@ -34092,7 +34121,7 @@
|
|||
switch (_context11.prev = _context11.next) {
|
||||
case 0:
|
||||
// Set background
|
||||
color = $$b('#bg_blocks div.cur_background').css('background-color') || '#FFF';
|
||||
color = $$b('#bg_blocks div.cur_background').data('bgcolor') || '#FFF';
|
||||
setBackground(color, $$b('#canvas_bg_url').val()); // set language
|
||||
|
||||
lang = $$b('#lang_select').val();
|
||||
|
|
Loading…
Reference in New Issue