Changeset 3040906

Timestamp:

02/25/2024 09:16:58 PM (2 years ago)

Author:

Lwangaman

Message:

Update to version 8.2 from GitHub

Location:

bibleget-io

Files:

• tags/8.2 (copied) (copied from bibleget-io/trunk)
• tags/8.2/bibleget-io.php (modified) (2 diffs)
• tags/8.2/js/googlefonts-fallback.json (added)
• tags/8.2/js/gutenberg.js (modified) (65 diffs)
• tags/8.2/js/jquery.fontselect.js (modified) (2 diffs)
• tags/8.2/vendor/composer/installed.php (modified) (2 diffs)
• trunk/bibleget-io.php (modified) (2 diffs)
• trunk/js/googlefonts-fallback.json (added)
• trunk/js/gutenberg.js (modified) (65 diffs)
• trunk/js/jquery.fontselect.js (modified) (2 diffs)
• trunk/vendor/composer/installed.php (modified) (2 diffs)

bibleget-io/tags/8.2/bibleget-io.php

@@ -4 +4 @@
  * Plugin URI: https://www.bibleget.io/
  * Description: Easily insert Bible quotes from a choice of Bible versions into your articles or pages with the "Bible quote" block or with the shortcode [bibleget].
- * Version: 8.1
+ * Version: 8.2
  * Requires at least: 5.6
  * Requires PHP: 7.4
@@ -31 +31 @@
 
 
-define("BIBLEGETPLUGINVERSION", "v8_1");
+define("BIBLEGETPLUGINVERSION", "v8_2");
 
 if (!defined('ABSPATH')) {

bibleget-io/tags/8.2/js/gutenberg.js

@@ -7 +7 @@
 const BGET = BibleGetGlobal.BGETConstants;
 //console.log(BibleGetGlobal);
-class Incrementer {
-    static i = 0;
-    static incr = () => ++this.i;
-}
-const { incr } = Incrementer;
 
 const getKeyByValue = (object, value) => Object.keys(object).find((key) => object[key] === value);
 
-((blocks, element, i18n, editor, components, ServerSideRender, $) => {
+(async (blocks, element, i18n, editor, components, ServerSideRender, $) => {
     //define the same attributes as the shortcode, but now in JSON format
     const { registerBlockType } = blocks; //Blocks API
@@ -67 +62 @@
             "optgroup",
             { label: label },
-            options.map(function (item, index) {
+            options.map((item) => {
                 return createElement(
                     Option,
-                    Object.assign(
-                        {},
-                        { key: `${item.label.replace(/\s/g, "")}-${index}` },
-                        item
-                    )
+                    item
                 );
             })
@@ -102 +93 @@
                 value: value,
             },
-            options.map(function (item, index) {
+            options.map((item) => {
                 if ("options" in item) {
                     return createElement(
                         OptionGroup,
-                        Object.assign(
-                            {},
-                            { key: `${item.label.replace(/\s/g, "")}-${index}` },
-                            item
-                        )
+                        item
                     );
                 }
                 return createElement(
                     Option,
-                    Object.assign(
-                        {},
-                        { key: `${item.label.replace(/\s/g, "")}-${index}` },
-                        item
-                    )
+                    item
                 );
             })
@@ -126 +109 @@
 
     const websafe_fonts = [
-        { fontFamily: "Arial", fallback: "Helvetica", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Arial",
+            fallback: "Helvetica",
+            genericFamily: "sans-serif" },
         {
             fontFamily: "Arial Black",
@@ -142 +128 @@
             genericFamily: "monospace",
         },
-        { fontFamily: "Georgia", genericFamily: "serif" },
-        { fontFamily: "Impact", fallback: "Charcoal", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Georgia",
+            genericFamily: "serif"
+        },
+        {
+            fontFamily:"Impact",
+            fallback: "Charcoal",
+            genericFamily: "sans-serif"
+        },
         {
             fontFamily: "Lucida Console",
@@ -159 +152 @@
             genericFamily: "serif",
         },
-        { fontFamily: "Tahoma", fallback: "Geneva", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Tahoma",
+            fallback: "Geneva",
+            genericFamily: "sans-serif"
+        },
         {
             fontFamily: "Times New Roman",
@@ -170 +167 @@
             genericFamily: "sans-serif",
         },
-        { fontFamily: "Verdana", fallback: "Geneva", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Verdana",
+            fallback: "Geneva",
+            genericFamily: "sans-serif"
+        }
     ];
 
     const fontOptions = [];
-    websafe_fonts.forEach((fontObj, idx) =>
+    websafe_fonts.forEach((fontObj) =>
         fontOptions.push({
             label: fontObj.fontFamily + " [websafe]",
@@ -189 +190 @@
     ) {
         BibleGetGlobal.GFonts.items.forEach(value => fontOptions.push({ label: value.family, value: value.family.replace(/ /g,"+") }) );
+    } else {
+        const googlefonts_fallback = await fetch('../wp-content/plugins/bibleget-io/js/googlefonts-fallback.json').then(result => result.json());
+        googlefonts_fallback.forEach(value => fontOptions.push({ label: value.replace(/\+/g," "), value: value }));
     }
 
@@ -267 +271 @@
             const changeQuery = (QUERY) => {
                 //BibleGetGlobal.BGETProperties['QUERY'].default = QUERY;
-                setAttributes({ QUERY });
+                return setAttributes({ QUERY });
             }
 
@@ -282 +286 @@
                 }
                 //BibleGetGlobal.BGETProperties['VERSION'].default = VERSION;
-                setAttributes({ VERSION });
+                return setAttributes({ VERSION });
             }
 
@@ -291 +295 @@
                     ? BGET.PREFERORIGIN.HEBREW
                     : BGET.PREFERORIGIN.GREEK;
-                setAttributes({ PREFERORIGIN });
+                return setAttributes({ PREFERORIGIN });
             }
 
@@ -297 +301 @@
             const changePopup = (POPUP) => {
                 //BibleGetGlobal.BGETProperties['POPUP'].default = POPUP;
-                setAttributes({ POPUP });
+                return setAttributes({ POPUP });
             }
 
@@ -304 +308 @@
                     "LAYOUTPREFS_SHOWBIBLEVERSION"
                 ].default = LAYOUTPREFS_SHOWBIBLEVERSION;
-                setAttributes({ LAYOUTPREFS_SHOWBIBLEVERSION });
+                return setAttributes({ LAYOUTPREFS_SHOWBIBLEVERSION });
             }
 
@@ -324 +328 @@
                     "LAYOUTPREFS_BIBLEVERSIONALIGNMENT"
                 ].default = LAYOUTPREFS_BIBLEVERSIONALIGNMENT;
-                setAttributes({ LAYOUTPREFS_BIBLEVERSIONALIGNMENT });
+                return setAttributes({ LAYOUTPREFS_BIBLEVERSIONALIGNMENT });
             }
 
@@ -332 +336 @@
                     "LAYOUTPREFS_BIBLEVERSIONPOSITION"
                 ].default = LAYOUTPREFS_BIBLEVERSIONPOSITION;
-                setAttributes({ LAYOUTPREFS_BIBLEVERSIONPOSITION });
+                return setAttributes({ LAYOUTPREFS_BIBLEVERSIONPOSITION });
             }
 
@@ -340 +344 @@
                     "LAYOUTPREFS_BIBLEVERSIONWRAP"
                 ].default = LAYOUTPREFS_BIBLEVERSIONWRAP;
-                setAttributes({ LAYOUTPREFS_BIBLEVERSIONWRAP });
+                return setAttributes({ LAYOUTPREFS_BIBLEVERSIONWRAP });
             }
 
@@ -358 +362 @@
                     "LAYOUTPREFS_BOOKCHAPTERALIGNMENT"
                 ].default = LAYOUTPREFS_BOOKCHAPTERALIGNMENT;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERALIGNMENT });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERALIGNMENT });
             }
 
@@ -366 +370 @@
                     "LAYOUTPREFS_BOOKCHAPTERPOSITION"
                 ].default = LAYOUTPREFS_BOOKCHAPTERPOSITION;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERPOSITION });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERPOSITION });
             }
 
@@ -374 +378 @@
                     "LAYOUTPREFS_BOOKCHAPTERWRAP"
                 ].default = LAYOUTPREFS_BOOKCHAPTERWRAP;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERWRAP });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERWRAP });
             }
 
