loleaflet/dist/toolbar/toolbar.js |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 632c57df0851ae61c0fcf398c73dcf0fd05fd658
Author: Pranav Kant <[email protected]>
Date:   Wed Dec 14 21:32:35 2016 +0530

    loleaflet: Fix stray toolbar items in corner cases
    
    Change-Id: I4d2684548a9fb325afb62d4811f17f436621027f

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index e168ac2..4f63c0d 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -1392,7 +1392,6 @@ $(window).resize(function() {
 });
 
 $(document).ready(function() {
-       resizeToolbar();
        var toolbar = w2ui['toolbar-up'];
        if (closebutton) {
                toolbar.show('close');
commit 7ce89800cb1cc2d50e0cde9936cb7ec1b0b6c4a8
Author: Pranav Kant <[email protected]>
Date:   Wed Dec 14 21:37:02 2016 +0530

    loleaflet: Check if this element exists before querying length
    
    eg: for spreadsheets
    
    Change-Id: Ie40fa27833fa0edb0e444a247895a1cb401b15b2

diff --git a/loleaflet/dist/toolbar/toolbar.js 
b/loleaflet/dist/toolbar/toolbar.js
index a80ab4a..e168ac2 100644
--- a/loleaflet/dist/toolbar/toolbar.js
+++ b/loleaflet/dist/toolbar/toolbar.js
@@ -428,7 +428,7 @@ $(function () {
                        }
 
                        // Fill the style select box if not yet filled
-                       if ($('.styles-select')[0].length === 0) {
+                       if ($('.styles-select')[0] && 
$('.styles-select')[0].length === 0) {
                                var data = [''];
                                // Inserts a separator element
                                data = data.concat({text: 
'\u2500\u2500\u2500\u2500\u2500\u2500', disabled: true});
_______________________________________________
Libreoffice-commits mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to