github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-28 00:07:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

wiki: unsafe() diff html on conflict.

Browse Source
This commit is contained in:
Andre D
2013-05-08 15:26:05 -07:00
committed by Neil Williams
parent f3c9c753b3
commit 533ae1f8dc
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
r2/r2/public/static/js/wiki.js
View File

@@ -95,8 +95,9 @@ r.wiki = {
409: function(xhr) {
var info = JSON.parse(xhr.responseText)
,content = $this.children('#wiki_page_content')
,diff = conflict.children('#yourdiff')
conflict.children('#youredit').val(content.val())
conflict.children('#yourdiff').html(info.diffcontent)
diff.html($.unsafe(info.diffcontent))
$this.children('#previous').val(info.newrevision)
content.val(info.newcontent)
conflict.fadeIn('slow')