@@ -381 +385 @@
                     "LAYOUTPREFS_BOOKCHAPTERFULLQUERY"
                 ].default = LAYOUTPREFS_BOOKCHAPTERFULLQUERY;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERFULLQUERY });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERFULLQUERY });
             }
 
@@ -406 +410 @@
                     "LAYOUTPREFS_BOOKCHAPTERFORMAT"
                 ].default = LAYOUTPREFS_BOOKCHAPTERFORMAT;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
             }
 
@@ -431 +435 @@
                     "LAYOUTPREFS_BOOKCHAPTERFORMAT"
                 ].default = LAYOUTPREFS_BOOKCHAPTERFORMAT;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
             }
 
@@ -438 +442 @@
                     "LAYOUTPREFS_SHOWVERSENUMBERS"
                 ].default = LAYOUTPREFS_SHOWVERSENUMBERS;
-                setAttributes({ LAYOUTPREFS_SHOWVERSENUMBERS });
+                return setAttributes({ LAYOUTPREFS_SHOWVERSENUMBERS });
             }
 
@@ -454 +458 @@
                     "PARAGRAPHSTYLES_BORDERWIDTH"
                 ].default = PARAGRAPHSTYLES_BORDERWIDTH;
-                setAttributes({ PARAGRAPHSTYLES_BORDERWIDTH });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERWIDTH });
             }
 
@@ -470 +474 @@
                     "PARAGRAPHSTYLES_BORDERRADIUS"
                 ].default = PARAGRAPHSTYLES_BORDERRADIUS;
-                setAttributes({ PARAGRAPHSTYLES_BORDERRADIUS });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERRADIUS });
             }
 
@@ -487 +491 @@
                     "PARAGRAPHSTYLES_BORDERSTYLE"
                 ].default = PARAGRAPHSTYLES_BORDERSTYLE;
-                setAttributes({ PARAGRAPHSTYLES_BORDERSTYLE });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERSTYLE });
             }
 
@@ -504 +508 @@
                     "PARAGRAPHSTYLES_BORDERCOLOR"
                 ].default = PARAGRAPHSTYLES_BORDERCOLOR;
-                setAttributes({ PARAGRAPHSTYLES_BORDERCOLOR });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERCOLOR });
             }
 
@@ -521 +525 @@
                     "PARAGRAPHSTYLES_BACKGROUNDCOLOR"
                 ].default = PARAGRAPHSTYLES_BACKGROUNDCOLOR;
-                setAttributes({ PARAGRAPHSTYLES_BACKGROUNDCOLOR });
+                return setAttributes({ PARAGRAPHSTYLES_BACKGROUNDCOLOR });
             }
 
@@ -554 +558 @@
                     "PARAGRAPHSTYLES_MARGINTOPBOTTOM"
                 ].default = PARAGRAPHSTYLES_MARGINTOPBOTTOM;
-                setAttributes({ PARAGRAPHSTYLES_MARGINTOPBOTTOM });
+                return setAttributes({ PARAGRAPHSTYLES_MARGINTOPBOTTOM });
             }
 
@@ -587 +591 @@
                     "PARAGRAPHSTYLES_MARGINLEFTRIGHT"
                 ].default = PARAGRAPHSTYLES_MARGINLEFTRIGHT;
-                setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHT });
+                return setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHT });
             }
 
@@ -617 +621 @@
                     "PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT"
                 ].default = PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT;
-                setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT });
+                return setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT });
             }
 
@@ -636 +640 @@
                     "PARAGRAPHSTYLES_PADDINGTOPBOTTOM"
                 ].default = PARAGRAPHSTYLES_PADDINGTOPBOTTOM;
-                setAttributes({ PARAGRAPHSTYLES_PADDINGTOPBOTTOM });
+                return setAttributes({ PARAGRAPHSTYLES_PADDINGTOPBOTTOM });
             }
 
@@ -655 +659 @@
                     "PARAGRAPHSTYLES_PADDINGLEFTRIGHT"
                 ].default = PARAGRAPHSTYLES_PADDINGLEFTRIGHT;
-                setAttributes({ PARAGRAPHSTYLES_PADDINGLEFTRIGHT });
+                return setAttributes({ PARAGRAPHSTYLES_PADDINGLEFTRIGHT });
             }
 
@@ -673 +677 @@
                     "PARAGRAPHSTYLES_LINEHEIGHT"
                 ].default = PARAGRAPHSTYLES_LINEHEIGHT;
-                setAttributes({ PARAGRAPHSTYLES_LINEHEIGHT });
+                return setAttributes({ PARAGRAPHSTYLES_LINEHEIGHT });
             }
 
@@ -687 +691 @@
                     "PARAGRAPHSTYLES_WIDTH"
                 ].default = PARAGRAPHSTYLES_WIDTH;
-                setAttributes({ PARAGRAPHSTYLES_WIDTH });
+                return setAttributes({ PARAGRAPHSTYLES_WIDTH });
             }
 
@@ -747 +751 @@
                             "VERSIONSTYLES_BOLD"
                         ].default = VERSIONSTYLES_BOLD;
-                        setAttributes({ VERSIONSTYLES_BOLD });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "VERSIONSTYLES_ITALIC"
                         ].default = VERSIONSTYLES_ITALIC;
-                        setAttributes({ VERSIONSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "VERSIONSTYLES_UNDERLINE"
                         ].default = VERSIONSTYLES_UNDERLINE;
-                        setAttributes({ VERSIONSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "VERSIONSTYLES_STRIKETHROUGH"
                         ].default = VERSIONSTYLES_STRIKETHROUGH;
-                        setAttributes({ VERSIONSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_STRIKETHROUGH });
                 }
             }
@@ -788 +788 @@
                     "VERSIONSTYLES_FONTSIZE"
                 ].default = VERSIONSTYLES_FONTSIZE;
-                setAttributes({ VERSIONSTYLES_FONTSIZE });
+                return setAttributes({ VERSIONSTYLES_FONTSIZE });
             }
 
@@ -809 +809 @@
                     "VERSIONSTYLES_FONTSIZEUNIT"
                 ].default = VERSIONSTYLES_FONTSIZEUNIT;
-                setAttributes({ VERSIONSTYLES_FONTSIZEUNIT });
+                return setAttributes({ VERSIONSTYLES_FONTSIZEUNIT });
             }
 
@@ -826 +826 @@
                     "VERSIONSTYLES_TEXTCOLOR"
                 ].default = VERSIONSTYLES_TEXTCOLOR;
-                setAttributes({ VERSIONSTYLES_TEXTCOLOR });
+                return setAttributes({ VERSIONSTYLES_TEXTCOLOR });
             }
 
@@ -886 +886 @@
                             "BOOKCHAPTERSTYLES_BOLD"
                         ].default = BOOKCHAPTERSTYLES_BOLD;
-                        setAttributes({ BOOKCHAPTERSTYLES_BOLD });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "BOOKCHAPTERSTYLES_ITALIC"
                         ].default = BOOKCHAPTERSTYLES_ITALIC;
-                        setAttributes({ BOOKCHAPTERSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "BOOKCHAPTERSTYLES_UNDERLINE"
                         ].default = BOOKCHAPTERSTYLES_UNDERLINE;
-                        setAttributes({ BOOKCHAPTERSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "BOOKCHAPTERSTYLES_STRIKETHROUGH"
                         ].default = BOOKCHAPTERSTYLES_STRIKETHROUGH;
-                        setAttributes({ BOOKCHAPTERSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_STRIKETHROUGH });
                 }
             }
@@ -927 +923 @@
                     "BOOKCHAPTERSTYLES_FONTSIZE"
                 ].default = BOOKCHAPTERSTYLES_FONTSIZE;
-                setAttributes({ BOOKCHAPTERSTYLES_FONTSIZE });
+                return setAttributes({ BOOKCHAPTERSTYLES_FONTSIZE });
             }
 
@@ -948 +944 @@
                     "BOOKCHAPTERSTYLES_FONTSIZEUNIT"
                 ].default = BOOKCHAPTERSTYLES_FONTSIZEUNIT;
-                setAttributes({ BOOKCHAPTERSTYLES_FONTSIZEUNIT });
+                return setAttributes({ BOOKCHAPTERSTYLES_FONTSIZEUNIT });
             }
 
