Show More
@@ -60,8 +60,16 b' var IPython = (function (IPython) {' | |||||
60 | } |
|
60 | } | |
61 | }; |
|
61 | }; | |
62 |
|
62 | |||
|
63 | // FIXME: Workaround CM Bug #332 (Safari segfault on drag) | |||
|
64 | // by disabling drag/drop altogether on Safari | |||
|
65 | // https://github.com/marijnh/CodeMirror/issues/332 | |||
|
66 | ||||
|
67 | if (utils.browser[0] == "Safari") { | |||
|
68 | Cell.options_default.cm_config.dragDrop = false; | |||
|
69 | } | |||
|
70 | ||||
63 | Cell.prototype.mergeopt = function(_class, options, overwrite){ |
|
71 | Cell.prototype.mergeopt = function(_class, options, overwrite){ | |
64 |
overwrite = overwrite || |
|
72 | overwrite = overwrite || {}; | |
65 | return $.extend(true, {}, _class.options_default, options, overwrite) |
|
73 | return $.extend(true, {}, _class.options_default, options, overwrite) | |
66 |
|
74 | |||
67 | } |
|
75 | } |
General Comments 0
You need to be logged in to leave comments.
Login now