htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into rt/comments

Browse Source 
Conflicts:
	app/assets/javascripts/editor.js
This commit is contained in:
Ralf Teusner
2015-08-31 19:34:49 +02:00
parent e14ee6def3 5650cf25b6
commit 67b0c9a930
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/editor.js
View File

@ -283,7 +283,7 @@ $(function() {
//console.log("Handling paste event. this is ", this ); //console.log("Handling paste event. this is ", this );
//console.log("Text: " + pasteObject.text); //console.log("Text: " + pasteObject.text);
var same = (lastCopyText === pasteObject.text) var same = (lastCopyText === pasteObject.text);
//console.log("Text is the same: " + same); //console.log("Text is the same: " + same);
// if the text is not copied from within the editor (from any file), send an event to lanalytics // if the text is not copied from within the editor (from any file), send an event to lanalytics
@ -294,7 +294,7 @@ $(function() {
// file_id: "1" // file_id: "1"
// //
// }); // });
} //}
}; };
var handleScoringResponse = function(response) { var handleScoringResponse = function(response) {