Merge pull request #2355 from vikhyat/poll-plugin

Set up poll plugin javascript using an Ember initializer
This commit is contained in:
Robin Ward 2014-05-20 11:25:35 -04:00
commit 29fa2d2fc2
3 changed files with 34 additions and 26 deletions

7
.gitignore vendored
View File

@ -40,9 +40,10 @@ config/discourse.conf
log/
# Ignore plugins except for the bundled ones.
/plugins
!/plugins/emoji
!/plugins/poll
/plugins/*
!/plugins/emoji/
!/plugins/poll/
/plugins/*/auto_generated/
/spec/fixtures/plugins/my_plugin/auto_generated

View File

@ -1,3 +1,5 @@
import PollController from "discourse/plugins/poll/controllers/poll";
var Poll = Discourse.Model.extend({
post: null,
options: [],
@ -41,8 +43,6 @@ var Poll = Discourse.Model.extend({
}
});
var PollController = require("discourse/plugins/poll/controllers/poll").default;
var PollView = Ember.View.extend({
templateName: "poll",
classNames: ['poll-ui'],
@ -73,29 +73,36 @@ function initializePollView(self) {
return pollView;
}
Discourse.PostView.reopen({
createPollUI: function($post) {
var post = this.get('post');
if (!post.get('poll_details')) {
return;
}
export default {
name: 'poll',
var view = initializePollView(this);
initialize: function() {
Discourse.PostView.reopen({
createPollUI: function($post) {
var post = this.get('post');
var pollContainer = $post.find(".poll-ui:first");
if (pollContainer.length === 0) {
pollContainer = $post.find("ul:first");
}
if (!post.get('poll_details')) {
return;
}
view.replaceElement(pollContainer);
this.set('pollView', view);
var view = initializePollView(this);
}.on('postViewInserted'),
var pollContainer = $post.find(".poll-ui:first");
if (pollContainer.length === 0) {
pollContainer = $post.find("ul:first");
}
clearPollView: function() {
if (this.get('pollView')) {
this.get('pollView').destroy();
}
}.on('willClearRender')
});
view.replaceElement(pollContainer);
this.set('pollView', view);
}.on('postViewInserted'),
clearPollView: function() {
if (this.get('pollView')) {
this.get('pollView').destroy();
}
}.on('willClearRender')
});
}
}

View File

@ -144,7 +144,7 @@ end
# Poll UI.
register_asset "javascripts/controllers/poll.js.es6"
register_asset "javascripts/discourse/templates/poll.js.handlebars"
register_asset "javascripts/poll_ui.js"
register_asset "javascripts/initializers/poll.js.es6"
register_asset "javascripts/poll_bbcode.js", :server_side
register_css <<CSS