github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fix: Background URL was not settable back to nothing; fixes #376

Browse Source
This commit is contained in:
Brett Zamir
2020-01-04 22:32:52 +08:00
parent 0029a932b2
commit e356b95a03
13 changed files with 148 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
editor/svg-editor.js
View File

@@ -387,8 +387,11 @@ function getImportLocale ({defaultLang, defaultName}) {
/**
* Store and retrieve preferences.
* @param {string} key The preference name to be retrieved or set
* @param {string} [val] The value. If the value supplied is missing or falsey, no change to the preference will be made.
* @returns {string|void} If val is missing or falsey, the value of the previously stored preference will be returned.
* @param {string} [val] The value. If the value supplied is missing or falsey, no change to the preference will
* be made unless `mayBeEmpty` is set.
* @param {boolean} [mayBeEmpty] If value may be falsey.
* @returns {string|void} If val is missing or falsey and `mayBeEmpty` is not set, the
* value of the previously stored preference will be returned.
* @todo Can we change setting on the jQuery namespace (onto editor) to avoid conflicts?
* @todo Review whether any remaining existing direct references to
* getting `curPrefs` can be changed to use `$.pref()` getting to ensure
@@ -396,8 +399,8 @@ function getImportLocale ({defaultLang, defaultName}) {
* the pref dialog has a button to auto-calculate background, but otherwise uses `$.pref()` to be able to get default prefs
* or overridable settings
*/
$.pref = function (key, val) {
if (val) {
$.pref = function (key, val, mayBeEmpty) {
if (mayBeEmpty || val) {
curPrefs[key] = val;
/**
* @name curPrefs
@@ -1893,7 +1896,7 @@ editor.init = function () {
function setBackground (color, url) {
// if (color == $.pref('bkgd_color') && url == $.pref('bkgd_url')) { return; }
$.pref('bkgd_color', color);
$.pref('bkgd_url', url);
$.pref('bkgd_url', url, true);
// This should be done in svgcanvas.js for the borderRect fill
svgCanvas.setBackground(color, url);

21
editor/xdomain-svgedit-config-iife.js
View File

@@ -7977,13 +7977,13 @@
};
/**
* Used to prevent the [Billion laughs attack]{@link https://en.wikipedia.org/wiki/Billion_laughs_attack}.
* @function module:utilities.dropXMLInteralSubset
* @function module:utilities.dropXMLInternalSubset
* @param {string} str String to be processed
* @returns {string} The string with entity declarations in the internal subset removed
* @todo This might be needed in other places `parseFromString` is used even without LGTM flagging
*/
var dropXMLInteralSubset = function dropXMLInteralSubset(str) {
var dropXMLInternalSubset = function dropXMLInternalSubset(str) {
return str.replace(/(<!DOCTYPE\s+\w*\s*\[).*(\?]>)/, '$1$2'); // return str.replace(/(?<doctypeOpen><!DOCTYPE\s+\w*\s*\[).*(?<doctypeClose>\?\]>)/, '$<doctypeOpen>$<doctypeClose>');
};
/**
@@ -21734,7 +21734,7 @@
* @property {module:history.HistoryCommand} BatchCommand
* @property {module:history.HistoryCommand} ChangeElementCommand
* @property {module:utilities.decode64} decode64
* @property {module:utilities.dropXMLInteralSubset} dropXMLInteralSubset
* @property {module:utilities.dropXMLInternalSubset} dropXMLInternalSubset
* @property {module:utilities.encode64} encode64
* @property {module:svgcanvas~ffClone} ffClone
* @property {module:svgcanvas~findDuplicateGradient} findDuplicateGradient
@@ -21776,7 +21776,7 @@
BatchCommand: BatchCommand$1,
ChangeElementCommand: ChangeElementCommand$1,
decode64: decode64,
dropXMLInteralSubset: dropXMLInteralSubset,
dropXMLInternalSubset: dropXMLInternalSubset,
encode64: encode64,
ffClone: ffClone,
findDefs: findDefs,
@@ -29271,8 +29271,11 @@
/**
* Store and retrieve preferences.
* @param {string} key The preference name to be retrieved or set
* @param {string} [val] The value. If the value supplied is missing or falsey, no change to the preference will be made.
* @returns {string|void} If val is missing or falsey, the value of the previously stored preference will be returned.
* @param {string} [val] The value. If the value supplied is missing or falsey, no change to the preference will
* be made unless `mayBeEmpty` is set.
* @param {boolean} [mayBeEmpty] If value may be falsey.
* @returns {string|void} If val is missing or falsey and `mayBeEmpty` is not set, the
* value of the previously stored preference will be returned.
* @todo Can we change setting on the jQuery namespace (onto editor) to avoid conflicts?
* @todo Review whether any remaining existing direct references to
* getting `curPrefs` can be changed to use `$.pref()` getting to ensure
@@ -29282,8 +29285,8 @@
*/
$$b.pref = function (key, val) {
if (val) {
$$b.pref = function (key, val, mayBeEmpty) {
if (mayBeEmpty || val) {
curPrefs[key] = val;
/**
* @name curPrefs
@@ -30923,7 +30926,7 @@
function setBackground(color, url) {
// if (color == $.pref('bkgd_color') && url == $.pref('bkgd_url')) { return; }
$$b.pref('bkgd_color', color);
$$b.pref('bkgd_url', url); // This should be done in svgcanvas.js for the borderRect fill
$$b.pref('bkgd_url', url, true); // This should be done in svgcanvas.js for the borderRect fill
svgCanvas.setBackground(color, url);
}