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

Rename local variable to avoid confusion.

Browse Source
This commit is contained in:
Matthias Bussonnier 2015-03-13 14:37:38 -07:00
parent 63a4a764f2
commit 025ec6df77
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IPython/html/static/notebook/js/cell.js
View File

@ -29,7 +29,7 @@ define([
// Reverse `min-height: 18px` scrollbar hack on OS X // Reverse `min-height: 18px` scrollbar hack on OS X
// which causes a dead area, making it impossible to click on the last line // which causes a dead area, making it impossible to click on the last line
// when there is horizontal scrolling to do and the "show scrollbar only when scrolling" behavior // when there is horizontal scrolling to do and the "show scrollbar only when scrolling" behavior
// is enabled. // is enabled.c
// This, in turn, has the undesirable behavior of never showing the horizontal scrollbar, // This, in turn, has the undesirable behavior of never showing the horizontal scrollbar,
// even when it should, which is less problematic, at least. // even when it should, which is less problematic, at least.
if (/Mac/.test(navigator.platform)) { if (/Mac/.test(navigator.platform)) {
@ -76,11 +76,11 @@ define([
// load this from metadata later ? // load this from metadata later ?
this.user_highlight = 'auto'; this.user_highlight = 'auto';
var class_conf_value = {}; var _local_cm_config = {};
if(this.class_config){ if(this.class_config){
class_conf_value = this.class_config.get_sync('cm_config'); _local_cm_config = this.class_config.get_sync('cm_config');
} }
this.cm_config = utils.mergeopt({}, config.cm_config, class_conf_value); this.cm_config = utils.mergeopt({}, config.cm_config, _local_cm_config);
this.cell_id = utils.uuid(); this.cell_id = utils.uuid();
this._options = config; this._options = config;