Fix toolbar float_start error in plots2 (#600)

* fix toolbar float_start error in plots2 * fix syntax error Co-authored-by: Jeffrey Warren <jeff@unterbahn.com> Co-authored-by: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com>
publiclab · Sep 1, 2020 · 7fabfa6 · 7fabfa6
1 parent bf2a111
commit 7fabfa6
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/dist/PublicLab.Editor.js b/dist/PublicLab.Editor.js
@@ -22777,7 +22777,7 @@ module.exports = PublicLab.MainImageModule = PublicLab.Module.extend({
       }
 
       if (id) _editor.data.main_image = id;
-      
+
       return _module.options.url;
     };
 
@@ -22903,11 +22903,11 @@ module.exports = PublicLab.MainImageModule = PublicLab.Module.extend({
         _module.el.find('.progress').hide();
         infoArea.textContent = '';
         showImage = false;
-      _module.options.url = '';
-      _module.image.src = '';
-      _editor.data.has_main_image = false;
-      _editor.data.image_revision = '';
-      $('#removeFile').hide();
+        _module.options.url = '';
+        _module.image.src = '';
+        _editor.data.has_main_image = false;
+        _editor.data.image_revision = '';
+        $('#removeFile').hide();
       };
     }
   }
@@ -23636,17 +23636,18 @@ module.exports = PublicLab.RichTextModule = PublicLab.Module.extend({
 
     // if scrolling through the editor text area the toolbar will float
     var wkC = document.getElementsByClassName("wk-commands")[0];
+    console.log('one2');
 
     $(window).scroll(function() {
-      var textAreaRect = document
-          .getElementsByClassName("wk-container")[0]
+      var textAreaRect = $(".ple-textarea")[0]
+          .getBoundingClientRect();
+      var richAreaRect = $(".wk-wysiwyg")[0]
           .getBoundingClientRect();
-      var footerRect = document
-          .getElementsByClassName("ple-footer")[0]
+      var footerRect = $(".ple-footer")[0]
           .getBoundingClientRect().height;
 
       if (
-        textAreaRect.bottom >= ((window.innerHeight || document.documentElement.clientHeight) - footerRect) && textAreaRect.top <= ((window.innerHeight || document.documentElement.clientHeight) - footerRect)
+        (textAreaRect.bottom || richAreaRect.bottom) >= ((window.innerHeight || document.documentElement.clientHeight) - footerRect) && (textAreaRect.top || richAreaRect.top) <= ((window.innerHeight || document.documentElement.clientHeight) - footerRect)
       ) {
         wkC.style.position = "fixed";
         wkC.style.bottom = footerRect + "px";

diff --git a/src/modules/PublicLab.RichTextModule.js b/src/modules/PublicLab.RichTextModule.js
@@ -308,17 +308,18 @@ module.exports = PublicLab.RichTextModule = PublicLab.Module.extend({
 
     // if scrolling through the editor text area the toolbar will float
     var wkC = document.getElementsByClassName("wk-commands")[0];
+    console.log('one2');
 
     $(window).scroll(function() {
-      var textAreaRect = document
-          .getElementsByClassName("wk-container")[0]
+      var textAreaRect = $(".ple-textarea")[0]
           .getBoundingClientRect();
-      var footerRect = document
-          .getElementsByClassName("ple-footer")[0]
+      var richAreaRect = $(".wk-wysiwyg")[0]
+          .getBoundingClientRect();
+      var footerRect = $(".ple-footer")[0]
           .getBoundingClientRect().height;
 
       if (
-        textAreaRect.bottom >= ((window.innerHeight || document.documentElement.clientHeight) - footerRect) && textAreaRect.top <= ((window.innerHeight || document.documentElement.clientHeight) - footerRect)
+        (textAreaRect.bottom || richAreaRect.bottom) >= ((window.innerHeight || document.documentElement.clientHeight) - footerRect) && (textAreaRect.top || richAreaRect.top) <= ((window.innerHeight || document.documentElement.clientHeight) - footerRect)
       ) {
         wkC.style.position = "fixed";
         wkC.style.bottom = footerRect + "px";