Commit e79f8c43 by jkarni

Merge pull request #665 from edx/feature/msteele/remove-log_event

Remove js log_event (keep compatibility)
parents 5692867b cb7a3ad8
...@@ -42,5 +42,7 @@ class @Logger ...@@ -42,5 +42,7 @@ class @Logger
page: window.location.href page: window.location.href
async: false async: false
# Keeping this for compatibility issue only.
# log_event exists for compatibility reasons
# and will soon be deprecated.
@log_event = Logger.log @log_event = Logger.log
...@@ -157,7 +157,7 @@ PDFJS.disableWorker = true; ...@@ -157,7 +157,7 @@ PDFJS.disableWorker = true;
} }
// Update logging: // Update logging:
log_event("book", { "type" : "gotopage", "old" : pageNum, "new" : num }); Logger.log("book", { "type" : "gotopage", "old" : pageNum, "new" : num });
parentElement = viewerElement; parentElement = viewerElement;
while (parentElement.hasChildNodes()) while (parentElement.hasChildNodes())
...@@ -207,7 +207,7 @@ PDFJS.disableWorker = true; ...@@ -207,7 +207,7 @@ PDFJS.disableWorker = true;
if (pageNum <= 1) if (pageNum <= 1)
return; return;
renderPage(pageNum - 1); renderPage(pageNum - 1);
log_event("book", { "type" : "prevpage", "new" : pageNum }); Logger.log("book", { "type" : "prevpage", "new" : pageNum });
} }
// Go to next page // Go to next page
...@@ -215,7 +215,7 @@ PDFJS.disableWorker = true; ...@@ -215,7 +215,7 @@ PDFJS.disableWorker = true;
if (pageNum >= pdfDocument.numPages) if (pageNum >= pdfDocument.numPages)
return; return;
renderPage(pageNum + 1); renderPage(pageNum + 1);
log_event("book", { "type" : "nextpage", "new" : pageNum }); Logger.log("book", { "type" : "nextpage", "new" : pageNum });
} }
selectScaleOption = function(value) { selectScaleOption = function(value) {
......
...@@ -57,8 +57,7 @@ describe 'Navigation', -> ...@@ -57,8 +57,7 @@ describe 'Navigation', ->
describe 'log', -> describe 'log', ->
beforeEach -> beforeEach ->
window.log_event = -> spyOn Logger, 'log'
spyOn window, 'log_event'
it 'submit event log', -> it 'submit event log', ->
@navigation.log {}, { @navigation.log {}, {
...@@ -68,6 +67,6 @@ describe 'Navigation', -> ...@@ -68,6 +67,6 @@ describe 'Navigation', ->
text: -> "old" text: -> "old"
} }
expect(window.log_event).toHaveBeenCalledWith 'accordion', expect(Logger.log).toHaveBeenCalledWith 'accordion',
newheader: 'new' newheader: 'new'
oldheader: 'old' oldheader: 'old'
...@@ -20,7 +20,7 @@ class @Navigation ...@@ -20,7 +20,7 @@ class @Navigation
$('#accordion a').click @setChapter $('#accordion a').click @setChapter
log: (event, ui) -> log: (event, ui) ->
log_event 'accordion', Logger.log 'accordion',
newheader: ui.newHeader.text() newheader: ui.newHeader.text()
oldheader: ui.oldHeader.text() oldheader: ui.oldHeader.text()
......
...@@ -25,7 +25,7 @@ $(document).ready(function(){ ...@@ -25,7 +25,7 @@ $(document).ready(function(){
}); });
function goto_page(n) { function goto_page(n) {
log_event("book", {"type":"gotopage","old":page,"new":n}); Logger.log("book", {"type":"gotopage","old":page,"new":n});
page=n; page=n;
var prefix = ""; var prefix = "";
if(n<100) { if(n<100) {
...@@ -42,14 +42,14 @@ function prev_page() { ...@@ -42,14 +42,14 @@ function prev_page() {
var newpage=page-1; var newpage=page-1;
if(newpage< ${start_page}) newpage=${start_page}; if(newpage< ${start_page}) newpage=${start_page};
goto_page(newpage); goto_page(newpage);
log_event("book", {"type":"prevpage","new":page}); Logger.log("book", {"type":"prevpage","new":page});
} }
function next_page() { function next_page() {
var newpage=page+1; var newpage=page+1;
if(newpage> ${end_page}) newpage=${end_page}; if(newpage> ${end_page}) newpage=${end_page};
goto_page(newpage); goto_page(newpage);
log_event("book", {"type":"nextpage","new":page}); Logger.log("book", {"type":"nextpage","new":page});
} }
$("#open_close_accordion a").click(function(){ $("#open_close_accordion a").click(function(){
......
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