From c5cbd15c3bba7145f83ff60fb90ef15872c64608 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Tue, 27 Mar 2012 13:02:30 +0000 Subject: [PATCH] --- fluidbook/compile/_js/fluidbook.js | 36 +++++++++++++++++++---------- fluidbook/compile/index.html | 1 + inc/ws/Controlleur/class.ws.url.php | 2 +- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/fluidbook/compile/_js/fluidbook.js b/fluidbook/compile/_js/fluidbook.js index 4e723d7d5..b784fec9e 100644 --- a/fluidbook/compile/_js/fluidbook.js +++ b/fluidbook/compile/_js/fluidbook.js @@ -141,26 +141,26 @@ function wheel(event){ if (event.wheelDelta) { /* IE/Opera. */ delta = event.wheelDelta/120; /** In Opera 9, delta differs in sign as compared to IE. - */ + */ if (window.opera) delta = -delta; } else if (event.detail) { /** Mozilla case. */ /** In Mozilla, sign of delta is different than in IE. - * Also, delta is multiple of 3. - */ + * Also, delta is multiple of 3. + */ delta = -event.detail/3; } /** If delta is nonzero, handle it. - * Basically, delta is now positive if wheel was scrolled up, - * and negative, if wheel was scrolled down. - */ + * Basically, delta is now positive if wheel was scrolled up, + * and negative, if wheel was scrolled down. + */ if (delta){ handleWheel(delta); } /** Prevent default actions caused by mouse wheel. - * That might be ugly, but we handle scrolls somehow - * anyway, so don't bother here.. - */ + * That might be ugly, but we handle scrolls somehow + * anyway, so don't bother here.. + */ if (event.preventDefault){ event.preventDefault(); } @@ -168,11 +168,23 @@ function wheel(event){ } /** Initialization code. -* If you use your own event management code, change it as required. -*/ + * If you use your own event management code, change it as required. + */ if (window.addEventListener){ /** DOMMouseScroll is for mozilla. */ window.addEventListener('DOMMouseScroll', wheel, false); } /** IE/Opera. */ -window.onmousewheel = document.onmousewheel = wheel; \ No newline at end of file +window.onmousewheel = document.onmousewheel = wheel; + +window.onkeydown=key; +window.onkeypress=key; +window.onkeydown=key; + +function key(e){ + if(e.ctrlKey && (e.keyCode==80 || e.keyCode==112)){ + return false; + } + + return true; +} \ No newline at end of file diff --git a/fluidbook/compile/index.html b/fluidbook/compile/index.html index da2c19e2e..c15cdc46c 100644 --- a/fluidbook/compile/index.html +++ b/fluidbook/compile/index.html @@ -13,6 +13,7 @@ $facebook $title + $redirectScript diff --git a/inc/ws/Controlleur/class.ws.url.php b/inc/ws/Controlleur/class.ws.url.php index f945ca7b6..01cbf7de6 100644 --- a/inc/ws/Controlleur/class.ws.url.php +++ b/inc/ws/Controlleur/class.ws.url.php @@ -841,7 +841,6 @@ html{height:100%}' . "\n"; $fv['monitoring'] = '1'; } - if ($version == 1) { $fv['id'] = $book_id; $fv['mail'] = '0'; @@ -852,6 +851,7 @@ html{height:100%}' . "\n"; $res = ''; $res .= ''; $res .= '' . $book->parametres->title . ''; + $res.=''; // Entêtes Facebook if ($book->parametres->facebook) { $meta['og:title'] = ($book->parametres->facebook_title == '') ? $book->parametres->title : $book->parametres->facebook_title; -- 2.39.5