- Security fix: 'extPath', 'imgPath', 'extIconsPath', 'canvgPath', 'langPath', 'jGraduatePath', and 'jspdfPath' were not being prevented
- Breaking change: Rename "svgutils.js" to "utilities.js" (make in conformity with JSDoc module naming convention) - Breaking change: Rename "svgedit.js" to "namespaces.js" (to make clear purpose and avoid confusing with editor) - Breaking change: Rename "jquery-svg.js" to "jQuery.attr.js" - Breaking change: Rename "jquery.contextMenu.js" to "jQuery.contextMenu.js" - Breaking change: Rename "jquery.jpicker.js" to "jQuery.jPicker.js" - Breaking change: Rename "JQuerySpinBtn.css" to "jQuery.SpinButton.css" - Breaking change: Rename "JQuerySpinBtn.js" to "jQuery.SpinButton.js" (to have file name more closely reflect name) - Breaking change: Rename "jquery.svgicons.js" to "jQuery.svgIcons.js" - Breaking change: Rename "jquery.jgraduate.js" to "jQuery.jGraduate.js" - Breaking change: Rename "pathseg.js" to "svgpathseg.js" (as it is a poyfill of SVGPathSeg) - Breaking change: Rename `addSvgElementFromJson()` to `addSVGElementFromJson` for consistency - Breaking change: Rename `changeSvgContent()` to `changeSVGContent()` for consistency - Breaking change: Have `exportPDF` resolve with `output` and `outputType` rather than `dataurlstring` (as type may vary) - Breaking change: Rename `extensions/mathjax/MathJax.js` to `extensions/mathjax/MathJax.min.js` - Breaking change: Avoid recent change to have editor ready callbacks return Promises (we're not using and advantageous to keep sequential) - Breaking change: Avoid recent addition of locale-side function in ext-imagelib for l10n - Breaking change: Change name of ext-arrows.js from `Arrows` to `arrows` for sake of file path (not localized anyways). - Breaking change: Change `addlangData` extension event to `addLangData` for consistency with method name - Breaking change: Have `readLang` return lang and data but do not call `setLang` - Fix: Have general locales load first so extensions may use - Fix: Provide `importLocale` to extensions `init` so it may delay adding of the extension until locale data loaded - Fix: Ensure call to `rasterExport` without `imgType` properly sets MIME type to PNG - Fix: Wrong name for moinsave - Update: Update WebAppFind per new API changes - Enhancement: Make `setStrings` public on editor for late setting (used by `ext-shapes.js`) - Enhancement: Add `extensions_added` event - Enhancement: Add `message` event (Relay messages including those which have been been received prior to extension load) - Enhancement: Allow SVGEdit to work out of the box--avoid need for copying sample config file. Should also help with Github-based file servers - Enhancement: Allow avoiding "name" in extension export (just extract out of file name) - Enhancement: Add stack blur to canvg by default (and refactoring it) - Enhancement: Return `Promise` for `embedImage` (as with some other loading methods) - Enhancement: Supply `importLocale` to `langReady` to facilitate extension locale loading - Enhancement: Recover if an extension fails to load (just log and otherwise ignore) - Enhancement: More i18n of extensions (also fixed issue with some console warnings about missing locale strings); i18nize Hello World too - Enhancement: Allowing importing of locales within `addLangData` - npm: Update devDeps - Docs: Migrate copies of all old wiki pages to docs/from-old-wiki folder; intended for a possible move to Markdown, so raw HTML (with formatting) was not preserved, though named links had their absolute URL links preserved - Docs: Begin deleting `SvgCanvas.md` as ensuring jsdoc has replacements - Docs: Add Edtior doc file for help to general users - Docs: Clarify/simplify install instructions - npm/Docs (JSDoc): Add script to check for overly generic types - Docs (JSDoc): For config/prefs and extension creating, link to tutorials (moved tutorials to own directory to avoid recursion problems by jsdoc) - Docs (JSDoc): Add modules (upper case for usual main entrance files or regular names) - Docs (JSDoc): Fill out missing areas; indicate return of `undefined`; consistency with `@returns` - Docs (JSDoc): Add our own layout template to support overflow - Docs (JSDoc): Use cleverLinks and disallow unknown tags - Docs (JSDoc): Insist on "pedantic" flag; put output directory in config - Docs (JSDoc): Use more precise Integer/Float over number, the specific type of array/function/object - Docs (JSDoc): Use `@throws`, `@enum`, `@event`/`@fires`/`@listens` - Docs: Generally update/improve docs (fixes #92) - Docs: Update links to `latest` path (Avoid needing to update such references upon each release) - Docs: 80 chars max - Refactoring: Drop code for extension as function (already requiring export to be an object) - Refactoring: Object destructuring, `Object.entries`, Object shorthand, array extras, more camelCase variable names - Refactoring: Add a `Command` base class - Refactoring: Simplify svgicons `callback` ready detection - Refactoring: Put `let` or `const` closer to scope - Refactoring: Remove unneeded `delimiter` from regex escaping utility - Refactoring: Clearer variable names - Refactoring: Use (non-deprecated) Event constructors - Testing: Use new Sinon
This commit is contained in:
@@ -1,20 +1,17 @@
|
||||
/*
|
||||
/**
|
||||
* SVG Icon Loader 2.0
|
||||
*
|
||||
* jQuery Plugin for loading SVG icons from a single file
|
||||
*
|
||||
* Copyright (c) 2009 Alexis Deveria
|
||||
* http://a.deveria.com
|
||||
* Adds {@link external:jQuery.svgIcons}, {@link external:jQuery.getSvgIcon}, {@link external:jQuery.resizeSvgIcons}
|
||||
*
|
||||
* MIT License
|
||||
|
||||
How to use:
|
||||
* How to use:
|
||||
|
||||
1. Create the SVG master file that includes all icons:
|
||||
|
||||
The master SVG icon-containing file is an SVG file that contains
|
||||
<g> elements. Each <g> element should contain the markup of an SVG
|
||||
icon. The <g> element has an ID that should
|
||||
`<g>` elements. Each `<g>` element should contain the markup of an SVG
|
||||
icon. The `<g>` element has an ID that should
|
||||
correspond with the ID of the HTML element used on the page that should contain
|
||||
or optionally be replaced by the icon. Additionally, one empty element should be
|
||||
added at the end with id "svg_eof".
|
||||
@@ -23,56 +20,21 @@ added at the end with id "svg_eof".
|
||||
|
||||
3. Include the jQuery and the SVG Icon Loader scripts on your page.
|
||||
|
||||
4. Run $.svgIcons() when the document is ready:
|
||||
|
||||
$.svgIcons( file [string], options [object literal]);
|
||||
|
||||
File is the location of a local SVG or SVGz file.
|
||||
|
||||
All options are optional and can include:
|
||||
|
||||
- 'w (number)': The icon widths
|
||||
|
||||
- 'h (number)': The icon heights
|
||||
|
||||
- 'fallback (object literal)': List of raster images with each
|
||||
key being the SVG icon ID to replace, and the value the image file name.
|
||||
|
||||
- 'fallback_path (string)': The path to use for all images
|
||||
listed under "fallback"
|
||||
|
||||
- 'replace (boolean)': If set to true, HTML elements will be replaced by,
|
||||
rather than include the SVG icon.
|
||||
|
||||
- 'placement (object literal)': List with selectors for keys and SVG icon ids
|
||||
as values. This provides a custom method of adding icons.
|
||||
|
||||
- 'resize (object literal)': List with selectors for keys and numbers
|
||||
as values. This allows an easy way to resize specific icons.
|
||||
|
||||
- 'callback (function)': A function to call when all icons have been loaded.
|
||||
Includes an object literal as its argument with as keys all icon IDs and the
|
||||
icon as a jQuery object as its value.
|
||||
|
||||
- 'id_match (boolean)': Automatically attempt to match SVG icon ids with
|
||||
corresponding HTML id (default: true)
|
||||
|
||||
- 'no_img (boolean)': Prevent attempting to convert the icon into an <img>
|
||||
element (may be faster, help for browser consistency)
|
||||
|
||||
- 'svgz (boolean)': Indicate that the file is an SVGZ file, and thus not to
|
||||
parse as XML. SVGZ files add compression benefits, but getting data from
|
||||
them fails in Firefox 2 and older.
|
||||
4. Run `$.svgIcons()` when the document is ready. See its signature
|
||||
|
||||
5. To access an icon at a later point without using the callback, use this:
|
||||
$.getSvgIcon(id (string));
|
||||
`$.getSvgIcon(id (string), uniqueClone (boolean))`;
|
||||
|
||||
This will return the icon (as jQuery object) with a given ID.
|
||||
|
||||
6. To resize icons at a later point without using the callback, use this:
|
||||
$.resizeSvgIcons(resizeOptions) (use the same way as the "resize" parameter)
|
||||
|
||||
Example usage #1:
|
||||
`$.resizeSvgIcons(resizeOptions)` (use the same way as the "resize" parameter)
|
||||
*
|
||||
* @module jQuerySVGIcons
|
||||
* @license MIT
|
||||
* @copyright (c) 2009 Alexis Deveria
|
||||
* {@link http://a.deveria.com}
|
||||
* @example usage #1:
|
||||
|
||||
$(function() {
|
||||
$.svgIcons('my_icon_set.svg'); // The SVG file that contains all icons
|
||||
@@ -80,7 +42,7 @@ $(function() {
|
||||
// into HTML elements that match the same IDs.
|
||||
});
|
||||
|
||||
Example usage #2:
|
||||
* @example usage #2:
|
||||
|
||||
$(function() {
|
||||
$.svgIcons('my_icon_set.svg', { // The SVG file that contains all icons
|
||||
@@ -95,7 +57,7 @@ $(function() {
|
||||
}); //The SVG file that contains all icons
|
||||
});
|
||||
|
||||
Example usage #3:
|
||||
* @example usage #3:
|
||||
|
||||
$(function() {
|
||||
$.svgIcons('my_icon_set.svgz', { // The SVGZ file that contains all icons
|
||||
@@ -124,11 +86,45 @@ $(function() {
|
||||
});
|
||||
*/
|
||||
|
||||
/**
|
||||
* @callback module:jQuerySVGIcons.SVGIconsLoadedCallback
|
||||
* @param {PlainObject.<string, external:jQuery>} svgIcons IDs keyed to jQuery objects of images
|
||||
*/
|
||||
|
||||
/**
|
||||
* @function module:jQuerySVGIcons.jQuerySVGIcons
|
||||
* @param {external:jQuery} $ Its keys include all icon IDs and the values, the icon as a jQuery object
|
||||
*/
|
||||
export default function ($) {
|
||||
const svgIcons = {};
|
||||
|
||||
let fixIDs;
|
||||
$.svgIcons = function (file, opts) {
|
||||
/**
|
||||
* @function external:jQuery.svgIcons
|
||||
* @param {string} file The location of a local SVG or SVGz file
|
||||
* @param {PlainObject} [options]
|
||||
* @param {Float} [options.w] The icon widths
|
||||
* @param {Float} [options.h] The icon heights
|
||||
* @param {PlainObject.<string, string>} [options.fallback] List of raster images with each
|
||||
key being the SVG icon ID to replace, and the value the image file name
|
||||
* @param {string} [options.fallback_path] The path to use for all images
|
||||
listed under "fallback"
|
||||
* @param {boolean} [options.replace] If set to `true`, HTML elements will be replaced by,
|
||||
rather than include the SVG icon.
|
||||
* @param {PlainObject.<string, string>} [options.placement] List with selectors for keys and SVG icon ids
|
||||
as values. This provides a custom method of adding icons.
|
||||
* @param {PlainObject.<string, module:jQuerySVGIcons.Size>} [options.resize] List with selectors for keys and numbers
|
||||
as values. This allows an easy way to resize specific icons.
|
||||
* @param {module:jQuerySVGIcons.SVGIconsLoadedCallback} [options.callback] A function to call when all icons have been loaded.
|
||||
* @param {boolean} [options.id_match=true] Automatically attempt to match SVG icon ids with
|
||||
corresponding HTML id
|
||||
* @param {boolean} [options.no_img] Prevent attempting to convert the icon into an `<img>`
|
||||
element (may be faster, help for browser consistency)
|
||||
* @param {boolean} [options.svgz] Indicate that the file is an SVGZ file, and thus not to
|
||||
parse as XML. SVGZ files add compression benefits, but getting data from
|
||||
them fails in Firefox 2 and older.
|
||||
*/
|
||||
$.svgIcons = function (file, opts = {}) {
|
||||
const svgns = 'http://www.w3.org/2000/svg',
|
||||
xlinkns = 'http://www.w3.org/1999/xlink',
|
||||
iconW = opts.w || 24,
|
||||
@@ -456,6 +452,12 @@ export default function ($) {
|
||||
}
|
||||
};
|
||||
|
||||
/**
|
||||
* @function external:jQuery.getSvgIcon
|
||||
* @param {string} id
|
||||
* @param {boolean} uniqueClone Whether to clone
|
||||
* @returns {external:jQuery} The icon (optionally cloned)
|
||||
*/
|
||||
$.getSvgIcon = function (id, uniqueClone) {
|
||||
let icon = svgIcons[id];
|
||||
if (uniqueClone && icon) {
|
||||
@@ -464,6 +466,23 @@ export default function ($) {
|
||||
return icon;
|
||||
};
|
||||
|
||||
/**
|
||||
* @typedef {GenericArray} module:jQuerySVGIcons.Dimensions
|
||||
* @property {Integer} length 2
|
||||
* @property {Float} 0 Width
|
||||
* @property {Float} 1 Height
|
||||
*/
|
||||
|
||||
/**
|
||||
* If a Float is used, it will represent width and height. Arrays contain the width and height.
|
||||
* @typedef {module:jQuerySVGIcons.Dimensions|Float} module:jQuerySVGIcons.Size
|
||||
*/
|
||||
|
||||
/**
|
||||
* @function external:jQuery.resizeSvgIcons
|
||||
* @param {PlainObject.<string, module:jQuerySVGIcons.Size>} obj Object with selectors as keys. The values are sizes.
|
||||
* @returns {undefined}
|
||||
*/
|
||||
$.resizeSvgIcons = function (obj) {
|
||||
// FF2 and older don't detect .svg_icon, so we change it detect svg elems instead
|
||||
const changeSel = !$('.svg_icon:first').length;
|
||||
Reference in New Issue
Block a user