@@ -965 +961 @@
                     "BOOKCHAPTERSTYLES_TEXTCOLOR"
                 ].default = BOOKCHAPTERSTYLES_TEXTCOLOR;
-                setAttributes({ BOOKCHAPTERSTYLES_TEXTCOLOR });
+                return setAttributes({ BOOKCHAPTERSTYLES_TEXTCOLOR });
             }
 
@@ -1025 +1021 @@
                             "VERSENUMBERSTYLES_BOLD"
                         ].default = VERSENUMBERSTYLES_BOLD;
-                        setAttributes({ VERSENUMBERSTYLES_BOLD });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "VERSENUMBERSTYLES_ITALIC"
                         ].default = VERSENUMBERSTYLES_ITALIC;
-                        setAttributes({ VERSENUMBERSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "VERSENUMBERSTYLES_UNDERLINE"
                         ].default = VERSENUMBERSTYLES_UNDERLINE;
-                        setAttributes({ VERSENUMBERSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "VERSENUMBERSTYLES_STRIKETHROUGH"
                         ].default = VERSENUMBERSTYLES_STRIKETHROUGH;
-                        setAttributes({ VERSENUMBERSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_STRIKETHROUGH });
                 }
             }
@@ -1066 +1058 @@
                     "VERSENUMBERSTYLES_FONTSIZE"
                 ].default = VERSENUMBERSTYLES_FONTSIZE;
-                setAttributes({ VERSENUMBERSTYLES_FONTSIZE });
+                return setAttributes({ VERSENUMBERSTYLES_FONTSIZE });
             }
 
@@ -1087 +1079 @@
                     "VERSENUMBERSTYLES_FONTSIZEUNIT"
                 ].default = VERSENUMBERSTYLES_FONTSIZEUNIT;
-                setAttributes({ VERSENUMBERSTYLES_FONTSIZEUNIT });
+                return setAttributes({ VERSENUMBERSTYLES_FONTSIZEUNIT });
             }
 
@@ -1104 +1096 @@
                     "VERSENUMBERSTYLES_TEXTCOLOR"
                 ].default = VERSENUMBERSTYLES_TEXTCOLOR;
-                setAttributes({ VERSENUMBERSTYLES_TEXTCOLOR });
+                return setAttributes({ VERSENUMBERSTYLES_TEXTCOLOR });
             }
 
@@ -1240 +1232 @@
                     "VERSENUMBERSTYLES_VALIGN"
                 ].default = VERSENUMBERSTYLES_VALIGN;
-                setAttributes({ VERSENUMBERSTYLES_VALIGN });
+                return setAttributes({ VERSENUMBERSTYLES_VALIGN });
             }
 
@@ -1366 +1358 @@
                             "VERSETEXTSTYLES_BOLD"
                         ].default = VERSETEXTSTYLES_BOLD;
-                        setAttributes({ VERSETEXTSTYLES_BOLD });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "VERSETEXTSTYLES_ITALIC"
                         ].default = VERSETEXTSTYLES_ITALIC;
-                        setAttributes({ VERSETEXTSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "VERSETEXTSTYLES_UNDERLINE"
                         ].default = VERSETEXTSTYLES_UNDERLINE;
-                        setAttributes({ VERSETEXTSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "VERSETEXTSTYLES_STRIKETHROUGH"
                         ].default = VERSETEXTSTYLES_STRIKETHROUGH;
-                        setAttributes({ VERSETEXTSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_STRIKETHROUGH });
                 }
             }
@@ -1407 +1395 @@
                     "VERSETEXTSTYLES_FONTSIZE"
                 ].default = VERSETEXTSTYLES_FONTSIZE;
-                setAttributes({ VERSETEXTSTYLES_FONTSIZE });
+                return setAttributes({ VERSETEXTSTYLES_FONTSIZE });
             }
 
@@ -1428 +1416 @@
                     "VERSETEXTSTYLES_FONTSIZEUNIT"
                 ].default = VERSETEXTSTYLES_FONTSIZEUNIT;
-                setAttributes({ VERSETEXTSTYLES_FONTSIZEUNIT });
+                return setAttributes({ VERSETEXTSTYLES_FONTSIZEUNIT });
             }
 
@@ -1443 +1431 @@
                 );
                 BibleGetGlobal.BGETProperties["VERSETEXTSTYLES_TEXTCOLOR"].default = VERSETEXTSTYLES_TEXTCOLOR;
-                setAttributes({ VERSETEXTSTYLES_TEXTCOLOR });
+                return setAttributes({ VERSETEXTSTYLES_TEXTCOLOR });
             }
 
@@ -1474 +1462 @@
                 );
                 BibleGetGlobal.BGETProperties["PARAGRAPHSTYLES_FONTFAMILY"].default = PARAGRAPHSTYLES_FONTFAMILY;
-                setAttributes({ PARAGRAPHSTYLES_FONTFAMILY });
+                return setAttributes({ PARAGRAPHSTYLES_FONTFAMILY });
             }
 
