Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

switch from log_event to Logger.log

Browse Source 
keep log_event for compatibility
This commit is contained in:
Miles Steele
2013-08-19 11:25:44 -04:00
committed by Carlos Andrés Rocha
parent 5692867b14
commit cb7a3ad8eb
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/static/coffee/src/logger.coffee
View File

@@ -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

6
common/static/js/pdfviewer.js
View File

@@ -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;
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;
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) {

5
lms/static/coffee/spec/navigation_spec.coffee
View File

@@ -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', ->
text: -> "old" text: -> "old"
} }
expect(window.log_event).toHaveBeenCalledWith 'accordion', expect(Logger.log).toHaveBeenCalledWith 'accordion',
newheader: 'new' newheader: 'new'
oldheader: 'old' oldheader: 'old'

2
lms/static/coffee/src/navigation.coffee
View File

@@ -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()

6
lms/templates/staticbook.html
View File

@@ -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() {
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(){