]> _ Git - fluidbook-html5.git/commitdiff
Merge remote-tracking branch 'origin/mobilezoom'
authorVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 2 May 2017 13:28:10 +0000 (15:28 +0200)
committerVincent Vanwaelscappel <vincent@cubedesigners.com>
Tue, 2 May 2017 13:28:10 +0000 (15:28 +0200)
1  2 
js/libs/fluidbook/fluidbook.desktop.js
js/libs/fluidbook/fluidbook.resize.js
style/fluidbook.css
style/fluidbook.less

index a103666fc96d00152e067f4f8ee08e2eb1450d0b,7260372cb79c8e7b2f46a42562c3852436ec8316..14c7e48f5509186f971549ca0b1173fa5990b9b0
@@@ -10,8 -8,9 +8,9 @@@ FluidbookDesktop.prototype = 
          var $this = this;
          $(document).on('click', '#links', function (e) {
              $this.clickZoom(e);
+             return false;
          });
 -        $(document).on('click', '#links .link', function (e) {
 +        $(document).on('click', '#links .link:not(.eventOverlayLink)', function (e) {
              e.stopPropagation();
          })
  
Simple merge
Simple merge
Simple merge