Make screenshot feature compatible with Firefox 40

2015-08-23 10:47:12 -04:00
parent b944b44dca
commit dd239ddb59
5 changed files with 5 additions and 4 deletions
--- a/assets/js/app.js
+++ b/assets/js/app.js
--- a/assets/js/src/Dropdown.js
+++ b/assets/js/src/Dropdown.js
@@ -18,7 +18,7 @@ Dropdown.prototype.listen = function() {
        if (! submenu.is(':visible')) {
            self.close();

-            if ($(this).offset().top + submenuHeight > $(window).height()) {
+            if ($(this).offset().top + submenuHeight - $(window).scrollTop() > $(window).height()) {
                submenu.addClass('dropdown-submenu-open dropdown-submenu-top');
            }
            else {
--- a/assets/js/src/Screenshot.js
+++ b/assets/js/src/Screenshot.js
@@ -106,7 +106,7 @@ Screenshot.prototype.checkInput = function() {
        }
    }

-    pasteCatcher.innerHTML = "";
+    this.pasteCatcher.innerHTML = "";
 };

 // Creates a new image from a given source