@@ -1506 +1494 @@
                         .appendTo("body")
                         .dialog({
-                            close: function () {
-                                $(this).dialog("destroy").remove();
+                            close: () => {
+                                dlg.dialog("destroy").remove();
                             },
                             dialogClass: "bibleGetSearchDlg",
@@ -1529 +1517 @@
                         .appendTo("body")
                         .dialog({
-                            close: function () {
-                                $(this).dialog("destroy").remove();
+                            close: () => {
+                                dlg.dialog("destroy").remove();
                             },
                             dialogClass: "bibleGetSearchDlg",
@@ -1577 +1565 @@
                                         .appendTo("body")
                                         .dialog({
-                                            close: function () {
-                                                $(this).dialog("destroy").remove();
+                                            close: () => {
+                                                dlgNoResults.dialog("destroy").remove();
                                             },
                                             dialogClass: "bibleGetSearchDlg",
@@ -1704 +1692 @@
                                                         "click",
                                                         "button",
-                                                        function () {
+                                                        (ev) => {
+                                                            const tgt = ev.currentTarget;
                                                             //First check the context of the button that was clicked: control panel or searchResultsContents
                                                             let $filterLabel,
@@ -1712 +1701 @@
                                                                 REFRESH = false;
                                                             switch (
-                                                                $(this)
+                                                                $(tgt)
                                                                     .parents(".searchResultsFlexChild")
                                                                     .attr("id")
@@ -1747 +1736 @@
                                                                             : "";
 
-                                                                    switch ($(this).attr("id")) {
+                                                                    switch ($(tgt).attr("id")) {
                                                                         case "ORDER_RESULTS_BY":
                                                                             REFRESH = true;
@@ -1831 +1820 @@
                                                                 case "searchResultsContents":
                                                                     //alert('button was clicked! it is in the context of the searchResultsContents');
-                                                                    //alert($(this).next().prop('tagName') );
+                                                                    //alert($(tgt).next().prop('tagName') );
                                                                     if (
-                                                                        $(this).next("input[type=hidden]").length !=
-                                                                        0
+                                                                        $(tgt).next("input[type=hidden]").length != 0
                                                                     ) {
                                                                         //showSpinner();
-                                                                        let currentRef = $(this)
+                                                                        let currentRef = $(tgt)
                                                                             .parent("td")
                                                                             .next("td")
                                                                             .text();
                                                                         if (
-                                                                            $quotesArr.includes(bookChapterVerse) ===
-                                                                            false
+                                                                            $quotesArr.includes(bookChapterVerse) === false
                                                                         ) {
-                                                                            $(this)
+                                                                            $(tgt)
                                                                                 .addClass("disabled")
                                                                                 .prop("disabled", true);
-                                                                            let $inputval = $(this)
+                                                                            let $inputval = $(tgt)
                                                                                 .next("input[type=hidden]")
                                                                                 .val();
@@ -1877 +1864 @@
                                                     );
                                                 },
-                                                close: function () {
+                                                close: () => {
                                                     $("#searchResultsContainer").off("click");
-                                                    $(this).dialog("destroy").remove();
+                                                    dlg.dialog("destroy").remove();
                                                 },
                                                 dialogClass: "bibleGetSearchDlg",
@@ -2129 +2116 @@
             return createElement(
                 "div",
-                { key: `bibleQuoteWrapperDiv-${incr()}` },
+                {},
                 //Preview a block with a PHP render callback
                 createElement(ServerSideRender, {
@@ -3326 +3313 @@
     });
 
-    $(document).on("click", ".bibleget-popup-trigger", function () {
-        const popup_content = he.decode($(this).attr("data-popupcontent"));
+    $(document).on("click", ".bibleget-popup-trigger", (ev) => {
+        const tgt = ev.currentTarget;
+        const popup_content = he.decode($(tgt).attr("data-popupcontent"));
         const dlg = $(
             '<div class="bibleget-quote-div bibleget-popup">' +
@@ -3336 +3324 @@
             width: $(window).width() * 0.8,
             maxHeight: $(window).height() * 0.8,
-            title: $(this).text(),
+            title: $(tgt).text(),
             create: () => {
                 // style fix for WordPress admin
@@ -3345 +3333 @@
                 dlg.dialog("destroy");
                 $(".bibleget-quote-div.bibleget-popup").remove();
-            },
+            }
         });
         return false;

bibleget-io/tags/8.2/js/jquery.fontselect.js

@@ -306 +306 @@
 (async ($) => {
 
-    const google_fonts = [
-        "Aclonica",
-        "Allan",
-        "Annie+Use+Your+Telescope",
-        "Anonymous+Pro",
-        "Allerta+Stencil",
-        "Allerta",
-        "Amaranth",
-        "Anton",
-        "Architects+Daughter",
-        "Arimo",
-        "Artifika",
-        "Arvo",
-        "Asset",
-        "Astloch",
-        "Bangers",
-        "Bentham",
-        "Bevan",
-        "Bigshot+One",
-        "Bowlby+One",
-        "Bowlby+One+SC",
-        "Brawler",
-        "Buda",
-        "Cabin",
-        "Calligraffitti",
-        "Candal",
-        "Cantarell",
-        "Cardo",
-        "Carter One",
-        "Caudex",
-        "Cedarville+Cursive",
-        "Cherry+Cream+Soda",
-        "Chewy",
-        "Coda",
-        "Coming+Soon",
-        "Copse",
-        "Corben",
-        "Cousine",
-        "Covered+By+Your+Grace",
-        "Crafty+Girls",
-        "Crimson+Text",
-        "Crushed",
-        "Cuprum",
-        "Damion",
-        "Dancing+Script",
-        "Dawning+of+a+New+Day",
-        "Didact+Gothic",
-        "Droid+Sans",
-        "Droid+Sans+Mono",
-        "Droid+Serif",
-        "EB+Garamond",
-        "Expletus+Sans",
-        "Fontdiner+Swanky",
-        "Forum",
-        "Francois+One",
-        "Geo",
-        "Give+You+Glory",
-        "Goblin+One",
-        "Goudy+Bookletter+1911",
-        "Gravitas+One",
-        "Gruppo",
-        "Hammersmith+One",
-        "Holtwood+One+SC",
-        "Homemade+Apple",
-        "Inconsolata",
-        "Indie+Flower",
-        "IM+Fell+DW+Pica",
-        "IM+Fell+DW+Pica+SC",
-        "IM+Fell+Double+Pica",
-        "IM+Fell+Double+Pica+SC",
-        "IM+Fell+English",
-        "IM+Fell+English+SC",
-        "IM+Fell+French+Canon",
-        "IM+Fell+French+Canon+SC",
-        "IM+Fell+Great+Primer",
-        "IM+Fell+Great+Primer+SC",
-        "Irish+Grover",
-        "Irish+Growler",
-        "Istok+Web",
-        "Josefin+Sans",
-        "Josefin+Slab",
-        "Judson",
-        "Jura",
-        "Just+Another+Hand",
-        "Just+Me+Again+Down+Here",
-        "Kameron",
-        "Kenia",
-        "Kranky",
-        "Kreon",
-        "Kristi",
-        "La+Belle+Aurore",
-        "Lato",
-        "League+Script",
-        "Lekton",
-        "Limelight",
-        "Lobster",
-        "Lobster Two",
-        "Lora",
-        "Love+Ya+Like+A+Sister",
-        "Loved+by+the+King",
-        "Luckiest+Guy",
-        "Maiden+Orange",
-        "Mako",
-        "Maven+Pro",
-        "Meddon",
-        "MedievalSharp",
-        "Megrim",
-        "Merriweather",
-        "Metrophobic",
-        "Michroma",
-        "Miltonian Tattoo",
-        "Miltonian",
-        "Modern Antiqua",
-        "Monofett",
-        "Molengo",
-        "Mountains of Christmas",
-        "Muli",
-        "Neucha",
-        "Neuton",
-        "News+Cycle",
-        "Nixie+One",
-        "Nobile",
-        "Nova+Cut",
-        "Nova+Flat",
-        "Nova+Mono",
-        "Nova+Oval",
-        "Nova+Round",
-        "Nova+Script",
-        "Nova+Slim",
-        "Nova+Square",
-        "Nunito",
-        "OFL+Sorts+Mill+Goudy+TT",
-        "Old+Standard+TT",
-        "Open+Sans",
-        "Open+Sans+Condensed",
-        "Orbitron",
-        "Oswald",
-        "Over+the+Rainbow",
-        "Reenie+Beanie",
-        "Pacifico",
-        "Patrick+Hand",
-        "Paytone+One",
-        "Permanent+Marker",
-        "Philosopher",
-        "Play",
-        "Playfair+Display",
-        "Podkova",
-        "PT+Sans",
-        "PT+Sans+Narrow",
-        "PT+Serif",
-        "PT+Serif Caption",
-        "Puritan",
-        "Quattrocento",
-        "Quattrocento+Sans",
-        "Radley",
-        "Raleway",
-        "Redressed",
-        "Rock+Salt",
-        "Rokkitt",
-        "Roboto",
-        "Ruslan+Display",
-        "Schoolbell",
-        "Shadows+Into+Light",
-        "Shanti",
-        "Sigmar+One",
-        "Six+Caps",
-        "Slackey",
-        "Smythe",
-        "Sniglet",
-        "Special+Elite",
-        "Stardos+Stencil",
-        "Sue+Ellen+Francisco",
-        "Sunshiney",
-        "Swanky+and+Moo+Moo",
-        "Syncopate",
-        "Tangerine",
-        "Tenor+Sans",
-        "Terminal+Dosis+Light",
-        "The+Girl+Next+Door",
-        "Tinos",
-        "Ubuntu",
-        "Ultra",
-        "Unkempt",
-        "UnifrakturCook",
-        "UnifrakturMaguntia",
-        "Varela",
-        "Varela Round",
-        "Vibur",
-        "Vollkorn",
-        "VT323",
-        "Waiting+for+the+Sunrise",
-        "Wallpoet",
-        "Walter+Turncoat",
-        "Wire+One",
-        "Yanone+Kaffeesatz",
-        "Yeseva+One",
-        "Zeyada",
-    ];
-
     $.fontselect = {
         settings: {
@@ -518 +319 @@
         //console.log('Google Font API key not detected, using fallback list...');
         //console.warn(ex);
-    }) || google_fonts;
+    }) || await fetch('../wp-content/plugins/bibleget-io/js/googlefonts-fallback.json').then(result => result.json());
     //console.log('length of google fonts after api call: ' + $.fontselect.google_fonts.length);
 

bibleget-io/tags/8.2/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'johnrdorazio/bibleget-wordpress',
-        'pretty_version' => '8.1',
-        'version' => '8.1.0.0',
-        'reference' => '6321cd234b2d083d3bc1aa4915dfce35fa572cc5',
+        'pretty_version' => '8.2',
+        'version' => '8.2.0.0',
+        'reference' => '442a7919a8a39ee149b5136f453972f664554573',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -12 +12 @@
     'versions' => array(
         'johnrdorazio/bibleget-wordpress' => array(
-            'pretty_version' => '8.1',
-            'version' => '8.1.0.0',
-            'reference' => '6321cd234b2d083d3bc1aa4915dfce35fa572cc5',
+            'pretty_version' => '8.2',
+            'version' => '8.2.0.0',
+            'reference' => '442a7919a8a39ee149b5136f453972f664554573',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',

bibleget-io/trunk/bibleget-io.php

@@ -4 +4 @@
  * Plugin URI: https://www.bibleget.io/
  * Description: Easily insert Bible quotes from a choice of Bible versions into your articles or pages with the "Bible quote" block or with the shortcode [bibleget].
- * Version: 8.1
+ * Version: 8.2
  * Requires at least: 5.6
  * Requires PHP: 7.4
@@ -31 +31 @@
 
 
-define("BIBLEGETPLUGINVERSION", "v8_1");
+define("BIBLEGETPLUGINVERSION", "v8_2");
 
 if (!defined('ABSPATH')) {

bibleget-io/trunk/js/gutenberg.js

@@ -7 +7 @@
 const BGET = BibleGetGlobal.BGETConstants;
 //console.log(BibleGetGlobal);
-class Incrementer {
-    static i = 0;
-    static incr = () => ++this.i;
-}
-const { incr } = Incrementer;
 
 const getKeyByValue = (object, value) => Object.keys(object).find((key) => object[key] === value);
 
-((blocks, element, i18n, editor, components, ServerSideRender, $) => {
+(async (blocks, element, i18n, editor, components, ServerSideRender, $) => {
     //define the same attributes as the shortcode, but now in JSON format
     const { registerBlockType } = blocks; //Blocks API
@@ -67 +62 @@
             "optgroup",
             { label: label },
-            options.map(function (item, index) {
+            options.map((item) => {
                 return createElement(
                     Option,
-                    Object.assign(
-                        {},
-                        { key: `${item.label.replace(/\s/g, "")}-${index}` },
-                        item
-                    )
+                    item
                 );
             })
@@ -102 +93 @@
                 value: value,
             },
-            options.map(function (item, index) {
+            options.map((item) => {
                 if ("options" in item) {
                     return createElement(
                         OptionGroup,
-                        Object.assign(
-                            {},
-                            { key: `${item.label.replace(/\s/g, "")}-${index}` },
-                            item
-                        )
+                        item
                     );
                 }
                 return createElement(
                     Option,
-                    Object.assign(
-                        {},
-                        { key: `${item.label.replace(/\s/g, "")}-${index}` },
-                        item
-                    )
+                    item
                 );
             })
@@ -126 +109 @@
 
     const websafe_fonts = [
-        { fontFamily: "Arial", fallback: "Helvetica", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Arial",
+            fallback: "Helvetica",
+            genericFamily: "sans-serif" },
         {
             fontFamily: "Arial Black",
@@ -142 +128 @@
             genericFamily: "monospace",
         },
-        { fontFamily: "Georgia", genericFamily: "serif" },
-        { fontFamily: "Impact", fallback: "Charcoal", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Georgia",
+            genericFamily: "serif"
+        },
+        {
+            fontFamily:"Impact",
+            fallback: "Charcoal",
+            genericFamily: "sans-serif"
+        },
         {
             fontFamily: "Lucida Console",
@@ -159 +152 @@
             genericFamily: "serif",
         },
-        { fontFamily: "Tahoma", fallback: "Geneva", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Tahoma",
+            fallback: "Geneva",
+            genericFamily: "sans-serif"
+        },
         {
             fontFamily: "Times New Roman",
@@ -170 +167 @@
             genericFamily: "sans-serif",
         },
-        { fontFamily: "Verdana", fallback: "Geneva", genericFamily: "sans-serif" },
+        {
+            fontFamily: "Verdana",
+            fallback: "Geneva",
+            genericFamily: "sans-serif"
+        }
     ];
 
     const fontOptions = [];
-    websafe_fonts.forEach((fontObj, idx) =>
+    websafe_fonts.forEach((fontObj) =>
         fontOptions.push({
             label: fontObj.fontFamily + " [websafe]",
@@ -189 +190 @@
     ) {
         BibleGetGlobal.GFonts.items.forEach(value => fontOptions.push({ label: value.family, value: value.family.replace(/ /g,"+") }) );
+    } else {
+        const googlefonts_fallback = await fetch('../wp-content/plugins/bibleget-io/js/googlefonts-fallback.json').then(result => result.json());
+        googlefonts_fallback.forEach(value => fontOptions.push({ label: value.replace(/\+/g," "), value: value }));
     }
 
@@ -267 +271 @@
             const changeQuery = (QUERY) => {
                 //BibleGetGlobal.BGETProperties['QUERY'].default = QUERY;
-                setAttributes({ QUERY });
+                return setAttributes({ QUERY });
             }
 
@@ -282 +286 @@
                 }
                 //BibleGetGlobal.BGETProperties['VERSION'].default = VERSION;
-                setAttributes({ VERSION });
+                return setAttributes({ VERSION });
             }
 
@@ -291 +295 @@
                     ? BGET.PREFERORIGIN.HEBREW
                     : BGET.PREFERORIGIN.GREEK;
-                setAttributes({ PREFERORIGIN });
+                return setAttributes({ PREFERORIGIN });
             }
 
@@ -297 +301 @@
             const changePopup = (POPUP) => {
                 //BibleGetGlobal.BGETProperties['POPUP'].default = POPUP;
-                setAttributes({ POPUP });
+                return setAttributes({ POPUP });
             }
 
@@ -304 +308 @@
                     "LAYOUTPREFS_SHOWBIBLEVERSION"
                 ].default = LAYOUTPREFS_SHOWBIBLEVERSION;
-                setAttributes({ LAYOUTPREFS_SHOWBIBLEVERSION });
+                return setAttributes({ LAYOUTPREFS_SHOWBIBLEVERSION });
             }
 
@@ -324 +328 @@
                     "LAYOUTPREFS_BIBLEVERSIONALIGNMENT"
                 ].default = LAYOUTPREFS_BIBLEVERSIONALIGNMENT;
-                setAttributes({ LAYOUTPREFS_BIBLEVERSIONALIGNMENT });
+                return setAttributes({ LAYOUTPREFS_BIBLEVERSIONALIGNMENT });
             }
 
@@ -332 +336 @@
                     "LAYOUTPREFS_BIBLEVERSIONPOSITION"
                 ].default = LAYOUTPREFS_BIBLEVERSIONPOSITION;
-                setAttributes({ LAYOUTPREFS_BIBLEVERSIONPOSITION });
+                return setAttributes({ LAYOUTPREFS_BIBLEVERSIONPOSITION });
             }
 
@@ -340 +344 @@
                     "LAYOUTPREFS_BIBLEVERSIONWRAP"
                 ].default = LAYOUTPREFS_BIBLEVERSIONWRAP;
-                setAttributes({ LAYOUTPREFS_BIBLEVERSIONWRAP });
+                return setAttributes({ LAYOUTPREFS_BIBLEVERSIONWRAP });
             }
 
@@ -358 +362 @@
                     "LAYOUTPREFS_BOOKCHAPTERALIGNMENT"
                 ].default = LAYOUTPREFS_BOOKCHAPTERALIGNMENT;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERALIGNMENT });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERALIGNMENT });
             }
 
@@ -366 +370 @@
                     "LAYOUTPREFS_BOOKCHAPTERPOSITION"
                 ].default = LAYOUTPREFS_BOOKCHAPTERPOSITION;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERPOSITION });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERPOSITION });
             }
 
@@ -374 +378 @@
                     "LAYOUTPREFS_BOOKCHAPTERWRAP"
                 ].default = LAYOUTPREFS_BOOKCHAPTERWRAP;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERWRAP });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERWRAP });
             }
 
@@ -381 +385 @@
                     "LAYOUTPREFS_BOOKCHAPTERFULLQUERY"
                 ].default = LAYOUTPREFS_BOOKCHAPTERFULLQUERY;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERFULLQUERY });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERFULLQUERY });
             }
 
