Skip to content

E
edx-platform
Commit 08404672 by Giulio Gratta
Options

Making edX changes to pdf viewer/analytics html

parent 4726da6c
Showing with 35 additions and 24 deletions
lms/static/js/pdf-analytics.js
...@@ -13,10 +13,10 @@ $(function() { ...@@ -13,10 +13,10 @@ $(function() {
$(window).bind("pagechange", function(event) { $(window).bind("pagechange", function(event) {
// log every page render // log every page render
var page = event.originalEvent.pageNumber; var page = PDFViewerApplication.page;
var old_page = PDFView.previousPageNumber; var old_page = event.originalEvent.previousPageNumber;
// pagechange is called many times per viewing. // pagechange is called many times per viewing.
if (PDFView.previousPageNumber !== page || first_page) { if (old_page !== page || first_page) {
first_page = false; first_page = false;
if ((event.timeStamp - scroll.timeStamp) < 50) { if ((event.timeStamp - scroll.timeStamp) < 50) {
sendLog("page.scrolled", {"page": page, "direction": scroll.direction}); sendLog("page.scrolled", {"page": page, "direction": scroll.direction});
...@@ -28,12 +28,12 @@ $(function() { ...@@ -28,12 +28,12 @@ $(function() {
$('#viewerContainer').bind('DOMMouseScroll mousewheel', function(event) { $('#viewerContainer').bind('DOMMouseScroll mousewheel', function(event) {
scroll.timeStamp = event.timeStamp; scroll.timeStamp = event.timeStamp;
scroll.direction = PDFView.pageViewScroll.down ? "down" : "up"; scroll.direction = PDFViewerApplication.pdfViewer.scroll.down ? "down" : "up";
}); });
}); });
$('#viewThumbnail,#sidebarToggle').on('click', function() { $('#viewThumbnail,#sidebarToggle').on('click', function() {
sendLog("thumbnails.toggled", {"page": PDFView.page}); sendLog("thumbnails.toggled", {"page": PDFViewerApplication.page});
}); });
$('#thumbnailView a').live('click', function(){ $('#thumbnailView a').live('click', function(){
...@@ -41,19 +41,19 @@ $('#thumbnailView a').live('click', function(){ ...@@ -41,19 +41,19 @@ $('#thumbnailView a').live('click', function(){
}); });
$('#viewOutline').on('click', function() { $('#viewOutline').on('click', function() {
sendLog("outline.toggled", {"page": PDFView.page}); sendLog("outline.toggled", {"page": PDFViewerApplication.page});
}); });
$('#previous').on('click', function() { $('#previous').on('click', function() {
sendLog("page.navigatednext", {"type": "prevpage", "new": PDFView.page - 1}, "book"); sendLog("page.navigatednext", {"type": "prevpage", "new": PDFViewerApplication.page - 1}, "book");
}); });
$('#next').on('click', function() { $('#next').on('click', function() {
sendLog("page.navigatednext", {"type": "nextpage", "new": PDFView.page + 1}, "book"); sendLog("page.navigatednext", {"type": "nextpage", "new": PDFViewerApplication.page + 1}, "book");
}); });
$('#zoomIn,#zoomOut').on('click', function() { $('#zoomIn,#zoomOut').on('click', function() {
sendLog("zoom.buttons.changed", {"direction": $(this).attr("id") == "zoomIn" ? "in" : "out", "page": PDFView.page}); sendLog("zoom.buttons.changed", {"direction": $(this).attr("id") == "zoomIn" ? "in" : "out", "page": PDFViewerApplication.page});
}); });
$('#pageNumber').on('change', function() { $('#pageNumber').on('change', function() {
...@@ -61,16 +61,16 @@ $('#pageNumber').on('change', function() { ...@@ -61,16 +61,16 @@ $('#pageNumber').on('change', function() {
}); });
var old_amount = 1; var old_amount = 1;
$(window).bind('scalechange', function(evt) { $(window).bind('scalechange', function(event) {
var amount = evt.originalEvent.scale; var amount = event.originalEvent.scale;
if (amount !== old_amount) { if (amount !== old_amount) {
sendLog("display.scaled", {"amount": amount, "page": PDFView.page}); sendLog("display.scaled", {"amount": amount, "page": PDFViewerApplication.page});
old_amount = amount; old_amount = amount;
} }
}); });
$('#scaleSelect').on('change', function() { $('#scaleSelect').on('change', function() {
sendLog("zoom.menu.changed", {"amount": $("#scaleSelect").val(), "page": PDFView.page}); sendLog("zoom.menu.changed", {"amount": $("#scaleSelect").val(), "page": PDFViewerApplication.page});
}); });
var search_event = null; var search_event = null;
...@@ -81,7 +81,7 @@ $(window).bind("find findhighlightallchange findagain findcasesensitivitychange" ...@@ -81,7 +81,7 @@ $(window).bind("find findhighlightallchange findagain findcasesensitivitychange"
search_event = setTimeout(function(){ search_event = setTimeout(function(){
var message = event.originalEvent.detail; var message = event.originalEvent.detail;
message.status = $('#findMsg').text(); message.status = $('#findMsg').text();
message.page = PDFView.page; message.page = PDFViewerApplication.page;
var event_name = "search"; var event_name = "search";
switch (event.type) { switch (event.type) {
case "find": case "find":
......
lms/templates/pdf_viewer.html
<!DOCTYPE html> <!DOCTYPE html>
<%namespace name='static' file='static_content.html'/>
<!-- <!--
Copyright 2012 Mozilla Foundation Copyright 2012 Mozilla Foundation
...@@ -22,20 +23,29 @@ http://sourceforge.net/adobe/cmap/wiki/License/ ...@@ -22,20 +23,29 @@ http://sourceforge.net/adobe/cmap/wiki/License/
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta name="google" content="notranslate"> <meta name="google" content="notranslate">
<title>PDF.js viewer</title> <title>${current_chapter['title'] if current_chapter else '' |h}</title>
<link rel="stylesheet" href="viewer.css"/> <link rel="stylesheet" href="${static.url('/static/css/vendor/pdfjs/viewer.css')}"/>
<script src="compatibility.js"></script> <script type="text/javascript" src="${static.url('/static/js/vendor/pdfjs/compatibility.js')}"></script>
<!-- This snippet is used in production (included from viewer.html) --> <!-- This snippet is used in production (included from viewer.html) -->
<link rel="resource" type="application/l10n" href="locale/locale.properties"/> <link rel="resource" type="application/l10n" href="${static.url('/static/js/vendor/pdfjs/locale/locale.properties')}"/>
<script src="l10n.js"></script> <script type="text/javascript" src="${static.url('/static/js/vendor/pdfjs/l10n.js')}"></script>
<script src="../build/pdf.js"></script> <script type="text/javascript" src="${static.url('/static/js/vendor/pdfjs/pdf.js')}"></script>
<script src="debugger.js"></script> <script type="text/javascript">
<script src="viewer.js"></script> PDFJS.imageResourcesPath = "${static.url('/static/css/vendor/pdfjs/images/')}";
PDFJS.workerSrc = "${static.url('/static/js/vendor/pdfjs/pdf.worker.js')}";
PDFJS.cMapUrl = "${static.url('/static/css/vendor/pdfjs/cmaps/')}";
PDF_URL = '${current_url | h}';
</script>
<script ${static.url('/static/js/vendor/pdfjs/debugger.js')}></script>
<%static:js group='main_vendor'/>
<%static:js group='application'/>
<%static:js group='courseware'/>
</head> </head>
<body tabindex="1"> <body tabindex="1">
...@@ -400,6 +410,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/ ...@@ -400,6 +410,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
</div> </div>
</div> </div>
</div> </div>
<script type="text/javascript" src="${static.url('/static/js/vendor/pdfjs/viewer.js')}"></script>
<script type="text/javascript" src="${static.url('/static/js/pdf-analytics.js')}"></script>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment