Merge pull request #3378 from minrk/dragDropSafari

disable CodeMirror drag/drop on Safari
This commit is contained in:
Matthias Bussonnier 2013-06-02 08:40:49 -07:00
commit c7a13d15b8

View File

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