wip #6788 @4:00

diff --git a/resources/linkeditor/js/linkeditor.js b/resources/linkeditor/js/linkeditor.js
index 99b07030b25c96277e8bcda1716856b59f9b3e46..c52cdd431925fa0e68a72d3173679d18f25d1679 100644 (file)
--- a/resources/linkeditor/js/linkeditor.js
+++ b/resources/linkeditor/js/linkeditor.js
@@ -64,8 +64,6 @@ import LinkeditorPreviewLinks from "./linkeditor.previewLinks";
 
 window.MD5 = require("crypto-js/md5");
 
-console.log(window.MD5("MaisonNeue-Medium.otf").toString().substring(0,10))
-
 $.ajaxSetup({
     headers: {
         'X-CSRF-TOKEN': $('meta[name="csrf-token"]').attr('content')
@@ -379,6 +377,11 @@ LinkEditor.prototype = {
                     let v = parseFloat($(e).attr('fb-' + dim));
                     if (dim === 'width' || dim === 'height') {
                         css[dim] = (v * ($this.fs * $this.zoom.zoom)) + 1;
+                        if(dim === 'height') {
+                            if(LINKS[$(e).attr('fb-uid')].type === '35') {
+                                $this.links.setFontSize(LINKS[$(e).attr('fb-uid')])
+                            }
+                        }
                     } else {
                         css[dim] = $this.fluidbookTo(v, dim, rect);
                     }

diff --git a/resources/linkeditor/js/linkeditor.links.js b/resources/linkeditor/js/linkeditor.links.js
index 6a2dff28ec9004c8a30787763471f29209f995ee..66a9d1a05dee16e699e96b45ea90ed7a1a68a21c 100644 (file)
--- a/resources/linkeditor/js/linkeditor.links.js
+++ b/resources/linkeditor/js/linkeditor.links.js
@@ -1631,7 +1631,7 @@ LinkeditorLinks.prototype = {
                 })
             } else if (linkData.type === '35') {
                 var hash = 'fb_' + window.MD5(linkData.image).toString().substring(0, 10)
-                this.setFontSize(linkData, hash)
+                this.setFontSize(linkData)
                 $("[data-id-preview=" + linkData.uid + "]").text(linkData.to).css({
                     'height': 'auto',
                     'width': 'max-content',
@@ -1692,13 +1692,21 @@ LinkeditorLinks.prototype = {
         }
     },
 
-    setFontSize: function(link, hash) {
+    setFontSize: function(link) {
         var pw = FLUIDBOOK_DATA.settings.width;
         var ph = FLUIDBOOK_DATA.settings.height;
+        var ratio = pw / ph;
 
-        var fs = link.height * (3 * Math.min(( 567 / pw), (709 / ph)));
+        let h = $('[fb-uid="'+link.uid+'"]').get(0).getBoundingClientRect().height;
+        var fs = (h * (3 * Math.min(( 567 / pw), (709 / ph))));
+
+        console.log(h)
+
+
+        var hash = 'fb_' + window.MD5(link.image).toString().substring(0, 10)
 
         try {
+            console.log('fs',(fs / FONT_SIZE[hash]['capHeight']))
             $("[data-id-preview=" + link.uid + "]").text(link.to).css({
                 'font-size': (fs / FONT_SIZE[hash]['capHeight']).toFixed(2) + 'px',
                 'line-height': FONT_SIZE[hash]['capHeight']
@@ -1712,7 +1720,9 @@ LinkeditorLinks.prototype = {
         let scaleString = link.image_rollover.split('\n').filter((n) => { return n.includes('scale') })[0]
         let scale = scaleString ? parseFloat(scaleString.split('=')[1]) : 1
 
-        let zoom = this.linkeditor.zoom.zoom / 3
+        let zoom = 0.39
+
+        console.log("zoom",this.linkeditor.zoom.zoom)
 
         $("[data-id-preview="+link.uid+"]").css({
             transform: "scale("+scale+")",