@@ -406 +410 @@
                     "LAYOUTPREFS_BOOKCHAPTERFORMAT"
                 ].default = LAYOUTPREFS_BOOKCHAPTERFORMAT;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
             }
 
@@ -431 +435 @@
                     "LAYOUTPREFS_BOOKCHAPTERFORMAT"
                 ].default = LAYOUTPREFS_BOOKCHAPTERFORMAT;
-                setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
+                return setAttributes({ LAYOUTPREFS_BOOKCHAPTERFORMAT });
             }
 
@@ -438 +442 @@
                     "LAYOUTPREFS_SHOWVERSENUMBERS"
                 ].default = LAYOUTPREFS_SHOWVERSENUMBERS;
-                setAttributes({ LAYOUTPREFS_SHOWVERSENUMBERS });
+                return setAttributes({ LAYOUTPREFS_SHOWVERSENUMBERS });
             }
 
@@ -454 +458 @@
                     "PARAGRAPHSTYLES_BORDERWIDTH"
                 ].default = PARAGRAPHSTYLES_BORDERWIDTH;
-                setAttributes({ PARAGRAPHSTYLES_BORDERWIDTH });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERWIDTH });
             }
 
@@ -470 +474 @@
                     "PARAGRAPHSTYLES_BORDERRADIUS"
                 ].default = PARAGRAPHSTYLES_BORDERRADIUS;
