Showing the changes to assets/javascripts/app (1 of 1 file). Show all
Unified · Split
| @@ -57,7 +57,8 @@ · 56 unmodified lines | ||
| 57 | 57 | mode: if @DOC then 'single' else 'full' |
| 58 | 58 | iframe: (window.top isnt window).toString() |
| 59 | 59 | dataCallback: (data) -> |
| 60 | − try $.extend(data.user, app.settings.settings) | |
| 60 | + try $.extend(data.user ||= {}, app.settings.settings) | |
| 61 | + data | |
| 61 | 62 | .install() |
| 62 | 63 | @previousErrorHandler = onerror |
| 63 | 64 | window.onerror = @onWindowError.bind(@) |