mirror of
https://github.com/jupyter/notebook.git
synced 2025-03-13 13:17:50 +08:00
Merge pull request #3378 from minrk/dragDropSafari
disable CodeMirror drag/drop on Safari
This commit is contained in:
commit
c7a13d15b8
@ -59,9 +59,17 @@ var IPython = (function (IPython) {
|
||||
theme: "default"
|
||||
}
|
||||
};
|
||||
|
||||
// FIXME: Workaround CM Bug #332 (Safari segfault on drag)
|
||||
// by disabling drag/drop altogether on Safari
|
||||
// https://github.com/marijnh/CodeMirror/issues/332
|
||||
|
||||
if (utils.browser[0] == "Safari") {
|
||||
Cell.options_default.cm_config.dragDrop = false;
|
||||
}
|
||||
|
||||
Cell.prototype.mergeopt = function(_class, options, overwrite){
|
||||
overwrite = overwrite || {};
|
||||
overwrite = overwrite || {};
|
||||
return $.extend(true, {}, _class.options_default, options, overwrite)
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user