share eingebaut

src/js/init.js

@@ -37,9 +37,9 @@ ThemeManager.addTheme(new Theme("green", "green"));
 ThemeManager.addTheme(new Theme("pink", "pink"));
 ThemeManager.addTheme(new Theme("dark", "dark"));
 
-ShareManager.addShareButton(new WhatsappShareButton('img/whatsapp.svg'));
-ShareManager.addShareButton(new SmsShareButton('img/sms.svg'));
-ShareManager.addShareButton(new TelegramShareButton('img/telegram.svg'));
+ShareManager.addShareButton(new WhatsappShareButton('img/whatsapp.svg', true));
+ShareManager.addShareButton(new SmsShareButton('img/sms.svg', true));
+ShareManager.addShareButton(new TelegramShareButton('img/telegram.svg', true));
 // ShareManager.addShareButton(new CopyShareButton('img/copy.svg'));
 
 let app = new App();

src/js/lib/pwa-lib.js

@@ -3660,11 +3660,15 @@ ScriptLoader.scriptPromises = {};
 ScriptLoader.cssPromises = {};
 
 class ShareButton {
-    constructor(deviceType, icon, callback)
+    constructor(deviceType, icon, callback, shouldLoadImg)
     {
         this._deviceType = deviceType;
         this._icon = icon;
         this._callback = callback;
+        console.log("shouldLoad", Helper.nonNull(shouldLoadImg, false), shouldLoadImg);
+        if (Helper.nonNull(shouldLoadImg, false)){
+            this._icon = ViewInflater.inflate(this._icon);
+        }
     }
 
     shouldShowFor(deviceType)
@@ -3690,7 +3694,7 @@ ShareButton.TYPE_ALL = ShareButton.TYPE_DESKTOP+ShareButton.TYPE_MOBILE;
 
 class CopyShareButton extends ShareButton
 {
-    constructor(icon) {
+    constructor(icon, shouldLoadImg) {
         super(ShareButton.TYPE_ALL, icon, function (link) {
             try{
                 let elementToCopy = document.createElement("div");
@@ -3715,7 +3719,7 @@ class CopyShareButton extends ShareButton
             } catch(e) {
                 console.error(e);
             }
-        });
+        }, shouldLoadImg);
     }
 }
 
@@ -3728,13 +3732,11 @@ class ShareManager {
         ShareManager.shareButtons.push(shareButton);
     }
 
-    static generateDefaultShareElement(shareUrl)
-    {
+    static generateDefaultShareElement(shareUrl) {
         return ShareManager.generateShareElement(shareUrl, ShareManager.getDefaultGenerateCallback());
     }
 
-    static generateDefaultShareElementForButtons(shareUrl, buttons)
-    {
+    static generateDefaultShareElementForButtons(shareUrl, buttons) {
         return ShareManager.generateShareElementForButtons(shareUrl, buttons, ShareManager.getDefaultGenerateCallback());
     }
 
@@ -3742,14 +3744,13 @@ class ShareManager {
         return ShareManager.generateShareElementForButtons(shareUrl, ShareManager.shareButtons, generateCallback);
     }
 
-    static generateShareElementForButtons(shareUrl, buttons,  generateCallback)
-    {
+    static generateShareElementForButtons(shareUrl, buttons, generateCallback) {
         let shareButtonElement = document.createElement("div");
         let currentDeviceType = ShareManager.getCurrentDeviceType();
         for (let i = 0, n = buttons.length; i < n; i++) {
             if (buttons[i].shouldShowFor(currentDeviceType)) {
                 let elem = generateCallback(buttons[i], shareUrl);
-                elem.onclick = function(event){
+                elem.onclick = function (event) {
                     buttons[i].getCallback()(shareUrl, this, event);
                 };
                 shareButtonElement.appendChild(elem);
@@ -3770,15 +3771,22 @@ class ShareManager {
         }
     }
 
-    static getDefaultGenerateCallback()
-    {
-        return function(button){
+    static getDefaultGenerateCallback() {
+        return function (button) {
             let linkElement = document.createElement("a");
-            let iconElement = document.createElement("img");
-            linkElement.appendChild(iconElement);
-
-            iconElement.src = Helper.basePath(button.getIcon());
-            iconElement.classList.add("share-icon");
+            linkElement.classList.add("share-icon");
+            let iconUrl = button.getIcon();
+            if (typeof iconUrl === "string") {
+                let iconElement = document.createElement("img");
+                iconElement.src = Helper.basePath(button.getIcon());
+                iconElement.classList.add("share-icon");
+                linkElement.appendChild(iconElement);
+            }
+            else {
+                Promise.resolve(iconUrl).then(elem => {
+                    linkElement.appendChild(elem);
+                });
+            }
 
             return linkElement;
         }
@@ -3789,7 +3797,7 @@ ShareManager.init();
 
 class SmsShareButton extends ShareButton
 {
-    constructor(icon) {
+    constructor(icon, shouldLoadImg) {
         super(ShareButton.TYPE_MOBILE, icon, function (link) {
             let linkToOpen = "";
             if (ShareManager.getCurrentDeviceType() === ShareButton.TYPE_MOBILE_APPLE) {
@@ -3799,21 +3807,21 @@ class SmsShareButton extends ShareButton
                 linkToOpen = "sms:?body=" + encodeURIComponent(link);
             }
             window.open(linkToOpen, '_blank');
-        });
+        }, shouldLoadImg);
     }
 }
 
 class TelegramShareButton extends ShareButton {
-    constructor(icon) {
+    constructor(icon, shouldLoadImg) {
         super(ShareButton.TYPE_ALL, icon, function (link) {
             let linkToOpen = "https://t.me/share/url?url="+encodeURIComponent(link);
             window.open(linkToOpen, '_blank');
-        });
+        }, shouldLoadImg);
     }
 }
 
 class WhatsappShareButton extends ShareButton {
-    constructor(icon) {
+    constructor(icon, shouldLoadImg) {
         super(ShareButton.TYPE_ALL, icon, function (link) {
             let linkToOpen = "";
             if (ShareManager.getCurrentDeviceType() === ShareButton.TYPE_DESKTOP) {
@@ -3823,7 +3831,7 @@ class WhatsappShareButton extends ShareButton {
                 linkToOpen = "whatsapp://send?text=" + encodeURIComponent(link);
             }
             window.open(linkToOpen, '_blank');
-        });
+        }, shouldLoadImg);
     }
 }