-                setAttributes({ PARAGRAPHSTYLES_BORDERRADIUS });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERRADIUS });
             }
 
@@ -487 +491 @@
                     "PARAGRAPHSTYLES_BORDERSTYLE"
                 ].default = PARAGRAPHSTYLES_BORDERSTYLE;
-                setAttributes({ PARAGRAPHSTYLES_BORDERSTYLE });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERSTYLE });
             }
 
@@ -504 +508 @@
                     "PARAGRAPHSTYLES_BORDERCOLOR"
                 ].default = PARAGRAPHSTYLES_BORDERCOLOR;
-                setAttributes({ PARAGRAPHSTYLES_BORDERCOLOR });
+                return setAttributes({ PARAGRAPHSTYLES_BORDERCOLOR });
             }
 
@@ -521 +525 @@
                     "PARAGRAPHSTYLES_BACKGROUNDCOLOR"
                 ].default = PARAGRAPHSTYLES_BACKGROUNDCOLOR;
-                setAttributes({ PARAGRAPHSTYLES_BACKGROUNDCOLOR });
+                return setAttributes({ PARAGRAPHSTYLES_BACKGROUNDCOLOR });
             }
 
@@ -554 +558 @@
                     "PARAGRAPHSTYLES_MARGINTOPBOTTOM"
                 ].default = PARAGRAPHSTYLES_MARGINTOPBOTTOM;
-                setAttributes({ PARAGRAPHSTYLES_MARGINTOPBOTTOM });
+                return setAttributes({ PARAGRAPHSTYLES_MARGINTOPBOTTOM });
             }
 
@@ -587 +591 @@
                     "PARAGRAPHSTYLES_MARGINLEFTRIGHT"
                 ].default = PARAGRAPHSTYLES_MARGINLEFTRIGHT;
-                setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHT });
+                return setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHT });
             }
 
@@ -617 +621 @@
                     "PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT"
                 ].default = PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT;
-                setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT });
+                return setAttributes({ PARAGRAPHSTYLES_MARGINLEFTRIGHTUNIT });
             }
 
@@ -636 +640 @@
                     "PARAGRAPHSTYLES_PADDINGTOPBOTTOM"
                 ].default = PARAGRAPHSTYLES_PADDINGTOPBOTTOM;
-                setAttributes({ PARAGRAPHSTYLES_PADDINGTOPBOTTOM });
+                return setAttributes({ PARAGRAPHSTYLES_PADDINGTOPBOTTOM });
             }
 
@@ -655 +659 @@
                     "PARAGRAPHSTYLES_PADDINGLEFTRIGHT"
                 ].default = PARAGRAPHSTYLES_PADDINGLEFTRIGHT;
-                setAttributes({ PARAGRAPHSTYLES_PADDINGLEFTRIGHT });
+                return setAttributes({ PARAGRAPHSTYLES_PADDINGLEFTRIGHT });
             }
 
@@ -673 +677 @@
                     "PARAGRAPHSTYLES_LINEHEIGHT"
                 ].default = PARAGRAPHSTYLES_LINEHEIGHT;
-                setAttributes({ PARAGRAPHSTYLES_LINEHEIGHT });
+                return setAttributes({ PARAGRAPHSTYLES_LINEHEIGHT });
             }
 
@@ -687 +691 @@
                     "PARAGRAPHSTYLES_WIDTH"
                 ].default = PARAGRAPHSTYLES_WIDTH;
-                setAttributes({ PARAGRAPHSTYLES_WIDTH });
+                return setAttributes({ PARAGRAPHSTYLES_WIDTH });
             }
 
@@ -747 +751 @@
                             "VERSIONSTYLES_BOLD"
                         ].default = VERSIONSTYLES_BOLD;
-                        setAttributes({ VERSIONSTYLES_BOLD });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "VERSIONSTYLES_ITALIC"
                         ].default = VERSIONSTYLES_ITALIC;
-                        setAttributes({ VERSIONSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "VERSIONSTYLES_UNDERLINE"
                         ].default = VERSIONSTYLES_UNDERLINE;
-                        setAttributes({ VERSIONSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "VERSIONSTYLES_STRIKETHROUGH"
                         ].default = VERSIONSTYLES_STRIKETHROUGH;
-                        setAttributes({ VERSIONSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ VERSIONSTYLES_STRIKETHROUGH });
                 }
             }
@@ -788 +788 @@
                     "VERSIONSTYLES_FONTSIZE"
                 ].default = VERSIONSTYLES_FONTSIZE;
-                setAttributes({ VERSIONSTYLES_FONTSIZE });
+                return setAttributes({ VERSIONSTYLES_FONTSIZE });
             }
 
@@ -809 +809 @@
                     "VERSIONSTYLES_FONTSIZEUNIT"
                 ].default = VERSIONSTYLES_FONTSIZEUNIT;
-                setAttributes({ VERSIONSTYLES_FONTSIZEUNIT });
+                return setAttributes({ VERSIONSTYLES_FONTSIZEUNIT });
             }
 
@@ -826 +826 @@
                     "VERSIONSTYLES_TEXTCOLOR"
                 ].default = VERSIONSTYLES_TEXTCOLOR;
-                setAttributes({ VERSIONSTYLES_TEXTCOLOR });
+                return setAttributes({ VERSIONSTYLES_TEXTCOLOR });
             }
 
@@ -886 +886 @@
                             "BOOKCHAPTERSTYLES_BOLD"
                         ].default = BOOKCHAPTERSTYLES_BOLD;
-                        setAttributes({ BOOKCHAPTERSTYLES_BOLD });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "BOOKCHAPTERSTYLES_ITALIC"
                         ].default = BOOKCHAPTERSTYLES_ITALIC;
-                        setAttributes({ BOOKCHAPTERSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "BOOKCHAPTERSTYLES_UNDERLINE"
                         ].default = BOOKCHAPTERSTYLES_UNDERLINE;
-                        setAttributes({ BOOKCHAPTERSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "BOOKCHAPTERSTYLES_STRIKETHROUGH"
                         ].default = BOOKCHAPTERSTYLES_STRIKETHROUGH;
-                        setAttributes({ BOOKCHAPTERSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ BOOKCHAPTERSTYLES_STRIKETHROUGH });
                 }
             }
@@ -927 +923 @@
                     "BOOKCHAPTERSTYLES_FONTSIZE"
                 ].default = BOOKCHAPTERSTYLES_FONTSIZE;
-                setAttributes({ BOOKCHAPTERSTYLES_FONTSIZE });
+                return setAttributes({ BOOKCHAPTERSTYLES_FONTSIZE });
             }
 
@@ -948 +944 @@
                     "BOOKCHAPTERSTYLES_FONTSIZEUNIT"
                 ].default = BOOKCHAPTERSTYLES_FONTSIZEUNIT;
-                setAttributes({ BOOKCHAPTERSTYLES_FONTSIZEUNIT });
+                return setAttributes({ BOOKCHAPTERSTYLES_FONTSIZEUNIT });
             }
 
@@ -965 +961 @@
                     "BOOKCHAPTERSTYLES_TEXTCOLOR"
                 ].default = BOOKCHAPTERSTYLES_TEXTCOLOR;
-                setAttributes({ BOOKCHAPTERSTYLES_TEXTCOLOR });
+                return setAttributes({ BOOKCHAPTERSTYLES_TEXTCOLOR });
             }
 
@@ -1025 +1021 @@
                             "VERSENUMBERSTYLES_BOLD"
                         ].default = VERSENUMBERSTYLES_BOLD;
