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

wiki: Change a conflicting id.

Browse Source
This commit is contained in:
Andre D
2012-12-13 18:25:08 -05:00
committed by Max Goodman
parent 61d9da0f3c
commit b1127248e2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ r.wiki = {
statusCode: {
409: function(xhr) {
var info = JSON.parse(xhr.responseText)
,content = $this.children('#content')
,content = $this.children('#wiki_page_content')
conflict.children('#youredit').val(content.val())
conflict.children('#yourdiff').html(info.diffcontent)
$this.children('#previous').val(info.newrevision)

2
r2/r2/templates/wikieditpage.html
View File

@@ -39,7 +39,7 @@
</div>
<form method="post" id="editform" onsubmit="r.wiki.submitEdit(event)">
<textarea name="content" rows="20" cols="20" style="width: 100%" id="content">${keep_space(thing.page_content)}</textarea>
<textarea name="content" rows="20" cols="20" style="width: 100%" id="wiki_page_content">${keep_space(thing.page_content)}</textarea>
<br/><br/>
<label for="reason">${_("reason for revision")}</label><br/>
<input type="text" name="reason" maxlength="256" id="wiki_revision_reason" />