Merge branch 'master' of github.com:discourse/discourse

This commit is contained in:
Robin Ward 2013-03-11 11:32:09 -04:00
commit 1205e0d3d4
5 changed files with 8 additions and 5 deletions

View File

@ -34,7 +34,14 @@ Discourse.PagedownEditor = Ember.ContainerView.extend({
$wmdInput.data('init', true);
this.editor = Discourse.Markdown.createEditor();
return this.editor.run();
}
},
observeValue: (function() {
var _this = this;
Ember.run.next(null, function() {
_this.editor && _this.editor.refreshPreview();
});
}).observes('value')
});

View File

@ -280,7 +280,6 @@ cs:
show_preview: 'zobrazit náhled »'
hide_preview: '« skrýt náhled'
quote_title: "Citovat příspěvek"
bold_title: "Tučně"
bold_text: "tučný text"
italic_title: "Kurzíva"

View File

@ -280,7 +280,6 @@ en:
show_preview: 'show preview »'
hide_preview: '« hide preview'
quote_title: "Quote Post"
bold_title: "Strong"
bold_text: "strong text"
italic_title: "Emphasis"

View File

@ -272,7 +272,6 @@ fr:
create_topic: "Créer une discussion"
create_pm: "Créer un message privé."
quote_title: "Citer un message"
bold_title: "Gras"
bold_text: "texte en gras"
italic_title: "Italique"

View File

@ -285,7 +285,6 @@ zh_CN:
show_preview: '显示预览 »'
hide_preview: '« 隐藏预览'
quote_title: "引用帖子"
bold_title: "加粗"
bold_text: "加粗文字"
italic_title: "斜体"