-                        setAttributes({ VERSENUMBERSTYLES_BOLD });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "VERSENUMBERSTYLES_ITALIC"
                         ].default = VERSENUMBERSTYLES_ITALIC;
-                        setAttributes({ VERSENUMBERSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "VERSENUMBERSTYLES_UNDERLINE"
                         ].default = VERSENUMBERSTYLES_UNDERLINE;
-                        setAttributes({ VERSENUMBERSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "VERSENUMBERSTYLES_STRIKETHROUGH"
                         ].default = VERSENUMBERSTYLES_STRIKETHROUGH;
-                        setAttributes({ VERSENUMBERSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ VERSENUMBERSTYLES_STRIKETHROUGH });
                 }
             }
@@ -1066 +1058 @@
                     "VERSENUMBERSTYLES_FONTSIZE"
                 ].default = VERSENUMBERSTYLES_FONTSIZE;
-                setAttributes({ VERSENUMBERSTYLES_FONTSIZE });
+                return setAttributes({ VERSENUMBERSTYLES_FONTSIZE });
             }
 
@@ -1087 +1079 @@
                     "VERSENUMBERSTYLES_FONTSIZEUNIT"
                 ].default = VERSENUMBERSTYLES_FONTSIZEUNIT;
-                setAttributes({ VERSENUMBERSTYLES_FONTSIZEUNIT });
+                return setAttributes({ VERSENUMBERSTYLES_FONTSIZEUNIT });
             }
 
@@ -1104 +1096 @@
                     "VERSENUMBERSTYLES_TEXTCOLOR"
                 ].default = VERSENUMBERSTYLES_TEXTCOLOR;
-                setAttributes({ VERSENUMBERSTYLES_TEXTCOLOR });
+                return setAttributes({ VERSENUMBERSTYLES_TEXTCOLOR });
             }
 
@@ -1240 +1232 @@
                     "VERSENUMBERSTYLES_VALIGN"
                 ].default = VERSENUMBERSTYLES_VALIGN;
-                setAttributes({ VERSENUMBERSTYLES_VALIGN });
+                return setAttributes({ VERSENUMBERSTYLES_VALIGN });
             }
 
@@ -1366 +1358 @@
                             "VERSETEXTSTYLES_BOLD"
                         ].default = VERSETEXTSTYLES_BOLD;
-                        setAttributes({ VERSETEXTSTYLES_BOLD });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_BOLD });
                     case BGET.TEXTSTYLE.ITALIC:
                         BibleGetGlobal.BGETProperties[
                             "VERSETEXTSTYLES_ITALIC"
                         ].default = VERSETEXTSTYLES_ITALIC;
-                        setAttributes({ VERSETEXTSTYLES_ITALIC });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_ITALIC });
                     case BGET.TEXTSTYLE.UNDERLINE:
                         BibleGetGlobal.BGETProperties[
                             "VERSETEXTSTYLES_UNDERLINE"
                         ].default = VERSETEXTSTYLES_UNDERLINE;
-                        setAttributes({ VERSETEXTSTYLES_UNDERLINE });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_UNDERLINE });
                     case BGET.TEXTSTYLE.STRIKETHROUGH:
                         BibleGetGlobal.BGETProperties[
                             "VERSETEXTSTYLES_STRIKETHROUGH"
                         ].default = VERSETEXTSTYLES_STRIKETHROUGH;
-                        setAttributes({ VERSETEXTSTYLES_STRIKETHROUGH });
-                        break;
+                        return setAttributes({ VERSETEXTSTYLES_STRIKETHROUGH });
                 }
             }
@@ -1407 +1395 @@
                     "VERSETEXTSTYLES_FONTSIZE"
                 ].default = VERSETEXTSTYLES_FONTSIZE;
-                setAttributes({ VERSETEXTSTYLES_FONTSIZE });
+                return setAttributes({ VERSETEXTSTYLES_FONTSIZE });
             }
 
@@ -1428 +1416 @@
                     "VERSETEXTSTYLES_FONTSIZEUNIT"
                 ].default = VERSETEXTSTYLES_FONTSIZEUNIT;
-                setAttributes({ VERSETEXTSTYLES_FONTSIZEUNIT });
+                return setAttributes({ VERSETEXTSTYLES_FONTSIZEUNIT });
             }
 
@@ -1443 +1431 @@
                 );
                 BibleGetGlobal.BGETProperties["VERSETEXTSTYLES_TEXTCOLOR"].default = VERSETEXTSTYLES_TEXTCOLOR;
-                setAttributes({ VERSETEXTSTYLES_TEXTCOLOR });
+                return setAttributes({ VERSETEXTSTYLES_TEXTCOLOR });
             }
 
@@ -1474 +1462 @@
                 );
                 BibleGetGlobal.BGETProperties["PARAGRAPHSTYLES_FONTFAMILY"].default = PARAGRAPHSTYLES_FONTFAMILY;
-                setAttributes({ PARAGRAPHSTYLES_FONTFAMILY });
+                return setAttributes({ PARAGRAPHSTYLES_FONTFAMILY });
             }
 
