mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3273 from gnestor/issue-484

Browse Source 
Make buffer time between last modified on disk and last modified on last save configurable
This commit is contained in:
Thomas Kluyver 2018-02-05 17:51:17 +00:00 committed by GitHub
commit 364cd032c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
notebook/static/notebook/js/notebook.js
View File

@ -2738,10 +2738,12 @@ define([
return this.contents.get(this.notebook_path, {content: false}).then( return this.contents.get(this.notebook_path, {content: false}).then(
function (data) { function (data) {
var last_modified = new Date(data.last_modified); var last_modified = new Date(data.last_modified);
var last_modified_check_margin = (that.config.data['last_modified_check_margin'] || 0.5) * 1000; // 500 ms
// We want to check last_modified (disk) > that.last_modified (our last save) // We want to check last_modified (disk) > that.last_modified (our last save)
// In some cases the filesystem reports an inconsistent time, // In some cases the filesystem reports an inconsistent time,
// so we allow 0.5 seconds difference before complaining. // so we allow 0.5 seconds difference before complaining.
if ((last_modified.getTime() - that.last_modified.getTime()) > 500) { // 500 ms // This is configurable in nbconfig/notebook.json as `last_modified_check_margin`.
if ((last_modified.getTime() - that.last_modified.getTime()) > last_modified_check_margin) {
console.warn("Last saving was done on `"+that.last_modified+"`("+that._last_modified+"), "+ console.warn("Last saving was done on `"+that.last_modified+"`("+that._last_modified+"), "+
"while the current file seem to have been saved on `"+data.last_modified+"`"); "while the current file seem to have been saved on `"+data.last_modified+"`");
if (that._changed_on_disk_dialog !== null) { if (that._changed_on_disk_dialog !== null) {