- Fix: Ensure setupCurPrefs is run (including when source or

`url` is set within the URL)
This commit is contained in:
Brett Zamir
2020-01-05 11:11:44 +08:00
parent d0d7efabc4
commit 711cfc4ecc
2 changed files with 4 additions and 2 deletions

View File

@@ -20,6 +20,8 @@
- Fix: Misspelling for `dropXMLInternalSubset` method (also fixes - Fix: Misspelling for `dropXMLInternalSubset` method (also fixes
use in imagelib when defaulting to image's title) use in imagelib when defaulting to image's title)
- Fix: Redirect paths for imagelib redirect checks - Fix: Redirect paths for imagelib redirect checks
- Fix: Ensure `setupCurPrefs` is run (including when `source` or
`url` is set within the URL)
- Optimization: Remove unused `jquery-ui-1.8.custom.min.js` file - Optimization: Remove unused `jquery-ui-1.8.custom.min.js` file
- Localization: Add 'SVG-Edit Home Page' to locale files - Localization: Add 'SVG-Edit Home Page' to locale files
- Refactoring: Switch from `$.param.querystring` to `URL` - Refactoring: Switch from `$.param.querystring` to `URL`

View File

@@ -521,7 +521,7 @@ editor.setConfig = function (opts, cfgCfg) {
if (!{}.hasOwnProperty.call(opts, key)) { if (!{}.hasOwnProperty.call(opts, key)) {
return; return;
} }
// Only allow prefs defined in defaultPrefs // Only allow prefs defined in defaultPrefs or...
if ({}.hasOwnProperty.call(defaultPrefs, key)) { if ({}.hasOwnProperty.call(defaultPrefs, key)) {
if (cfgCfg.overwrite === false && ( if (cfgCfg.overwrite === false && (
curConfig.preventAllURLConfig || curConfig.preventAllURLConfig ||
@@ -792,8 +792,8 @@ editor.init = function () {
setupCurConfig(); setupCurConfig();
editor.loadContentAndPrefs(); editor.loadContentAndPrefs();
} }
setupCurPrefs();
})(); })();
setupCurPrefs();
/** /**
* Called internally. * Called internally.