@@ -1506 +1494 @@
                         .appendTo("body")
                         .dialog({
-                            close: function () {
-                                $(this).dialog("destroy").remove();
+                            close: () => {
+                                dlg.dialog("destroy").remove();
                             },
                             dialogClass: "bibleGetSearchDlg",
@@ -1529 +1517 @@
                         .appendTo("body")
                         .dialog({
-                            close: function () {
-                                $(this).dialog("destroy").remove();
+                            close: () => {
+                                dlg.dialog("destroy").remove();
                             },
                             dialogClass: "bibleGetSearchDlg",
@@ -1577 +1565 @@
                                         .appendTo("body")
                                         .dialog({
-                                            close: function () {
-                                                $(this).dialog("destroy").remove();
+                                            close: () => {
+                                                dlgNoResults.dialog("destroy").remove();
                                             },
                                             dialogClass: "bibleGetSearchDlg",
@@ -1704 +1692 @@
                                                         "click",
                                                         "button",
-                                                        function () {
+                                                        (ev) => {
+                                                            const tgt = ev.currentTarget;
                                                             //First check the context of the button that was clicked: control panel or searchResultsContents
                                                             let $filterLabel,
@@ -1712 +1701 @@
                                                                 REFRESH = false;
                                                             switch (
-                                                                $(this)
+                                                                $(tgt)
                                                                     .parents(".searchResultsFlexChild")
                                                                     .attr("id")
@@ -1747 +1736 @@
                                                                             : "";
 
-                                                                    switch ($(this).attr("id")) {
+                                                                    switch ($(tgt).attr("id")) {
                                                                         case "ORDER_RESULTS_BY":
                                                                             REFRESH = true;
@@ -1831 +1820 @@
                                                                 case "searchResultsContents":
                                                                     //alert('button was clicked! it is in the context of the searchResultsContents');
-                                                                    //alert($(this).next().prop('tagName') );
+                                                                    //alert($(tgt).next().prop('tagName') );
                                                                     if (
-                                                                        $(this).next("input[type=hidden]").length !=
-                                                                        0
+                                                                        $(tgt).next("input[type=hidden]").length != 0
                                                                     ) {
                                                                         //showSpinner();
-                                                                        let currentRef = $(this)
+                                                                        let currentRef = $(tgt)
                                                                             .parent("td")
                                                                             .next("td")
                                                                             .text();
                                                                         if (
-                                                                            $quotesArr.includes(bookChapterVerse) ===
-                                                                            false
+                                                                            $quotesArr.includes(bookChapterVerse) === false
                                                                         ) {
-                                                                            $(this)
+                                                                            $(tgt)
                                                                                 .addClass("disabled")
                                                                                 .prop("disabled", true);
-                                                                            let $inputval = $(this)
+                                                                            let $inputval = $(tgt)
                                                                                 .next("input[type=hidden]")
                                                                                 .val();
@@ -1877 +1864 @@
                                                     );
                                                 },
-                                                close: function () {
+                                                close: () => {
                                                     $("#searchResultsContainer").off("click");
-                                                    $(this).dialog("destroy").remove();
+                                                    dlg.dialog("destroy").remove();
                                                 },
                                                 dialogClass: "bibleGetSearchDlg",
@@ -2129 +2116 @@
             return createElement(
                 "div",
-                { key: `bibleQuoteWrapperDiv-${incr()}` },
+                {},
                 //Preview a block with a PHP render callback
                 createElement(ServerSideRender, {
@@ -3326 +3313 @@
     });
 
-    $(document).on("click", ".bibleget-popup-trigger", function () {
-        const popup_content = he.decode($(this).attr("data-popupcontent"));
+    $(document).on("click", ".bibleget-popup-trigger", (ev) => {
+        const tgt = ev.currentTarget;
+        const popup_content = he.decode($(tgt).attr("data-popupcontent"));
         const dlg = $(
             '<div class="bibleget-quote-div bibleget-popup">' +
@@ -3336 +3324 @@
             width: $(window).width() * 0.8,
             maxHeight: $(window).height() * 0.8,
-            title: $(this).text(),
+            title: $(tgt).text(),
             create: () => {
                 // style fix for WordPress admin
@@ -3345 +3333 @@
                 dlg.dialog("destroy");
                 $(".bibleget-quote-div.bibleget-popup").remove();
-            },
+            }
         });
         return false;

bibleget-io/trunk/js/jquery.fontselect.js

@@ -306 +306 @@
 (async ($) => {
 
-    const google_fonts = [
-        "Aclonica",
-        "Allan",
-        "Annie+Use+Your+Telescope",
-        "Anonymous+Pro",
-        "Allerta+Stencil",
-        "Allerta",
-        "Amaranth",
-        "Anton",
-        "Architects+Daughter",
-        "Arimo",
-        "Artifika",
-        "Arvo",
-        "Asset",
-        "Astloch",
-        "Bangers",
-        "Bentham",
-        "Bevan",
-        "Bigshot+One",
-        "Bowlby+One",
-        "Bowlby+One+SC",
-        "Brawler",
-        "Buda",
-        "Cabin",
-        "Calligraffitti",
-        "Candal",
-        "Cantarell",
-        "Cardo",
-        "Carter One",
-        "Caudex",
-        "Cedarville+Cursive",
-        "Cherry+Cream+Soda",
-        "Chewy",
-        "Coda",
-        "Coming+Soon",
-        "Copse",
-        "Corben",
-        "Cousine",
-        "Covered+By+Your+Grace",
-        "Crafty+Girls",
-        "Crimson+Text",
-        "Crushed",
-        "Cuprum",
-        "Damion",
-        "Dancing+Script",
-        "Dawning+of+a+New+Day",
-        "Didact+Gothic",
-        "Droid+Sans",
-        "Droid+Sans+Mono",
-        "Droid+Serif",
-        "EB+Garamond",
-        "Expletus+Sans",
-        "Fontdiner+Swanky",
-        "Forum",
-        "Francois+One",
-        "Geo",
-        "Give+You+Glory",
-        "Goblin+One",
-        "Goudy+Bookletter+1911",
-        "Gravitas+One",
-        "Gruppo",
-        "Hammersmith+One",
-        "Holtwood+One+SC",
-        "Homemade+Apple",
-        "Inconsolata",
-        "Indie+Flower",
-        "IM+Fell+DW+Pica",
-        "IM+Fell+DW+Pica+SC",
-        "IM+Fell+Double+Pica",
-        "IM+Fell+Double+Pica+SC",
-        "IM+Fell+English",
-        "IM+Fell+English+SC",
-        "IM+Fell+French+Canon",
-        "IM+Fell+French+Canon+SC",
-        "IM+Fell+Great+Primer",
-        "IM+Fell+Great+Primer+SC",
-        "Irish+Grover",
-        "Irish+Growler",
-        "Istok+Web",
-        "Josefin+Sans",
-        "Josefin+Slab",
-        "Judson",
-        "Jura",
-        "Just+Another+Hand",
-        "Just+Me+Again+Down+Here",
-        "Kameron",
-        "Kenia",
-        "Kranky",
-        "Kreon",
-        "Kristi",
-        "La+Belle+Aurore",
-        "Lato",
-        "League+Script",
-        "Lekton",
-        "Limelight",
-        "Lobster",
-        "Lobster Two",
-        "Lora",
-        "Love+Ya+Like+A+Sister",
-        "Loved+by+the+King",
-        "Luckiest+Guy",
-        "Maiden+Orange",
-        "Mako",
-        "Maven+Pro",
-        "Meddon",
-        "MedievalSharp",
-        "Megrim",
-        "Merriweather",
-        "Metrophobic",
-        "Michroma",
-        "Miltonian Tattoo",
-        "Miltonian",
-        "Modern Antiqua",
-        "Monofett",
-        "Molengo",
-        "Mountains of Christmas",
-        "Muli",
-        "Neucha",
-        "Neuton",
-        "News+Cycle",
-        "Nixie+One",
-        "Nobile",
-        "Nova+Cut",
-        "Nova+Flat",
-        "Nova+Mono",
-        "Nova+Oval",
-        "Nova+Round",
-        "Nova+Script",
-        "Nova+Slim",
-        "Nova+Square",
-        "Nunito",
-        "OFL+Sorts+Mill+Goudy+TT",
-        "Old+Standard+TT",
-        "Open+Sans",
-        "Open+Sans+Condensed",
-        "Orbitron",
-        "Oswald",
-        "Over+the+Rainbow",
-        "Reenie+Beanie",
-        "Pacifico",
-        "Patrick+Hand",
-        "Paytone+One",
-        "Permanent+Marker",
-        "Philosopher",
-        "Play",
-        "Playfair+Display",
-        "Podkova",
-        "PT+Sans",
-        "PT+Sans+Narrow",
-        "PT+Serif",
-        "PT+Serif Caption",
-        "Puritan",
-        "Quattrocento",
-        "Quattrocento+Sans",
-        "Radley",
-        "Raleway",
-        "Redressed",
-        "Rock+Salt",
-        "Rokkitt",
-        "Roboto",
-        "Ruslan+Display",
-        "Schoolbell",
-        "Shadows+Into+Light",
-        "Shanti",
-        "Sigmar+One",
-        "Six+Caps",
-        "Slackey",
-        "Smythe",
-        "Sniglet",
-        "Special+Elite",
-        "Stardos+Stencil",
-        "Sue+Ellen+Francisco",
-        "Sunshiney",
-        "Swanky+and+Moo+Moo",
-        "Syncopate",
-        "Tangerine",
-        "Tenor+Sans",
-        "Terminal+Dosis+Light",
-        "The+Girl+Next+Door",
-        "Tinos",
-        "Ubuntu",
-        "Ultra",
-        "Unkempt",
-        "UnifrakturCook",
-        "UnifrakturMaguntia",
-        "Varela",
-        "Varela Round",
-        "Vibur",
-        "Vollkorn",
-        "VT323",
-        "Waiting+for+the+Sunrise",
-        "Wallpoet",
-        "Walter+Turncoat",
-        "Wire+One",
-        "Yanone+Kaffeesatz",
-        "Yeseva+One",
-        "Zeyada",
-    ];
-
     $.fontselect = {
         settings: {
@@ -518 +319 @@
         //console.log('Google Font API key not detected, using fallback list...');
         //console.warn(ex);
-    }) || google_fonts;
+    }) || await fetch('../wp-content/plugins/bibleget-io/js/googlefonts-fallback.json').then(result => result.json());
     //console.log('length of google fonts after api call: ' + $.fontselect.google_fonts.length);
 

bibleget-io/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => 'johnrdorazio/bibleget-wordpress',
-        'pretty_version' => '8.1',
-        'version' => '8.1.0.0',
-        'reference' => '6321cd234b2d083d3bc1aa4915dfce35fa572cc5',
+        'pretty_version' => '8.2',
+        'version' => '8.2.0.0',
+        'reference' => '442a7919a8a39ee149b5136f453972f664554573',
         'type' => 'wordpress-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -12 +12 @@
     'versions' => array(
         'johnrdorazio/bibleget-wordpress' => array(
-            'pretty_version' => '8.1',
-            'version' => '8.1.0.0',
-            'reference' => '6321cd234b2d083d3bc1aa4915dfce35fa572cc5',
+            'pretty_version' => '8.2',
+            'version' => '8.2.0.0',
+            'reference' => '442a7919a8a39ee149b5136f453972f664554573',
             'type' => 'wordpress-plugin',
             'install_path' => __DIR__ . '/../../',